[jboss-cvs] JBossBlog SVN: r229 - in trunk: resources and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 29 13:45:19 EST 2008
Author: adamw
Date: 2008-02-29 13:45:19 -0500 (Fri, 29 Feb 2008)
New Revision: 229
Added:
trunk/resources-portlet/WEB-INF/jboss-app.xml
Removed:
trunk/resources-portlet/WEB-INF/portlet-instances.xml
trunk/resources-portlet/WEB-INF/portlet-object.xml
trunk/resources/messages_bg.properties
trunk/resources/messages_de.properties
trunk/resources/messages_fr.properties
trunk/resources/messages_tr.properties
trunk/resources/seam-gen.reveng.xml
trunk/resources/treecache.xml
Modified:
trunk/build.properties
trunk/resources-portlet/WEB-INF/portlet.xml
trunk/resources/META-INF/application.xml
trunk/resources/WEB-INF/components.xml
trunk/src/action/org/jboss/blog/servlet/FeedsServlet.java
trunk/src/action/org/jboss/blog/session/merge/MergeServiceBean.java
trunk/src/action/org/jboss/blog/session/update/UpdateThread.java
trunk/src/portlet/org/jboss/blog/portlet/BlogPortlet.java
trunk/src/tools/org/jboss/blog/tools/GeneralTools.java
trunk/view/layout/template.xhtml
trunk/view/manage/shotoku/shotoku_mod.xhtml
trunk/view/manage/update_manager.xhtml
Log:
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/build.properties 2008-02-29 18:45:19 UTC (rev 229)
@@ -1,3 +1,4 @@
+#jboss.home = /Users/adamwarski/portal-extensions/feeds/binaries
jboss.home = /Users/adamwarski/jboss/jboss-4.2
#profile = design
#jboss.home = /Users/adamwarski/jboss/jboss-design
\ No newline at end of file
Modified: trunk/resources/META-INF/application.xml
===================================================================
--- trunk/resources/META-INF/application.xml 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/resources/META-INF/application.xml 2008-02-29 18:45:19 UTC (rev 229)
@@ -22,7 +22,7 @@
<module>
<web>
<web-uri>blog.war</web-uri>
- <context-root>/blog</context-root>
+ <context-root>/blogs</context-root>
</web>
</module>
Modified: trunk/resources/WEB-INF/components.xml
===================================================================
--- trunk/resources/WEB-INF/components.xml 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/resources/WEB-INF/components.xml 2008-02-29 18:45:19 UTC (rev 229)
@@ -68,6 +68,6 @@
<component name="linkService">
<property name="serverAddress">http://localhost:8080</property>
- <property name="contextName">blog</property>
+ <property name="contextName">blogs</property>
</component>
</components>
Deleted: trunk/resources/messages_bg.properties
===================================================================
--- trunk/resources/messages_bg.properties 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/resources/messages_bg.properties 2008-02-29 18:45:19 UTC (rev 229)
@@ -1,88 +0,0 @@
-down = \u2193
-
-javax.faces.component.UIInput.CONVERSION = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u043D\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043F\u0440\u0435\u043E\u0431\u0440\u0430\u0437\u0443\u0432\u0430\u043D\u0430 \u043A\u044A\u043C \u043E\u0447\u0430\u043A\u0432\u0430\u043D\u0438\u044F \u0442\u0438\u043F
-javax.faces.component.UIInput.REQUIRED = \u043F\u043E\u043B\u0435\u0442\u043E \u0435 \u0437\u0430\u0434\u044A\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u043E
-javax.faces.component.UIInput.UPDATE = \u0432\u044A\u0437\u043D\u0438\u043A\u043D\u0430\u043B\u0430 \u0435 \u0433\u0440\u0435\u0448\u043A\u0430 \u043F\u0440\u0438 \u043E\u0431\u0440\u0430\u0431\u043E\u0442\u043A\u0430 \u043D\u0430 \u0438\u0437\u043F\u0440\u0430\u0442\u0435\u043D\u0430\u0442\u0430 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F
-javax.faces.component.UISelectMany.INVALID = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0435 \u043D\u0435\u0432\u0430\u043B\u0438\u0434\u043D\u0430
-javax.faces.component.UISelectOne.INVALID = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0435 \u043D\u0435\u0432\u0430\u043B\u0438\u0434\u043D\u0430
-javax.faces.converter.BigDecimalConverter.DECIMAL = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0447\u0438\u0441\u043B\u043E
-javax.faces.converter.BigDecimalConverter.DECIMAL_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0447\u0438\u0441\u043B\u043E \u0441\u044A\u0441 \u0437\u043D\u0430\u043A, \u0441\u044A\u0441\u0442\u043E\u044F\u0449\u043E \u0441\u0435 \u043E\u0442 \u043D\u0443\u043B\u0430 \u0438\u043B\u0438 \u043F\u043E\u0432\u0435\u0447\u0435 \u0446\u0438\u0444\u0440\u0438, \u0441\u043B\u0435\u0434\u0432\u0430\u043D\u043E \u043F\u043E \u0438\u0437\u0431\u043E\u0440 \u043E\u0442 \u0434\u0435\u0441\u0435\u0442\u0438\u0447\u043D\u0430 \u0437\u0430\u043F\u0435\u0442\u0430\u044F \u0438 \u0434\u0440\u043E\u0431\u043D\u0430 \u0447\u0430\u0441\u0442, \u043D\u0430\u043F\u0440. {1}
-javax.faces.converter.BigIntegerConverter.BIGINTEGER = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0446\u044F\u043B\u043E \u0447\u0438\u0441\u043B\u043E
-javax.faces.converter.BigIntegerConverter.BIGINTEGER_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0446\u044F\u043B\u043E \u0447\u0438\u0441\u043B\u043E \u0441\u044A\u0441 \u0437\u043D\u0430\u043A, \u0441\u044A\u0441\u0442\u043E\u044F\u0449\u043E \u0441\u0435 \u043E\u0442 \u043D\u0443\u043B\u0430 \u0438\u043B\u0438 \u043F\u043E\u0432\u0435\u0447\u0435 \u0446\u0438\u0444\u0440\u0438
-javax.faces.converter.BooleanConverter.BOOLEAN = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 'true' \u0438\u043B\u0438 'false'
-javax.faces.converter.BooleanConverter.BOOLEAN_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 'true' \u0438\u043B\u0438 'false' (\u0432\u0441\u044F\u043A\u0430 \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442 \u0440\u0430\u0437\u043B\u0438\u0447\u043D\u0430 \u043E\u0442 'true' \u0449\u0435 \u0441\u0435 \u0441\u043C\u044F\u0442\u0430 \u0437\u0430 'false')
-javax.faces.converter.ByteConverter.BYTE = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0447\u0438\u0441\u043B\u043E \u043C\u0435\u0434\u0436\u0443 0 \u0438 255
-javax.faces.converter.ByteConverter.BYTE_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0447\u0438\u0441\u043B\u043E \u043C\u0435\u0434\u0436\u0443 0 \u0438 255
-javax.faces.converter.CharacterConverter.CHARACTER = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0437\u043D\u0430\u043A
-javax.faces.converter.CharacterConverter.CHARACTER_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0432\u0430\u043B\u0438\u0434\u0435\u043D ASCII \u0437\u043D\u0430\u043A
-javax.faces.converter.DateTimeConverter.DATE = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0434\u0430\u0442\u0430
-javax.faces.converter.DateTimeConverter.DATETIME = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0434\u0430\u0442\u0430 \u0438 \u0447\u0430\u0441
-javax.faces.converter.DateTimeConverter.DATETIME_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0434\u0430\u0442\u0430 \u0438 \u0447\u0430\u0441, \u043D\u0430\u043F\u0440. {1}
-javax.faces.converter.DateTimeConverter.DATE_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0434\u0430\u0442\u0430, \u043D\u0430\u043F\u0440. {1}
-javax.faces.converter.DateTimeConverter.PATTERN_TYPE = \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0437\u0430\u0434\u0430\u0434\u0435\u043D \u043E\u0431\u0440\u0430\u0437\u0435\u0446 \u0438\u043B\u0438 \u0430\u0442\u0440\u0438\u0431\u0443\u0442 type, \u0437\u0430 \u0434\u0430 \u0441\u0435 \u043F\u0440\u0435\u043E\u0431\u0440\u0430\u0437\u0443\u0432\u0430 \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430
-javax.faces.converter.DateTimeConverter.TIME = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043E\u0442 \u0442\u0438\u043F \u0447\u0430\u0441
-javax.faces.converter.DateTimeConverter.TIME_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043E\u0442 \u0442\u0438\u043F \u0447\u0430\u0441, \u043D\u0430\u043F\u0440. {1}
-javax.faces.converter.DoubleConverter.DOUBLE = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0447\u0438\u0441\u043B\u043E
-javax.faces.converter.DoubleConverter.DOUBLE_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0447\u0438\u0441\u043B\u043E \u043C\u0435\u0436\u0434\u0443 4.9E-324 \u0438 1.7976931348623157E308
-javax.faces.converter.EnumConverter.ENUM = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0441\u0435 \u043F\u0440\u0435\u043E\u0431\u0440\u0430\u0437\u0443\u0432\u0430 \u0434\u043E \u0438\u0437\u0431\u0440\u043E\u0435\u043D \u0442\u0438\u043F
-javax.faces.converter.EnumConverter.ENUM_NO_CLASS = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0441\u0435 \u043F\u0440\u0435\u043E\u0431\u0440\u0430\u0437\u0443\u0432\u0430 \u043E\u0442 \u0438\u043B\u0438 \u0434\u043E \u0438\u0437\u0431\u0440\u043E\u0435\u043D \u0442\u0438\u043F, \u043D\u043E \u043D\u0435 \u0435 \u043F\u043E\u0434\u0430\u0434\u0435\u043D \u043A\u043B\u0430\u0441 \u043E\u0442 \u0442\u0430\u043A\u044A\u0432 \u0442\u0438\u043F
-javax.faces.converter.EnumConverter.ENUM_NO_CLASS_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0441\u0435 \u043F\u0440\u0435\u043E\u0431\u0440\u0430\u0437\u0443\u0432\u0430 \u043E\u0442 \u0438\u043B\u0438 \u0434\u043E \u0438\u0437\u0431\u0440\u043E\u0435\u043D \u0442\u0438\u043F, \u043D\u043E \u043D\u0435 \u0435 \u043F\u043E\u0434\u0430\u0434\u0435\u043D \u043A\u043B\u0430\u0441 \u043E\u0442 \u0442\u0430\u043A\u044A\u0432 \u0442\u0438\u043F
-javax.faces.converter.EnumConverter.ENUM_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0441\u0435 \u043F\u0440\u0435\u043E\u0431\u0440\u0430\u0437\u0443\u0432\u0430 \u043E\u0442 \u0438\u043B\u0438 \u0434\u043E \u0438\u0437\u0431\u0440\u043E\u0435\u043D \u0442\u0438\u043F, \u043A\u043E\u0439\u0442\u043E \u0441\u044A\u0434\u044A\u0440\u0436\u0430 \u043A\u043E\u043D\u0441\u0442\u0430\u043D\u0442\u0430\u0442\u0430 {1}
-javax.faces.converter.FloatConverter.FLOAT = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0447\u0438\u0441\u043B\u043E
-javax.faces.converter.FloatConverter.FLOAT_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0447\u0438\u0441\u043B\u043E \u043C\u0435\u0436\u0434\u0443 1.4E-45 \u0438 3.4028235E38
-javax.faces.converter.IntegerConverter.INTEGER = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0446\u044F\u043B\u043E \u0447\u0438\u0441\u043B\u043E
-javax.faces.converter.IntegerConverter.INTEGER_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0446\u044F\u043B\u043E \u0447\u0438\u0441\u043B\u043E \u043C\u0435\u0436\u0434\u0443 -2147483648 \u0438 2147483647
-javax.faces.converter.LongConverter.LONG = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0446\u044F\u043B\u043E \u0447\u0438\u0441\u043B\u043E
-javax.faces.converter.LongConverter.LONG_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0446\u044F\u043B\u043E \u0447\u0438\u0441\u043B\u043E \u043C\u0435\u0436\u0434\u0443 -9223372036854775808 \u0438 9223372036854775807
-javax.faces.converter.NumberConverter.CURRENCY = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0441\u0443\u043C\u0430 \u0432\u044A\u0432 \u0432\u0430\u043B\u0443\u0442\u0430
-javax.faces.converter.NumberConverter.CURRENCY_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0441\u0443\u043C\u0430 \u0432\u044A\u0432 \u0432\u0430\u043B\u0443\u0442\u0430, \u043D\u0430\u043F\u0440. {1}
-javax.faces.converter.NumberConverter.NUMBER = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0447\u0438\u0441\u043B\u043E
-javax.faces.converter.NumberConverter.NUMBER_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0447\u0438\u0441\u043B\u043E
-javax.faces.converter.NumberConverter.PATTERN = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0447\u0438\u0441\u043B\u043E
-javax.faces.converter.NumberConverter.PATTERN_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0447\u0438\u0441\u043B\u043E
-javax.faces.converter.NumberConverter.PERCENT = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043F\u0440\u043E\u0446\u0435\u043D\u0442
-javax.faces.converter.NumberConverter.PERCENT_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043F\u0440\u043E\u0446\u0435\u043D\u0442, \u043D\u0430\u043F\u0440. {1}
-javax.faces.converter.STRING = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u043D\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043F\u0440\u0435\u0432\u044A\u0440\u043D\u0430\u0442\u0430 \u0432 \u043D\u0438\u0437 \u043E\u0442 \u0441\u0438\u043C\u0432\u043E\u043B\u0438
-javax.faces.converter.ShortConverter.SHORT = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0446\u044F\u043B\u043E \u0447\u0438\u0441\u043B\u043E
-javax.faces.converter.ShortConverter.SHORT_detail = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0446\u044F\u043B\u043E \u0447\u0438\u0441\u043B\u043E \u043C\u0435\u0436\u0434\u0443 -32768 \u0438 32767
-javax.faces.validator.DoubleRangeValidator.MAXIMUM = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043F\u043E-\u043C\u0430\u043B\u043A\u0430 \u0438\u043B\u0438 \u0440\u0430\u0432\u043D\u0430 \u043D\u0430 {0}
-javax.faces.validator.DoubleRangeValidator.MINIMUM = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043F\u043E-\u0433\u043E\u043B\u044F\u043C\u0430 \u0438\u043B\u0438 \u0440\u0430\u0432\u043D\u0430 \u043D\u0430 {0}
-javax.faces.validator.DoubleRangeValidator.NOT_IN_RANGE = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043C\u0435\u0436\u0434\u0443 {0} \u0438 {1}
-javax.faces.validator.DoubleRangeValidator.TYPE = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u043D\u0435 \u0435 \u043E\u0442 \u043F\u0440\u0430\u0432\u0438\u043B\u043D\u0438\u044F \u0432\u0438\u0434
-javax.faces.validator.LengthValidator.MAXIMUM = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043D\u0435 \u043F\u043E-\u0434\u044A\u043B\u0433\u0430 \u043E\u0442 {0} \u0437\u043D\u0430\u043A\u0430
-javax.faces.validator.LengthValidator.MINIMUM = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043F\u043E-\u0434\u044A\u043B\u0433\u0430 \u043E\u0442 {0} \u0437\u043D\u0430\u043A\u0430
-javax.faces.validator.LongRangeValidator.MAXIMUM = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043F\u043E-\u043C\u0430\u043B\u043A\u0430 \u0438\u043B\u0438 \u0440\u0430\u0432\u043D\u0430 \u043D\u0430 {0}
-javax.faces.validator.LongRangeValidator.MINIMUM = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043F\u043E-\u0433\u043E\u043B\u044F\u043C\u0430 \u0438\u043B\u0438 \u0440\u0430\u0432\u043D\u0430 \u043D\u0430 {0}
-javax.faces.validator.LongRangeValidator.NOT_IN_RANGE = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043C\u0435\u0436\u0434\u0443 {0} \u0438 {1}
-javax.faces.validator.LongRangeValidator.TYPE = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u043D\u0435 \u0435 \u043E\u0442 \u043F\u0440\u0430\u0432\u0438\u043B\u043D\u0438\u044F \u0432\u0438\u0434
-javax.faces.validator.NOT_IN_RANGE = \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043C\u0435\u0436\u0434\u0443 {0} \u0438 {1}
-
-left = \u2039
-
-org.jboss.seam.IllegalNavigation = \u041D\u0435\u0432\u0430\u043B\u0438\u0434\u043D\u0430 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F
-org.jboss.seam.NoConversation = \u0420\u0430\u0437\u0433\u043E\u0432\u043E\u0440\u044A\u0442 \u0435 \u043F\u0440\u0438\u043A\u043B\u044E\u0447\u0438\u043B, \u0438\u0437\u0442\u0435\u043A\u043B\u043E \u043C\u0443 \u0435 \u0432\u0440\u0435\u043C\u0435\u0442\u043E \u0438\u043B\u0438 \u043E\u0431\u0440\u0430\u0431\u043E\u0442\u0432\u0430 \u0434\u0440\u0443\u0433\u0430 \u0437\u0430\u044F\u0432\u043A\u0430
-org.jboss.seam.NotLoggedIn = \u041C\u043E\u043B\u044F \u043F\u044A\u0440\u0432\u043E \u0441\u0435 \u0438\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u0446\u0438\u0440\u0430\u0439\u0442\u0435
-org.jboss.seam.ProcessEnded = \u041F\u0440\u043E\u0446\u0435\u0441 #0 \u0435 \u043F\u0440\u0438\u043A\u043B\u044E\u0447\u0438\u043B
-org.jboss.seam.ProcessNotFound = \u041F\u0440\u043E\u0446\u0435\u0441 #0 \u043D\u0435 \u0435 \u043D\u0430\u043C\u0435\u0440\u0435\u043D
-org.jboss.seam.TaskEnded = \u0417\u0430\u0434\u0430\u0447\u0430 #0 \u0435 \u043F\u0440\u0438\u043A\u043B\u044E\u0447\u0438\u043B\u0430
-org.jboss.seam.TaskNotFound = \u0417\u0430\u0434\u0430\u0447\u0430 #0 \u043D\u0435 \u0435 \u043D\u0430\u043C\u0435\u0440\u0435\u043D\u0430
-org.jboss.seam.TransactionFailed = \u0422\u0440\u0430\u043D\u0437\u0430\u043A\u0446\u0438\u044F \u043D\u0435 \u0435 \u0443\u0441\u043F\u044F\u043B\u0430
-org.jboss.seam.loginFailed = \u041D\u0435\u0443\u0441\u043F\u0435\u0448\u0435\u043D \u0432\u0445\u043E\u0434
-org.jboss.seam.loginSuccessful = \u0417\u0434\u0440\u0430\u0432\u0435\u0439, #0
-
-right = \u203A
-
-up = \u2191
-
-validator.assertFalse = \u0433\u0440\u0435\u0448\u043A\u0438 \u043F\u0440\u0438 \u0432\u0430\u043B\u0438\u0434\u0430\u0446\u0438\u044F
-validator.assertTrue = \u0433\u0440\u0435\u0448\u043A\u0438 \u043F\u0440\u0438 \u0432\u0430\u043B\u0438\u0434\u0430\u0446\u0438\u044F
-validator.email = \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0432\u0430\u043B\u0438\u0434\u0435\u043D e-mail \u0430\u0434\u0440\u0435\u0441
-validator.future = \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0431\u044A\u0434\u0435\u0449\u0430 \u0434\u0430\u0442\u0430
-validator.length = \u0434\u044A\u043B\u0436\u0438\u043D\u0430\u0442\u0430 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043C\u0435\u0436\u0434\u0443 {min} \u0438 {max}
-validator.max = \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043F\u043E-\u043C\u0430\u043B\u043A\u043E \u0438\u043B\u0438 \u0440\u0430\u0432\u043D\u043E \u043D\u0430 {value}
-validator.min = \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043F\u043E-\u0433\u043E\u043B\u044F\u043C\u043E \u0438\u043B\u0438 \u0440\u0430\u0432\u043D\u043E \u043D\u0430 {value}
-validator.notNull = \u0435 \u0437\u0430\u0434\u044A\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u043E
-validator.past = \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0435 \u043C\u0438\u043D\u0430\u043B\u0430 \u0434\u0430\u0442\u0430\u0442\u0430
-validator.pattern = \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0441\u044A\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0430 \u043D\u0430 "{regex}"
-validator.range = \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0435 \u043C\u0435\u0436\u0434\u0443 {min} \u0438 {max}
-validator.size = \u0440\u0430\u0437\u043C\u0435\u0440\u044A\u0442 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0435 \u043C\u0435\u0436\u0434\u0443 {min} \u0438 {max}
Deleted: trunk/resources/messages_de.properties
===================================================================
--- trunk/resources/messages_de.properties 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/resources/messages_de.properties 2008-02-29 18:45:19 UTC (rev 229)
@@ -1,88 +0,0 @@
-up=\u2191
-down=\u2193
-left=\u2039
-right=\u203A
-
-validator.assertFalse=Validierung fehlgeschlagen
-validator.assertTrue=Validierung fehlgeschlagen
-validator.future=muss einem zuk\u00FCnfitigen Datum entsprechen
-validator.length=die L\u00E4nge muss zwischen {min} und {max} liegen
-validator.max=muss kleiner oder gleich {value} sein
-validator.min=muss gr\u00F6\u00DFer oder gleich {value} sein
-validator.notNull=darf nicht leer sein
-validator.past=muss einem vergangenen Datum entsprechen
-validator.pattern=muss dem regul\u00E4ren Ausdruck "{regex}" entsprechen
-validator.range=muss im Wertebereich von {min} bis {max} liegen
-validator.size=die Gr\u00F6\u00DFe muss zischen {min} und {max} liegen
-validator.email=muss einer wohlgeformten E-Mailadresse entsprechen
-
-org.jboss.seam.loginFailed=Anmeldung fehlgeschlagen
-org.jboss.seam.loginSuccessful=Willkommen, #0
-
-org.jboss.seam.TransactionFailed=Transaktion fehlgeschlagen
-org.jboss.seam.NoConversation=Der Vorgang wurde bereits beendet, verarbeitet eine andere Abfrage oder ergab eine Zeit\u00FCberschreitung
-org.jboss.seam.IllegalNavigation=Unzul\u00E4ssige Navigation
-org.jboss.seam.ProcessEnded=Prozess #0 wurde bereits beendet
-org.jboss.seam.ProcessNotFound=Prozess #0 nicht gefunden
-org.jboss.seam.TaskEnded=Funktion #0 wurde bereits beendet
-org.jboss.seam.TaskNotFound=Funktion #0 nicht gefunden
-org.jboss.seam.NotLoggedIn=Bitte melden Sie sich zun\u00E4chst an
-
-javax.faces.component.UIInput.CONVERSION=Wert konnte nicht in den erwarteten Typ umgewandelt werden
-javax.faces.component.UIInput.REQUIRED=Wert erforderlich
-javax.faces.component.UIInput.UPDATE=ein Fehler ist bei der Verarbeitung der von Ihnen gesendeten Daten aufgetreten
-javax.faces.component.UISelectOne.INVALID=Wert ung\u00FCltig
-javax.faces.component.UISelectMany.INVALID=Wert ung\u00FCltig
-
-javax.faces.converter.BigDecimalConverter.DECIMAL = ''{0}'' muss eine Dezimalzahl sein.
-javax.faces.converter.BigDecimalConverter.DECIMAL_detail = ''{0}'' muss eine Dezimalzahl aus keinem oder mehr Zeichen gefolgt von einem optionalen Punkt und den Nachkommastellen sein. Beispiel: {1}
-javax.faces.converter.BigIntegerConverter.BIGINTEGER = ''{0}'' muss eine Zahl aus ein oder mehr Ziffern sein.
-javax.faces.converter.BigIntegerConverter.BIGINTEGER_detail = ''{0}'' muss eine Zahl aus ein oder mehr Ziffern sein. Beispiel: {1}
-javax.faces.converter.BooleanConverter.BOOLEAN = ''{0}'' muss 'true' oder 'false' sein.
-javax.faces.converter.BooleanConverter.BOOLEAN_detail = ''{0}'' muss 'true' oder 'false' sein. Jeder Wert au\u00DFer 'true' wird als 'false' interpretiert.
-javax.faces.converter.ByteConverter.BYTE = ''{0}'' muss eine Zahl zwischen 0 und 255 sein.
-javax.faces.converter.ByteConverter.BYTE_detail = ''{0}'' muss eine Zahl zwischen 0 und 255 sein. Beispiel: {1}
-javax.faces.converter.CharacterConverter.CHARACTER = ''{0}'' muss ein g\u00FCltiges Zeichen sein.
-javax.faces.converter.CharacterConverter.CHARACTER_detail = ''{0}'' muss ein g\u00FCltiges ASCII Zeichen sein.
-javax.faces.converter.DateTimeConverter.DATE = ''{0}'' konnte nicht als Datum erkannt werden.
-javax.faces.converter.DateTimeConverter.DATE_detail = ''{0}'' konnte nicht als Datum erkannt werden. Beispiel: {1}
-javax.faces.converter.DateTimeConverter.TIME = ''{0}'' konnte nicht als Zeit erkannt werden.
-javax.faces.converter.DateTimeConverter.TIME_detail = ''{0}'' konnte nicht als Zeit erkannt werden. Beispiel: {1}
-javax.faces.converter.DateTimeConverter.DATETIME = ''{0}'' konnte nicht als Datum und Zeit erkannt werden.
-javax.faces.converter.DateTimeConverter.DATETIME_detail = ''{0}'' konnte nicht als Datum und Zeit erkannt werden. Beispiel: {1}
-javax.faces.converter.DateTimeConverter.PATTERN_TYPE = Ein 'pattern' oder 'type' Attribut muss angegeben werden um den Wert ''{0}'' zu konvertieren.
-javax.faces.converter.DoubleConverter.DOUBLE = ''{0}'' muss eine Zahl aus ein oder mehr Ziffern sein.
-javax.faces.converter.DoubleConverter.DOUBLE_detail = ''{0}'' muss eine Zahl zwischen 4.9E-324 und 1.7976931348623157E308 sein. Beispiel: {1}
-javax.faces.converter.EnumConverter.ENUM = ''{0}'' muss in eine Enumeration konvertierbar sein.
-javax.faces.converter.EnumConverter.ENUM_detail = ''{0}'' muss in eine Enumeration konvertierbar sein, welche die Konstante ''{1}'' enth\u00E4lt.
-javax.faces.converter.EnumConverter.ENUM_NO_CLASS = ''{0}'' muss in eine Enumeration konvertierbar sein, aber es wurde keine Klasse des Typs Enum bereitgestellt.
-javax.faces.converter.EnumConverter.ENUM_NO_CLASS_detail = ''{0}'' muss in eine Enumeration konvertierbar sein, aber es wurde keine Klasse des Typs Enum bereitgestellt.
-javax.faces.converter.FloatConverter.FLOAT = ''{0}'' muss eine Zahl aus ein oder mehr Ziffern sein.
-javax.faces.converter.FloatConverter.FLOAT_detail = ''{0}'' muss eine Zahl zwischen 1.4E-45 und 3.4028235E38 sein. Beispiel: {1}
-javax.faces.converter.IntegerConverter.INTEGER = ''{0}'' muss eine Zahl aus ein oder mehr Ziffern sein.
-javax.faces.converter.IntegerConverter.INTEGER_detail = ''{0}'' muss eine Zahl zwischen -2147483648 und 2147483647 sein. Beispiel: {1}
-javax.faces.converter.LongConverter.LONG = ''{0}'' muss eine Zahl aus ein oder mehr Ziffern sein.
-javax.faces.converter.LongConverter.LONG_detail = ''{0}'' muss eine Zahl zwischen -9223372036854775808 und 9223372036854775807 sein. Beispiel: {1}
-javax.faces.converter.NumberConverter.CURRENCY = ''{0}'' konnte nicht als ein Geldbetrag erkannt werden.
-javax.faces.converter.NumberConverter.CURRENCY_detail = ''{0}'' konnte nicht als ein Geldbetrag erkannt werden. Beispiel: {1}
-javax.faces.converter.NumberConverter.PERCENT = ''{0}'' konnte nicht als ein Prozentanteil erkannt werden.
-javax.faces.converter.NumberConverter.PERCENT_detail = ''{0}'' konnte nicht als ein Prozentanteil erkannt werden. Beispiel: {1}
-javax.faces.converter.NumberConverter.NUMBER = ''{0}'' ist keine Zahl.
-javax.faces.converter.NumberConverter.NUMBER_detail = ''{0}'' ist keine Zahl. Beispiel: {1}
-javax.faces.converter.NumberConverter.PATTERN = ''{0}'' ist kein Zahlmuster.
-javax.faces.converter.NumberConverter.PATTERN_detail = ''{0}'' ist kein Zahlmuster. Beispiel: {1}
-javax.faces.converter.ShortConverter.SHORT = ''{0}'' muss eine Zahl aus ein oder mehr Ziffern sein.
-javax.faces.converter.ShortConverter.SHORT_detail = ''{0}'' muss eine Zahl zwischen -32768 und 32767 sein. Beispiel: {1}
-javax.faces.converter.STRING = Konnte ''{0}'' nicht in eine Zeichenkette konvertieren.
-
-javax.faces.validator.NOT_IN_RANGE = Validierungsfehler: Der Wert liegt nicht im erwarteten Wertebereich von {0} bis {1}.
-javax.faces.validator.DoubleRangeValidator.MAXIMUM = Validierungsfehler: Der Wert ist gr\u00F6\u00DFer als das erlaubte Maximum von ''{0}''
-javax.faces.validator.DoubleRangeValidator.MINIMUM = Validierungsfehler: Der Wert ist kleiner als das erlaubte Minimum von ''{0}''
-javax.faces.validator.DoubleRangeValidator.NOT_IN_RANGE = Validierungsfehler: Der Wert ist nicht zwischen den erwarteten Werten von {0} und {1}
-javax.faces.validator.DoubleRangeValidator.TYPE = Validierungsfehler: Der Wert ist nicht vom korrekten Typ
-javax.faces.validator.LengthValidator.MAXIMUM = Validierungsfehler: Der Wert ist gr\u00F6\u00DFer als das erlaubte Maximum von ''{0}''
-javax.faces.validator.LengthValidator.MINIMUM = Validierungsfehler: Der Wert ist kleiner als das erlaubte Minimum von ''{0}''
-javax.faces.validator.LongRangeValidator.MAXIMUM = Validierungsfehler: Der Wert ist gr\u00F6\u00DFer als das erlaubte Maximum von ''{0}''
-javax.faces.validator.LongRangeValidator.MINIMUM = Validation Error: Der Wert ist kleiner als das erlaubte Minimum von ''{0}''
-javax.faces.validator.LongRangeValidator.NOT_IN_RANGE = Validierungsfehler: Der Wert ist nicht zwischen den erwarteten Werten von {0} und {1}.
-javax.faces.validator.LongRangeValidator.TYPE = Validierungsfehler: Der Wert ist nicht vom korrekten Typ.
Deleted: trunk/resources/messages_fr.properties
===================================================================
--- trunk/resources/messages_fr.properties 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/resources/messages_fr.properties 2008-02-29 18:45:19 UTC (rev 229)
@@ -1,98 +0,0 @@
-up=\u2191
-down=\u2193
-left=\u2039
-right=\u203A
-
-javax.persistence.EntityNotFoundException = Entité introuvable
-javax.persistence.OptimisticLockException = Un autre utilisateur a modifié les mêmes données. Veuillez essayer de nouveau.
-
-validator.assertFalse = La validation a échoué
-validator.assertTrue = La validation a échoué
-validator.future = doit être une date à venir.
-validator.length = la longueur doit être comprise entre {min} et {max}
-validator.max = doit être inférieur(e) ou égal(e) à {value}
-validator.min = doit être supérieur(e) ou égal(e) à {value}
-validator.notNull = ne peut être nul(le)
-validator.past = doit être une date passée
-validator.pattern = doit correspondre à "{regex}"
-validator.range = doit être compris(e) entre {min} et {max}
-validator.size = La taille doit être comprise entre {min} et {max}
-validator.email = doit être une adresse email valide
-
-org.jboss.seam.framework.EntityNotFoundException = Entité introuvable
-org.jboss.seam.security.AuthorizationException = Vous n'avez pas les autorisations nécessaires pour effectuer ceci
-org.jboss.seam.security.NotLoggedInException = Veuillez d'abord vous connecter
-org.jboss.seam.unexpected.error = Erreur inattendue. Veuillez essayez de nouveau.
-
-org.jboss.seam.loginFailed = La connexion a échoué.
-org.jboss.seam.loginSuccessful = Bienvenue, {0}
-
-org.jboss.seam.TransactionFailed = La transaction a échoué.
-org.jboss.seam.NoConversation = La conversation s'est interrompue, a dépassé les délais ou traite une autre requête.
-org.jboss.seam.IllegalNavigation = Navigation illégale
-org.jboss.seam.ProcessEnded = Processus #0 déjà achevé
-org.jboss.seam.ProcessNotFound = Le processus #0 n'a pas été trouvé.
-org.jboss.seam.TaskEnded = Tâche #0 déjà achevée
-org.jboss.seam.TaskNotFound = La tâche #0 n'a pas été trouvée.
-org.jboss.seam.NotLoggedIn = Veuillez d'abord vous connecter.
-
-javax.faces.component.UIInput.CONVERSION = La valeur ne peut être convertie dans le type attendu
-javax.faces.component.UIInput.REQUIRED = Une valeur est requise.
-javax.faces.component.UIInput.UPDATE = Une erreur est survenue lors du traitement de l'information que vous avez fournie
-javax.faces.component.UISelectMany.INVALID = La valeur n'est pas valide.
-javax.faces.component.UISelectOne.INVALID = La valeur n'est pas valide.
-
-javax.faces.converter.BigDecimalConverter.DECIMAL = la valeur doit être un nombre
-javax.faces.converter.BigDecimalConverter.DECIMAL_detail = la valeur doit être un nombre décimal signé comprenant zéro chiffre ou plus, éventuellement suivi par une virgule décimale et une faction, par ex. {1}
-javax.faces.converter.BigIntegerConverter.BIGINTEGER = la valeur doit être un nombre
-javax.faces.converter.BigIntegerConverter.BIGINTEGER_detail = la valeur doit être un entier signé comprenant zéro chiffre ou plus
-javax.faces.converter.BooleanConverter.BOOLEAN = la valeur doit être "vrai" ou "faux"
-javax.faces.converter.BooleanConverter.BOOLEAN_detail = la valeur doit être "vrai" ou "faux" (toute valeur autre que "vrai" est évaluée à "faux")
-javax.faces.converter.ByteConverter.BYTE = la valeur doit être un nombre entre 0 et 255
-javax.faces.converter.ByteConverter.BYTE_detail = la valeur doit être un nombre entre 0 et 255
-javax.faces.converter.CharacterConverter.CHARACTER = la valeur doit être un caractère
-javax.faces.converter.CharacterConverter.CHARACTER_detail = la valeur doit être un caractère ASCII valide
-javax.faces.converter.DateTimeConverter.DATE = la valeur doit être une date
-javax.faces.converter.DateTimeConverter.DATE_detail = la valeur doit être une date, par ex. {1}
-javax.faces.converter.DateTimeConverter.TIME = la valeur doit être une heure
-javax.faces.converter.DateTimeConverter.TIME_detail = la valeur doit être une heure, par ex. {1}
-javax.faces.converter.DateTimeConverter.DATETIME = la valeur doit être une date et une heure
-javax.faces.converter.DateTimeConverter.DATETIME_detail = la valeur doit être une date et une heure, par ex. {1}
-javax.faces.converter.DateTimeConverter.PATTERN_TYPE = un attribut doit indiquer le modèle ou le type pour convertir la valeur
-javax.faces.converter.DoubleConverter.DOUBLE = la valeur doit être un nombre
-javax.faces.converter.DoubleConverter.DOUBLE_detail = la valeur doit être un nombre entre 4,9E-324 et 17976931348623157E308
-javax.faces.converter.EnumConverter.ENUM = la valeur doit être convertible en une énumération
-javax.faces.converter.EnumConverter.ENUM_detail = la valeur doit être convertible en une énumération ou depuis l''énumération qui contient la constante {1}
-javax.faces.converter.EnumConverter.ENUM_NO_CLASS = la valeur doit être convertible en une énumération ou depuis l'énumération, mais aucune classe d'énumération n'est fournie
-javax.faces.converter.EnumConverter.ENUM_NO_CLASS_detail = la valeur doit être convertible en une énumération ou depuis l'énumération, mais aucune classe d'énumération n'est fournie
-javax.faces.converter.FloatConverter.FLOAT = la valeur doit être un nombre
-javax.faces.converter.FloatConverter.FLOAT_detail = la valeur doit être un nombre entre 1,4E-45 et 3,4028235E38
-javax.faces.converter.IntegerConverter.INTEGER = la valeur doit être un nombre
-javax.faces.converter.IntegerConverter.INTEGER_detail = la valeur doit être un nombre entre -2147483648 et 2147483647
-javax.faces.converter.LongConverter.LONG = la valeur doit être un nombre
-javax.faces.converter.LongConverter.LONG_detail = doit être un nombre entre -9223372036854775808 et 9223372036854775807
-javax.faces.converter.NumberConverter.CURRENCY = la valeur doit être un montant monétaire
-javax.faces.converter.NumberConverter.CURRENCY_detail = la valeur doit être un montant monétaire, par ex. {1}
-javax.faces.converter.NumberConverter.NUMBER = la valeur doit être un nombre
-javax.faces.converter.NumberConverter.NUMBER_detail = la valeur doit être un nombre
-javax.faces.converter.NumberConverter.PATTERN = la valeur doit être un nombre
-javax.faces.converter.NumberConverter.PATTERN_detail = la valeur doit être un nombre
-javax.faces.converter.NumberConverter.PERCENT = la valeur doit être un pourcentage
-javax.faces.converter.NumberConverter.PERCENT_detail = la valeur doit être un pourcentage, par ex. {1}
-javax.faces.converter.ShortConverter.SHORT = la valeur doit être un nombre
-javax.faces.converter.ShortConverter.SHORT_detail = la valeur doit être comprise entre -32768 et 32767
-
-javax.faces.validator.DoubleRangeValidator.MAXIMUM = La valeur doit être inférieure ou égale à {0}
-javax.faces.validator.DoubleRangeValidator.MINIMUM = La valeur doit être supérieure ou égale à {0}
-javax.faces.validator.DoubleRangeValidator.NOT_IN_RANGE = La valeur doit être comprise entre {0} et {1}
-javax.faces.validator.DoubleRangeValidator.TYPE = La valeur n'est pas du type correct
-javax.faces.validator.LengthValidator.MAXIMUM = La valeur doit comporter {0} caractères ou moins
-javax.faces.validator.LengthValidator.MINIMUM = La valeur doit comporter {0} caractères ou plus
-javax.faces.validator.LongRangeValidator.MAXIMUM = La valeur doit être inférieure ou égale à {0}
-javax.faces.validator.LongRangeValidator.MINIMUM = La valeur doit être supérieure ou égale à {0}
-javax.faces.validator.LongRangeValidator.NOT_IN_RANGE = La valeur doit être comprise entre {0} et {1}
-javax.faces.validator.LongRangeValidator.TYPE = La valeur n'est pas du type correct
-
-javax.faces.validator.NOT_IN_RANGE = La valeur doit être comprise entre {0} et {1}
-javax.faces.converter.STRING = La valeur ne peut être convertie en chaîne de caractères
-
Deleted: trunk/resources/messages_tr.properties
===================================================================
--- trunk/resources/messages_tr.properties 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/resources/messages_tr.properties 2008-02-29 18:45:19 UTC (rev 229)
@@ -1,90 +0,0 @@
-up=\u2191
-down=\u2193
-left=\u2039
-right=\u203a
-
-validator.assertFalse=do\u011frulanamad\u0131
-validator.assertTrue=do\u011frulanamad\u0131
-validator.future=gelecek bir tarih olmal\u0131d\u0131r
-validator.length=girilen de\u011ferin uzunlu\u011fu {min} ile {max} aras\u0131nda olmal\u0131d\u0131r
-validator.max=girilen de\u011fer {value} ya da daha k\u00fc\u00e7\u00fck olmal\u0131d\u0131r
-validator.min=girilen de\u011fer {value} ya da daha b\u00fcy\u00fck olmal\u0131d\u0131r
-validator.notNull=bir de\u011fer girilmesi gereklidir
-validator.past=ge\u00e7mi\u015f bir tarih girilmelidir
-validator.pattern=girilen de\u011fer "{regex}" tan\u0131mlamas\u0131na uymal\u0131d\u0131r
-validator.range=girilen de\u011ferin b\u00fcy\u00fckl\u00fc\u011f\u00fc {min} ile {max} aras\u0131nda olmal\u0131d\u0131r
-validator.size=girilen de\u011ferin boyut {min} ile {max} aras\u0131nda olmal\u0131d\u0131r
-validator.email=girilen de\u011fer e-posta adresi format\u0131na uygun olmal\u0131d\u0131r
-
-org.jboss.seam.loginFailed=Oturum a\u00e7\u0131lamad\u0131
-org.jboss.seam.loginSuccessful=Ho\u015fgeldiniz, #0
-
-org.jboss.seam.TransactionFailed=\u0130\u015flem tamamlanamad\u0131
-org.jboss.seam.NoConversation=Konu\u015fma sonland\u0131, zaman a\u015f\u0131m\u0131na u\u011frad\u0131 ya da ba\u015fka bir talebi i\u015fliyordu
-org.jboss.seam.IllegalNavigation=Ge\u00e7ersiz y\u00f6nleme(navigasyon)
-org.jboss.seam.ProcessEnded=#0 s\u00fcreci sonlanm\u0131\u015f
-org.jboss.seam.ProcessNotFound=#0 s\u00fcreci bulunamad\u0131
-org.jboss.seam.TaskEnded=#0 g\u00f6revi sonlanm\u0131\u015f
-org.jboss.seam.TaskNotFound=#0 g\u00f6revi bulunamad\u0131
-org.jboss.seam.NotLoggedIn=L\u00fctfen \u00f6ncelikle oturum a\u00e7\u0131n
-
-javax.faces.component.UIInput.CONVERSION=girilen de\u011fer, beklenen tipe d\u00f6n\u00fc\u015ft\u00fcr\u00fclemedi
-javax.faces.component.UIInput.REQUIRED=bir de\u011fer girilmesi gereklidir
-javax.faces.component.UIInput.UPDATE=talebiniz i\u015flenirken bir hata olu\u015ftu
-javax.faces.component.UISelectOne.INVALID=ge\u00e7erli bir de\u011fer girilmelidir
-javax.faces.component.UISelectMany.INVALID=ge\u00e7erli bir de\u011fer girilmelidir
-
-javax.faces.converter.BigDecimalConverter.DECIMAL=bir say\u0131 girilmelidir
-javax.faces.converter.BigDecimalConverter.DECIMAL_detail=girilen de\u011fer, s\u0131f\u0131r ya da daha fazla basamak i\u00e7eren, ondal\u0131k ayrac\u0131 ve ondal\u0131k basamak i\u00e7erebilen i\u015faretli bir ondal\u0131k say\u0131 olmal\u0131d\u0131r, \u00f6rn. {1}
-javax.faces.converter.BigIntegerConverter.BIGINTEGER=bir tamsay\u0131 girilmelidir
-javax.faces.converter.BigIntegerConverter.BIGINTEGER_detail=girilen de\u011fer bir ya da daha fazla basamak i\u00e7eren bir tamsay\u0131 olmal\u0131d\u0131r
-javax.faces.converter.BooleanConverter.BOOLEAN=girilen de\u011fer true ya da false olmal\u0131d\u0131r
-javax.faces.converter.BooleanConverter.BOOLEAN_detail=girilen de\u011fer true ya da false olmal\u0131d\u0131r (true olmayan her de\u011fer false olarak de\u011ferlendirilecektir)
-javax.faces.converter.ByteConverter.BYTE=girilen de\u011fer 0 ile 255 aras\u0131nda bir say\u0131 olmal\u0131d\u0131r
-javax.faces.converter.ByteConverter.BYTE_detail=girilen de\u011fer 0 ile 255 aras\u0131nda bir say\u0131 olmal\u0131d\u0131r
-javax.faces.converter.CharacterConverter.CHARACTER=girilen de\u011fer bir karakter olmal\u0131d\u0131r
-javax.faces.converter.CharacterConverter.CHARACTER_detail=ge\u00e7erli bir ASCII karakter girilmelidir
-javax.faces.converter.DateTimeConverter.DATE=girilen de\u011fer bir tarih olmal\u0131d\u0131r
-javax.faces.converter.DateTimeConverter.DATE_detail=girilen de\u011fer bir tarih olmal\u0131d\u0131r, \u00f6rn. {1}
-javax.faces.converter.DateTimeConverter.TIME=girilen de\u011fer bir zaman olmal\u0131d\u0131r
-javax.faces.converter.DateTimeConverter.TIME_detail=girilen de\u011fer bir zaman olmal\u0131d\u0131r, \u00f6rn. {1}
-javax.faces.converter.DateTimeConverter.DATETIME=girilen de\u011fer tarih ve zaman i\u00e7ermelidir
-javax.faces.converter.DateTimeConverter.DATETIME_detail=girilen de\u011fer tarih ve zaman i\u00e7ermelidir, \u00f6rn. {1}
-javax.faces.converter.DateTimeConverter.PATTERN_TYPE=girilen de\u011feri d\u00f6n\u00fc\u015ft\u00fcrebilmek i\u00e7in bir desen(pattern) ya da tip \u00f6zniteli\u011fi(attribute) tan\u0131mlanmal\u0131d\u0131r.
-javax.faces.converter.DoubleConverter.DOUBLE=bir say\u0131 girilmelidir
-javax.faces.converter.DoubleConverter.DOUBLE_detail=4.9E-324 ile 1.7976931348623157E308 aras\u0131nda bir say\u0131 girilmelidir
-javax.faces.converter.EnumConverter.ENUM=girilen de\u011fer enum tipine d\u00f6n\u00fc\u015ft\u00fcr\u00fclebilmelidir
-javax.faces.converter.EnumConverter.ENUM_detail=girilen de\u011fer sabit i\u00e7eren bir enum tipinden enum tipine d\u00f6n\u00fc\u015ft\u00fcr\u00fclebilmelidir {1}
-javax.faces.converter.EnumConverter.ENUM_NO_CLASS=girilen de\u011fer enum tipinden enum tipine d\u00f6n\u00fc\u015ft\u00fcr\u00fclebilmelidir. Ancak enum s\u0131n\u0131f\u0131(class) bulunamad\u0131
-javax.faces.converter.EnumConverter.ENUM_NO_CLASS_detail=girilen de\u011fer enum tipinden enum tipine d\u00f6n\u00fc\u015ft\u00fcr\u00fclebilmelidir. Ancak enum s\u0131n\u0131f\u0131(class) bulunamad\u0131
-javax.faces.converter.FloatConverter.FLOAT=bir say\u0131 girilmelidir
-javax.faces.converter.FloatConverter.FLOAT_detail=1.4E-45 ile 3.4028235E38 aras\u0131nda bir say\u0131 girilmelidir
-javax.faces.converter.IntegerConverter.INTEGER=bir tamsay\u0131 girilmelidir
-javax.faces.converter.IntegerConverter.INTEGER_detail=-2147483648 ile 2147483647 aras\u0131nda bir tamsay\u0131 girilmelidir
-javax.faces.converter.LongConverter.LONG=bir tamsay\u0131 girilmelidir
-javax.faces.converter.LongConverter.LONG_detail=-9223372036854775808 ile 9223372036854775807 aras\u0131nda bir tamsay\u0131 girilmelidir
-javax.faces.converter.NumberConverter.CURRENCY=para birimi tipinden bir de\u011fer girilmelidir
-javax.faces.converter.NumberConverter.CURRENCY_detail=para birimi tipinden bir de\u011fer girilmelidir, \u00f6rn. {1}
-javax.faces.converter.NumberConverter.PERCENT=y\u00fczdelik tipinden bir de\u011fer girilmelidir
-javax.faces.converter.NumberConverter.PERCENT_detail=y\u00fczdelik tipinden bir de\u011fer girilmelidir, \u00f6rn. {1}
-javax.faces.converter.NumberConverter.NUMBER=bir say\u0131 girilmelidir
-javax.faces.converter.NumberConverter.NUMBER_detail=bir say\u0131 girilmelidir
-javax.faces.converter.NumberConverter.PATTERN=bir say\u0131 girilmelidir
-javax.faces.converter.NumberConverter.PATTERN_detail=bir say\u0131 girilmelidir
-javax.faces.converter.ShortConverter.SHORT=bir tamsay\u0131 girilmelidir
-javax.faces.converter.ShortConverter.SHORT_detail=-32768 ile 32767 aras\u0131nda bir tamsay\u0131 girilmelidir
-
-javax.faces.validator.DoubleRangeValidator.MAXIMUM=girilen de\u011fer {0} ya da daha k\u00fc\u00e7\u00fck olmal\u0131d\u0131r
-javax.faces.validator.DoubleRangeValidator.MINIMUM=girilen de\u011fer {0} ya da daha b\u00fcy\u00fck olmal\u0131d\u0131r
-javax.faces.validator.DoubleRangeValidator.NOT_IN_RANGE=girilen de\u011fer {0} ile {1} aras\u0131nda olmal\u0131d\u0131r
-javax.faces.validator.DoubleRangeValidator.TYPE=girilen de\u011ferin tipi yanl\u0131\u015f
-javax.faces.validator.LengthValidator.MAXIMUM=girilen de\u011fer {0} ya da daha az karakter i\u00e7ermelidir
-javax.faces.validator.LengthValidator.MINIMUM=girilen de\u011fer {0} ya da fazla karakter i\u00e7ermelidir
-javax.faces.validator.LongRangeValidator.MAXIMUM=girilen de\u011fer {0} ya da daha k\u00fc\u00e7\u00fck olmal\u0131d\u0131r
-javax.faces.validator.LongRangeValidator.MINIMUM=girilen de\u011fer {0} ya da daha b\u00fcy\u00fck olmal\u0131d\u0131r
-javax.faces.validator.LongRangeValidator.NOT_IN_RANGE=girilen de\u011fer {0} ile {1} aral\u0131\u011f\u0131nda olmal\u0131d\u0131r
-javax.faces.validator.LongRangeValidator.TYPE=yanl\u0131\u015f tipte bir de\u011fer girildi
-
-javax.faces.validator.NOT_IN_RANGE=girilen de\u011fer {0} ile {1} aral\u0131\u011f\u0131nda olmal\u0131d\u0131r
-javax.faces.converter.STRING=girilen de\u011fer bir dizgiye(string) d\u00f6n\u00fc\u015ft\u00fcr\u00fclemedi
-
Deleted: trunk/resources/seam-gen.reveng.xml
===================================================================
--- trunk/resources/seam-gen.reveng.xml 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/resources/seam-gen.reveng.xml 2008-02-29 18:45:19 UTC (rev 229)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-reverse-engineering SYSTEM "http://hibernate.sourceforge.net/hibernate-reverse-engineering-3.0.dtd" >
-<hibernate-reverse-engineering>
-
- <!-- This file is intentionally generated empty by seam-gen -->
- <!-- You can add any filtering/setup you want for your app -->
-
-</hibernate-reverse-engineering>
\ No newline at end of file
Deleted: trunk/resources/treecache.xml
===================================================================
--- trunk/resources/treecache.xml 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/resources/treecache.xml 2008-02-29 18:45:19 UTC (rev 229)
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<server>
- <classpath codebase="./lib" archives="jboss-cache.jar, jgroups.jar" />
-
- <!-- ==================================================================== -->
- <!-- Defines TreeCache configuration -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.cache.TreeCache" name="jboss.cache:service=TreeCache">
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
-
- <!-- Configure the TransactionManager -->
- <attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>
-
- <!--
- Node locking scheme :
- PESSIMISTIC (default)
- OPTIMISTIC
- -->
- <attribute name="NodeLockingScheme">PESSIMISTIC</attribute>
-
- <!--
- Node locking isolation level :
- SERIALIZABLE
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED
- NONE
-
- (ignored if NodeLockingScheme is OPTIMISTIC)
- -->
- <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-
- <!-- Lock parent before doing node additions/removes -->
- <attribute name="LockParentForChildInsertRemove">true</attribute>
-
- <!-- Valid modes are LOCAL
- REPL_ASYNC
- REPL_SYNC
- INVALIDATION_ASYNC
- INVALIDATION_SYNC
- -->
- <attribute name="CacheMode">LOCAL</attribute>
-
- <!-- Whether each interceptor should have an mbean
-registered to capture and display its statistics. -->
- <attribute name="UseInterceptorMbeans">true</attribute>
-
- <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
- cluster, in order to find each other -->
- <attribute name="ClusterName">JBoss-Feeds-Cluster</attribute>
-
- <!-- Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS. -->
- <!--
- <depends>jgroups.mux:name=Multiplexer</depends>
- <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
- <attribute name="MultiplexerStack">udp</attribute>
- -->
-
- <!-- JGroups protocol stack properties. ClusterConfig isn't used if the
- multiplexer is enabled and successfully initialized. -->
- <attribute name="ClusterConfig">
- <config>
- <!-- UDP: if you have a multihomed machine,
- set the bind_addr attribute to the appropriate NIC IP address
- -->
- <!-- UDP: On Windows machines, because of the media sense feature
- being broken with multicast (even after disabling media sense)
- set the loopback attribute to true
- -->
- <UDP mcast_addr="228.1.2.3" mcast_port="45566" ip_ttl="64" ip_mcast="true"
- mcast_send_buf_size="150000" mcast_recv_buf_size="80000" ucast_send_buf_size="150000"
- ucast_recv_buf_size="80000" loopback="false" />
- <PING timeout="2000" num_initial_members="3" up_thread="false" down_thread="false" />
- <MERGE2 min_interval="10000" max_interval="20000" />
- <FD shun="true" up_thread="true" down_thread="true" />
- <VERIFY_SUSPECT timeout="1500" up_thread="false" down_thread="false" />
- <pbcast.NAKACK gc_lag="50" max_xmit_size="8192" retransmit_timeout="600,1200,2400,4800" up_thread="false"
- down_thread="false" />
- <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10" down_thread="false" />
- <pbcast.STABLE desired_avg_gossip="20000" up_thread="false" down_thread="false" />
- <FRAG frag_size="8192" down_thread="false" up_thread="false" />
- <pbcast.GMS join_timeout="5000" join_retry_timeout="2000" shun="true" print_local_addr="true" />
- <pbcast.STATE_TRANSFER up_thread="false" down_thread="false" />
- </config>
- </attribute>
-
- <!-- The max amount of time (in milliseconds) we wait until the
- initial state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="InitialStateRetrievalTimeout">5000</attribute>
-
- <!-- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">10000</attribute>
-
- <!-- Max number of milliseconds to wait for a lock acquisition -->
- <attribute name="LockAcquisitionTimeout">15000</attribute>
- </mbean>
-</server>
\ No newline at end of file
Added: trunk/resources-portlet/WEB-INF/jboss-app.xml
===================================================================
--- trunk/resources-portlet/WEB-INF/jboss-app.xml (rev 0)
+++ trunk/resources-portlet/WEB-INF/jboss-app.xml 2008-02-29 18:45:19 UTC (rev 229)
@@ -0,0 +1,3 @@
+<jboss-app>
+ <app-name>feeds</app-name>
+</jboss-app>
\ No newline at end of file
Deleted: trunk/resources-portlet/WEB-INF/portlet-instances.xml
===================================================================
--- trunk/resources-portlet/WEB-INF/portlet-instances.xml 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/resources-portlet/WEB-INF/portlet-instances.xml 2008-02-29 18:45:19 UTC (rev 229)
@@ -1,44 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<!DOCTYPE deployments PUBLIC
- "-//JBoss Portal//DTD Portlet Instances 2.6//EN"
- "http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd">
-<deployments>
- <deployment>
- <if-exists>overwrite</if-exists>
- <instance>
- <instance-id>BlogPortletInstance1</instance-id>
- <portlet-ref>BlogPortlet</portlet-ref>
- <preferences>
- <preference>
- <name>feedName</name>
- <value>bob2</value>
- </preference>
- </preferences>
- </instance>
- </deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <instance>
- <instance-id>BlogPortletInstance2</instance-id>
- <portlet-ref>BlogPortlet</portlet-ref>
- <preferences>
- <preference>
- <name>feedName</name>
- <value>bob2</value>
- </preference>
- <preference>
- <name>summaryLength</name>
- <value>0</value>
- </preference>
- <preference>
- <name>showDate</name>
- <value>false</value>
- </preference>
- <preference>
- <name>numberOfPostsPerPage</name>
- <value>10</value>
- </preference>
- </preferences>
- </instance>
- </deployment>
-</deployments>
\ No newline at end of file
Deleted: trunk/resources-portlet/WEB-INF/portlet-object.xml
===================================================================
--- trunk/resources-portlet/WEB-INF/portlet-object.xml 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/resources-portlet/WEB-INF/portlet-object.xml 2008-02-29 18:45:19 UTC (rev 229)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE deployments PUBLIC
- "-//JBoss Portal//DTD Portal Object 2.6//EN"
- "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
-<deployments>
- <deployment>
- <parent-ref>default.default</parent-ref>
- <if-exists>overwrite</if-exists>
- <window>
- <window-name>BlogPortletWindow1</window-name>
- <instance-ref>BlogPortletInstance1</instance-ref>
- <region>center</region>
- <height>1</height>
- </window>
- </deployment>
- <deployment>
- <parent-ref>default.default</parent-ref>
- <if-exists>overwrite</if-exists>
- <window>
- <window-name>BlogPortletWindow2</window-name>
- <instance-ref>BlogPortletInstance2</instance-ref>
- <region>center</region>
- <height>2</height>
- </window>
- </deployment>
-</deployments>
\ No newline at end of file
Modified: trunk/resources-portlet/WEB-INF/portlet.xml
===================================================================
--- trunk/resources-portlet/WEB-INF/portlet.xml 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/resources-portlet/WEB-INF/portlet.xml 2008-02-29 18:45:19 UTC (rev 229)
@@ -21,7 +21,7 @@
<name>feedName</name>
</preference>
<preference>
- <name>numberOfPostsPerPage</name>
+ <name>numberOfPosts</name>
<value>5</value>
</preference>
<preference>
Modified: trunk/src/action/org/jboss/blog/servlet/FeedsServlet.java
===================================================================
--- trunk/src/action/org/jboss/blog/servlet/FeedsServlet.java 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/src/action/org/jboss/blog/servlet/FeedsServlet.java 2008-02-29 18:45:19 UTC (rev 229)
@@ -69,7 +69,7 @@
} catch (FeedNotFoundException e) {
rollbackTx(tx, txStarted);
- writeErrorMessage("Request feed not found.", response);
+ writeErrorMessage("Requested feed not found.", response);
} catch (Exception e) {
rollbackTx(tx, txStarted);
Modified: trunk/src/action/org/jboss/blog/session/merge/MergeServiceBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/merge/MergeServiceBean.java 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/src/action/org/jboss/blog/session/merge/MergeServiceBean.java 2008-02-29 18:45:19 UTC (rev 229)
@@ -40,18 +40,16 @@
@Logger
private Log log;
- public void savePost(Feed feed, Post post) {
+ private void savePost(Feed feed, Post post, boolean prepared) {
post.setTitleAsId(titleAsIdService.generateTitleAsId(post.getTitle()));
log.debug("Saving post, feed: #0, post title: #1, post titleAsId: #2, published: #3.",
feed.getName(), post.getTitle(), post.getTitleAsId(), post.getPublished());
- if (StringTools.isEmpty(post.getLink())) {
- post.setLink(linkService.generatePostLink(post));
+ if (!prepared) {
+ preparePost(post);
}
- post.setContent(StringTools.fixHtml(post.getContent()));
-
post.setFeed(feed);
entityManager.persist(post);
@@ -69,6 +67,10 @@
Events.instance().raiseEvent("org.jboss.blog.post.added", post);
}
+ public void savePost(Feed feed, Post post) {
+ savePost(feed, post, false);
+ }
+
/**
* Merges the given posts; checks for changes in:
* - author
@@ -134,25 +136,38 @@
}
}
+ private void preparePost(Post post) {
+ if (StringTools.isEmpty(post.getLink())) {
+ post.setLink(linkService.generatePostLink(post));
+ }
+
+ post.setContent(StringTools.fixHtml(post.getContent()));
+ }
+
public void merge(Feed feed, List<Post> posts) {
+ for (Post post : posts) {
+ preparePost(post);
+ }
+
ListPostsIterator<Post> mergeFrom = new ListPostsIterator<Post>(posts);
FeedsServicePostsIterator mergeTo = new FeedsServicePostsIterator(feedsService, feed, posts.size()+1);
while (!mergeFrom.finished()) {
if (mergeTo.finished()) {
// no more current posts
- savePost(feed, mergeFrom.getCurrent());
+ savePost(feed, mergeFrom.getCurrent(), true);
mergeFrom.next();
} else {
int publishedCompare = mergeTo.getCurrent().getPublished().compareTo(
mergeFrom.getCurrent().getPublished());
- int linksCompare = - mergeTo.getCurrent().getLink().compareTo(mergeFrom.getCurrent().getLink());
+ int linksCompare = - GeneralTools.safeCompare(mergeTo.getCurrent().getLink(),
+ mergeFrom.getCurrent().getLink());
int compare = publishedCompare == 0 ? linksCompare : publishedCompare;
if (compare < 0) {
// mergeTo post is before mergeFrom post
- savePost(feed, mergeFrom.getCurrent());
+ savePost(feed, mergeFrom.getCurrent(), true);
mergeFrom.next();
} else if (compare == 0) {
try {
Modified: trunk/src/action/org/jboss/blog/session/update/UpdateThread.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/update/UpdateThread.java 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/src/action/org/jboss/blog/session/update/UpdateThread.java 2008-02-29 18:45:19 UTC (rev 229)
@@ -43,10 +43,13 @@
updateManager.getUpdateInProgress().set(false);
} else {
throw new Exception("New update started before the last one finished, at " +
- DateFormat.getDateTimeInstance().format(new Date()) + "!");
+ DateFormat.getDateTimeInstance().format(new Date()) + "!");
}
} catch (Exception e) {
updateManager.getGlobalExceptions().add(e);
+
+ updateManager.setLastUpdateEnd(System.currentTimeMillis());
+ updateManager.getUpdateInProgress().set(false);
}
if (txStarted) {
Modified: trunk/src/portlet/org/jboss/blog/portlet/BlogPortlet.java
===================================================================
--- trunk/src/portlet/org/jboss/blog/portlet/BlogPortlet.java 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/src/portlet/org/jboss/blog/portlet/BlogPortlet.java 2008-02-29 18:45:19 UTC (rev 229)
@@ -33,7 +33,7 @@
PortletPreferences preferences = request.getPreferences();
String feedName = preferences.getValue("feedName", null);
- String numberOfPostsPerPageString = preferences.getValue("numberOfPostsPerPage", "5");
+ String numberOfPostsPerPageString = preferences.getValue("numberOfPosts", "5");
int numberOfPostsPerPage = Integer.parseInt(numberOfPostsPerPageString);
String summaryLengthString = preferences.getValue("summaryLength", "200");
Modified: trunk/src/tools/org/jboss/blog/tools/GeneralTools.java
===================================================================
--- trunk/src/tools/org/jboss/blog/tools/GeneralTools.java 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/src/tools/org/jboss/blog/tools/GeneralTools.java 2008-02-29 18:45:19 UTC (rev 229)
@@ -79,6 +79,8 @@
}
return 1;
+ } else if (o2 == null) {
+ return -1;
} else {
return o1.compareTo(o2);
}
Modified: trunk/view/layout/template.xhtml
===================================================================
--- trunk/view/layout/template.xhtml 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/view/layout/template.xhtml 2008-02-29 18:45:19 UTC (rev 229)
@@ -9,9 +9,9 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>blog</title>
- <link href="/blog/stylesheet/org_main.css" rel="stylesheet" type="text/css" />
- <link href="/blog/stylesheet/org_layout.css" rel="stylesheet" type="text/css" />
- <link href="/blog/stylesheet/blog.css" rel="stylesheet" type="text/css" />
+ <link href="/blogs/stylesheet/org_main.css" rel="stylesheet" type="text/css" />
+ <link href="/blogs/stylesheet/org_layout.css" rel="stylesheet" type="text/css" />
+ <link href="/blogs/stylesheet/blog.css" rel="stylesheet" type="text/css" />
<ui:insert name="additional_headers" />
</head>
Modified: trunk/view/manage/shotoku/shotoku_mod.xhtml
===================================================================
--- trunk/view/manage/shotoku/shotoku_mod.xhtml 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/view/manage/shotoku/shotoku_mod.xhtml 2008-02-29 18:45:19 UTC (rev 229)
@@ -85,8 +85,7 @@
</h:panelGroup>
<h:outputLabel>
- <s:span styleClass="required" rendered="#{shotokuFeedMod.podcast}" id="podcastPrefixRequired">*</s:span>
- URL prefix for accessing podcast files:
+ URL prefix for podcast files:
</h:outputLabel>
<h:panelGroup>
<h:inputText id="podcastPrefix" value="#{shotokuFeedMod.shotokuFeed.podcastPrefix}"
Modified: trunk/view/manage/update_manager.xhtml
===================================================================
--- trunk/view/manage/update_manager.xhtml 2008-02-28 13:49:07 UTC (rev 228)
+++ trunk/view/manage/update_manager.xhtml 2008-02-29 18:45:19 UTC (rev 229)
@@ -40,7 +40,21 @@
</s:fragment>
<s:fragment rendered="#{updateManager.globalExceptions.size() > 0}">
<ui:repeat var="exception" value="#{updateManager.globalExceptions}">
- #{exception.message} <br />
+ <rich:togglePanel id="stackTracePanel" initialState="nothing" switchType="client"
+ stateOrder="nothing,stackTrace">
+ <f:facet name="nothing">
+ <s:fragment>
+ #{exception.message}
+ </s:fragment>
+ </f:facet>
+ <f:facet name="stackTrace">
+ <s:fragment>
+ #{exception.message} <br />
+ #{updateManager.getExceptionStackTrace(exception)}
+ </s:fragment>
+ </f:facet>
+ </rich:togglePanel>
+ <rich:toggleControl for="stackTracePanel" value="Toggle stack trace"/>
</ui:repeat>
</s:fragment>
</td>
More information about the jboss-cvs-commits
mailing list