[weld-commits] Weld SVN: r5973 - in doc/trunk/reference: es-ES and 8 other directories.

weld-commits at lists.jboss.org weld-commits at lists.jboss.org
Tue Mar 2 08:24:42 EST 2010


Author: pete.muir at jboss.org
Date: 2010-03-02 08:24:32 -0500 (Tue, 02 Mar 2010)
New Revision: 5973

Modified:
   doc/trunk/reference/de-DE/Author_Group.po
   doc/trunk/reference/de-DE/Book_Info.po
   doc/trunk/reference/de-DE/beans.po
   doc/trunk/reference/de-DE/decorators.po
   doc/trunk/reference/de-DE/dependencies.po
   doc/trunk/reference/de-DE/ee.po
   doc/trunk/reference/de-DE/environments.po
   doc/trunk/reference/de-DE/events.po
   doc/trunk/reference/de-DE/example.po
   doc/trunk/reference/de-DE/extend.po
   doc/trunk/reference/de-DE/extensions.po
   doc/trunk/reference/de-DE/gettingstarted.po
   doc/trunk/reference/de-DE/injection.po
   doc/trunk/reference/de-DE/interceptors.po
   doc/trunk/reference/de-DE/intro.po
   doc/trunk/reference/de-DE/master.po
   doc/trunk/reference/de-DE/next.po
   doc/trunk/reference/de-DE/part1.po
   doc/trunk/reference/de-DE/part2.po
   doc/trunk/reference/de-DE/part3.po
   doc/trunk/reference/de-DE/part4.po
   doc/trunk/reference/de-DE/part5.po
   doc/trunk/reference/de-DE/producermethods.po
   doc/trunk/reference/de-DE/resources.po
   doc/trunk/reference/de-DE/ri-spi.po
   doc/trunk/reference/de-DE/scopescontexts.po
   doc/trunk/reference/de-DE/specialization.po
   doc/trunk/reference/de-DE/stereotypes.po
   doc/trunk/reference/de-DE/viewlayers.po
   doc/trunk/reference/de-DE/weldexamples.po
   doc/trunk/reference/de-DE/xml.po
   doc/trunk/reference/es-ES/Author_Group.po
   doc/trunk/reference/es-ES/Book_Info.po
   doc/trunk/reference/es-ES/beans.po
   doc/trunk/reference/es-ES/decorators.po
   doc/trunk/reference/es-ES/dependencies.po
   doc/trunk/reference/es-ES/ee.po
   doc/trunk/reference/es-ES/environments.po
   doc/trunk/reference/es-ES/events.po
   doc/trunk/reference/es-ES/example.po
   doc/trunk/reference/es-ES/extend.po
   doc/trunk/reference/es-ES/extensions.po
   doc/trunk/reference/es-ES/gettingstarted.po
   doc/trunk/reference/es-ES/injection.po
   doc/trunk/reference/es-ES/interceptors.po
   doc/trunk/reference/es-ES/intro.po
   doc/trunk/reference/es-ES/master.po
   doc/trunk/reference/es-ES/next.po
   doc/trunk/reference/es-ES/part1.po
   doc/trunk/reference/es-ES/part2.po
   doc/trunk/reference/es-ES/part3.po
   doc/trunk/reference/es-ES/part4.po
   doc/trunk/reference/es-ES/part5.po
   doc/trunk/reference/es-ES/producermethods.po
   doc/trunk/reference/es-ES/resources.po
   doc/trunk/reference/es-ES/ri-spi.po
   doc/trunk/reference/es-ES/scopescontexts.po
   doc/trunk/reference/es-ES/specialization.po
   doc/trunk/reference/es-ES/stereotypes.po
   doc/trunk/reference/es-ES/viewlayers.po
   doc/trunk/reference/es-ES/weldexamples.po
   doc/trunk/reference/es-ES/xml.po
   doc/trunk/reference/fr-FR/Author_Group.po
   doc/trunk/reference/fr-FR/Book_Info.po
   doc/trunk/reference/fr-FR/beans.po
   doc/trunk/reference/fr-FR/decorators.po
   doc/trunk/reference/fr-FR/dependencies.po
   doc/trunk/reference/fr-FR/ee.po
   doc/trunk/reference/fr-FR/environments.po
   doc/trunk/reference/fr-FR/events.po
   doc/trunk/reference/fr-FR/example.po
   doc/trunk/reference/fr-FR/extend.po
   doc/trunk/reference/fr-FR/extensions.po
   doc/trunk/reference/fr-FR/gettingstarted.po
   doc/trunk/reference/fr-FR/injection.po
   doc/trunk/reference/fr-FR/interceptors.po
   doc/trunk/reference/fr-FR/intro.po
   doc/trunk/reference/fr-FR/master.po
   doc/trunk/reference/fr-FR/next.po
   doc/trunk/reference/fr-FR/part1.po
   doc/trunk/reference/fr-FR/part2.po
   doc/trunk/reference/fr-FR/part3.po
   doc/trunk/reference/fr-FR/part4.po
   doc/trunk/reference/fr-FR/part5.po
   doc/trunk/reference/fr-FR/producermethods.po
   doc/trunk/reference/fr-FR/resources.po
   doc/trunk/reference/fr-FR/ri-spi.po
   doc/trunk/reference/fr-FR/scopescontexts.po
   doc/trunk/reference/fr-FR/specialization.po
   doc/trunk/reference/fr-FR/stereotypes.po
   doc/trunk/reference/fr-FR/viewlayers.po
   doc/trunk/reference/fr-FR/weldexamples.po
   doc/trunk/reference/fr-FR/xml.po
   doc/trunk/reference/it-IT/Author_Group.po
   doc/trunk/reference/it-IT/Book_Info.po
   doc/trunk/reference/it-IT/beans.po
   doc/trunk/reference/it-IT/decorators.po
   doc/trunk/reference/it-IT/dependencies.po
   doc/trunk/reference/it-IT/ee.po
   doc/trunk/reference/it-IT/environments.po
   doc/trunk/reference/it-IT/events.po
   doc/trunk/reference/it-IT/example.po
   doc/trunk/reference/it-IT/extend.po
   doc/trunk/reference/it-IT/extensions.po
   doc/trunk/reference/it-IT/gettingstarted.po
   doc/trunk/reference/it-IT/injection.po
   doc/trunk/reference/it-IT/interceptors.po
   doc/trunk/reference/it-IT/intro.po
   doc/trunk/reference/it-IT/master.po
   doc/trunk/reference/it-IT/next.po
   doc/trunk/reference/it-IT/part1.po
   doc/trunk/reference/it-IT/part2.po
   doc/trunk/reference/it-IT/part3.po
   doc/trunk/reference/it-IT/part4.po
   doc/trunk/reference/it-IT/part5.po
   doc/trunk/reference/it-IT/producermethods.po
   doc/trunk/reference/it-IT/resources.po
   doc/trunk/reference/it-IT/ri-spi.po
   doc/trunk/reference/it-IT/scopescontexts.po
   doc/trunk/reference/it-IT/specialization.po
   doc/trunk/reference/it-IT/stereotypes.po
   doc/trunk/reference/it-IT/viewlayers.po
   doc/trunk/reference/it-IT/weldexamples.po
   doc/trunk/reference/it-IT/xml.po
   doc/trunk/reference/ja-JP/Author_Group.po
   doc/trunk/reference/ja-JP/Book_Info.po
   doc/trunk/reference/ja-JP/beans.po
   doc/trunk/reference/ja-JP/decorators.po
   doc/trunk/reference/ja-JP/dependencies.po
   doc/trunk/reference/ja-JP/ee.po
   doc/trunk/reference/ja-JP/environments.po
   doc/trunk/reference/ja-JP/events.po
   doc/trunk/reference/ja-JP/example.po
   doc/trunk/reference/ja-JP/extend.po
   doc/trunk/reference/ja-JP/extensions.po
   doc/trunk/reference/ja-JP/gettingstarted.po
   doc/trunk/reference/ja-JP/injection.po
   doc/trunk/reference/ja-JP/interceptors.po
   doc/trunk/reference/ja-JP/intro.po
   doc/trunk/reference/ja-JP/master.po
   doc/trunk/reference/ja-JP/next.po
   doc/trunk/reference/ja-JP/part1.po
   doc/trunk/reference/ja-JP/part2.po
   doc/trunk/reference/ja-JP/part3.po
   doc/trunk/reference/ja-JP/part4.po
   doc/trunk/reference/ja-JP/part5.po
   doc/trunk/reference/ja-JP/producermethods.po
   doc/trunk/reference/ja-JP/resources.po
   doc/trunk/reference/ja-JP/ri-spi.po
   doc/trunk/reference/ja-JP/scopescontexts.po
   doc/trunk/reference/ja-JP/specialization.po
   doc/trunk/reference/ja-JP/stereotypes.po
   doc/trunk/reference/ja-JP/viewlayers.po
   doc/trunk/reference/ja-JP/weldexamples.po
   doc/trunk/reference/ja-JP/xml.po
   doc/trunk/reference/ko-KR/Author_Group.po
   doc/trunk/reference/ko-KR/Book_Info.po
   doc/trunk/reference/ko-KR/beans.po
   doc/trunk/reference/ko-KR/decorators.po
   doc/trunk/reference/ko-KR/dependencies.po
   doc/trunk/reference/ko-KR/ee.po
   doc/trunk/reference/ko-KR/environments.po
   doc/trunk/reference/ko-KR/events.po
   doc/trunk/reference/ko-KR/example.po
   doc/trunk/reference/ko-KR/extend.po
   doc/trunk/reference/ko-KR/extensions.po
   doc/trunk/reference/ko-KR/gettingstarted.po
   doc/trunk/reference/ko-KR/injection.po
   doc/trunk/reference/ko-KR/interceptors.po
   doc/trunk/reference/ko-KR/intro.po
   doc/trunk/reference/ko-KR/master.po
   doc/trunk/reference/ko-KR/next.po
   doc/trunk/reference/ko-KR/part1.po
   doc/trunk/reference/ko-KR/part2.po
   doc/trunk/reference/ko-KR/part3.po
   doc/trunk/reference/ko-KR/part4.po
   doc/trunk/reference/ko-KR/part5.po
   doc/trunk/reference/ko-KR/producermethods.po
   doc/trunk/reference/ko-KR/resources.po
   doc/trunk/reference/ko-KR/ri-spi.po
   doc/trunk/reference/ko-KR/scopescontexts.po
   doc/trunk/reference/ko-KR/specialization.po
   doc/trunk/reference/ko-KR/stereotypes.po
   doc/trunk/reference/ko-KR/viewlayers.po
   doc/trunk/reference/ko-KR/weldexamples.po
   doc/trunk/reference/ko-KR/xml.po
   doc/trunk/reference/pot/Author_Group.pot
   doc/trunk/reference/pot/Book_Info.pot
   doc/trunk/reference/pot/beans.pot
   doc/trunk/reference/pot/decorators.pot
   doc/trunk/reference/pot/dependencies.pot
   doc/trunk/reference/pot/ee.pot
   doc/trunk/reference/pot/environments.pot
   doc/trunk/reference/pot/events.pot
   doc/trunk/reference/pot/example.pot
   doc/trunk/reference/pot/extend.pot
   doc/trunk/reference/pot/extensions.pot
   doc/trunk/reference/pot/gettingstarted.pot
   doc/trunk/reference/pot/injection.pot
   doc/trunk/reference/pot/interceptors.pot
   doc/trunk/reference/pot/intro.pot
   doc/trunk/reference/pot/master.pot
   doc/trunk/reference/pot/next.pot
   doc/trunk/reference/pot/part1.pot
   doc/trunk/reference/pot/part2.pot
   doc/trunk/reference/pot/part3.pot
   doc/trunk/reference/pot/part4.pot
   doc/trunk/reference/pot/part5.pot
   doc/trunk/reference/pot/producermethods.pot
   doc/trunk/reference/pot/resources.pot
   doc/trunk/reference/pot/ri-spi.pot
   doc/trunk/reference/pot/scopescontexts.pot
   doc/trunk/reference/pot/specialization.pot
   doc/trunk/reference/pot/stereotypes.pot
   doc/trunk/reference/pot/viewlayers.pot
   doc/trunk/reference/pot/weldexamples.pot
   doc/trunk/reference/pot/xml.pot
   doc/trunk/reference/pt-BR/Author_Group.po
   doc/trunk/reference/pt-BR/Book_Info.po
   doc/trunk/reference/pt-BR/beans.po
   doc/trunk/reference/pt-BR/decorators.po
   doc/trunk/reference/pt-BR/dependencies.po
   doc/trunk/reference/pt-BR/ee.po
   doc/trunk/reference/pt-BR/environments.po
   doc/trunk/reference/pt-BR/events.po
   doc/trunk/reference/pt-BR/example.po
   doc/trunk/reference/pt-BR/extend.po
   doc/trunk/reference/pt-BR/extensions.po
   doc/trunk/reference/pt-BR/gettingstarted.po
   doc/trunk/reference/pt-BR/injection.po
   doc/trunk/reference/pt-BR/interceptors.po
   doc/trunk/reference/pt-BR/intro.po
   doc/trunk/reference/pt-BR/master.po
   doc/trunk/reference/pt-BR/next.po
   doc/trunk/reference/pt-BR/part1.po
   doc/trunk/reference/pt-BR/part2.po
   doc/trunk/reference/pt-BR/part3.po
   doc/trunk/reference/pt-BR/part4.po
   doc/trunk/reference/pt-BR/part5.po
   doc/trunk/reference/pt-BR/producermethods.po
   doc/trunk/reference/pt-BR/resources.po
   doc/trunk/reference/pt-BR/ri-spi.po
   doc/trunk/reference/pt-BR/scopescontexts.po
   doc/trunk/reference/pt-BR/specialization.po
   doc/trunk/reference/pt-BR/stereotypes.po
   doc/trunk/reference/pt-BR/viewlayers.po
   doc/trunk/reference/pt-BR/weldexamples.po
   doc/trunk/reference/pt-BR/xml.po
   doc/trunk/reference/zh-CN/Author_Group.po
   doc/trunk/reference/zh-CN/Book_Info.po
   doc/trunk/reference/zh-CN/beans.po
   doc/trunk/reference/zh-CN/decorators.po
   doc/trunk/reference/zh-CN/dependencies.po
   doc/trunk/reference/zh-CN/ee.po
   doc/trunk/reference/zh-CN/environments.po
   doc/trunk/reference/zh-CN/events.po
   doc/trunk/reference/zh-CN/example.po
   doc/trunk/reference/zh-CN/extend.po
   doc/trunk/reference/zh-CN/extensions.po
   doc/trunk/reference/zh-CN/gettingstarted.po
   doc/trunk/reference/zh-CN/injection.po
   doc/trunk/reference/zh-CN/interceptors.po
   doc/trunk/reference/zh-CN/intro.po
   doc/trunk/reference/zh-CN/master.po
   doc/trunk/reference/zh-CN/next.po
   doc/trunk/reference/zh-CN/part1.po
   doc/trunk/reference/zh-CN/part2.po
   doc/trunk/reference/zh-CN/part3.po
   doc/trunk/reference/zh-CN/part4.po
   doc/trunk/reference/zh-CN/part5.po
   doc/trunk/reference/zh-CN/producermethods.po
   doc/trunk/reference/zh-CN/resources.po
   doc/trunk/reference/zh-CN/ri-spi.po
   doc/trunk/reference/zh-CN/scopescontexts.po
   doc/trunk/reference/zh-CN/specialization.po
   doc/trunk/reference/zh-CN/stereotypes.po
   doc/trunk/reference/zh-CN/viewlayers.po
   doc/trunk/reference/zh-CN/weldexamples.po
   doc/trunk/reference/zh-CN/xml.po
   doc/trunk/reference/zh-TW/Author_Group.po
   doc/trunk/reference/zh-TW/Book_Info.po
   doc/trunk/reference/zh-TW/beans.po
   doc/trunk/reference/zh-TW/decorators.po
   doc/trunk/reference/zh-TW/dependencies.po
   doc/trunk/reference/zh-TW/ee.po
   doc/trunk/reference/zh-TW/environments.po
   doc/trunk/reference/zh-TW/events.po
   doc/trunk/reference/zh-TW/example.po
   doc/trunk/reference/zh-TW/extend.po
   doc/trunk/reference/zh-TW/extensions.po
   doc/trunk/reference/zh-TW/gettingstarted.po
   doc/trunk/reference/zh-TW/injection.po
   doc/trunk/reference/zh-TW/interceptors.po
   doc/trunk/reference/zh-TW/intro.po
   doc/trunk/reference/zh-TW/master.po
   doc/trunk/reference/zh-TW/next.po
   doc/trunk/reference/zh-TW/part1.po
   doc/trunk/reference/zh-TW/part2.po
   doc/trunk/reference/zh-TW/part3.po
   doc/trunk/reference/zh-TW/part4.po
   doc/trunk/reference/zh-TW/part5.po
   doc/trunk/reference/zh-TW/producermethods.po
   doc/trunk/reference/zh-TW/resources.po
   doc/trunk/reference/zh-TW/ri-spi.po
   doc/trunk/reference/zh-TW/scopescontexts.po
   doc/trunk/reference/zh-TW/specialization.po
   doc/trunk/reference/zh-TW/stereotypes.po
   doc/trunk/reference/zh-TW/viewlayers.po
   doc/trunk/reference/zh-TW/weldexamples.po
   doc/trunk/reference/zh-TW/xml.po
Log:
update po/pot

Modified: doc/trunk/reference/de-DE/Author_Group.po
===================================================================
--- doc/trunk/reference/de-DE/Author_Group.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/Author_Group.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Author_Group\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-07 14:52+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -15,108 +15,124 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#. Tag: author
-#: Author_Group.xml:5
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Gavin</firstname> <surname>King</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+msgid "Gavin"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:8
 #, no-c-format
 msgid "JSR-299: Contexts and Dependency Injection Lead"
 msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:14
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+msgid "Pete"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:17
 #, no-c-format
 msgid "Weld (JSR-299 RI) Lead"
 msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:24
-#, fuzzy, no-c-format
-msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Dan"
+msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:31
-#, fuzzy, no-c-format
-msgid "<firstname>David</firstname> <surname>Allen</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "David"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:35
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
-msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+msgid "Nicola"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:38 Author_Group.xml:67
 #, no-c-format
 msgid "Italian Translation"
 msgstr "Italienische Übersetzung"
 
-#. Tag: othercredit
-#: Author_Group.xml:40
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
-msgstr "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+msgid "Gladys"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:43
 #, no-c-format
 msgid "Spanish Translation"
 msgstr "Spanische Übersetzung"
 
-#. Tag: othercredit
-#: Author_Group.xml:48
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
-msgstr "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+msgid "Eun-Ju"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:51
 #, no-c-format
 msgid "Korean Translation"
 msgstr "Koreanische Übersetzung"
 
-#. Tag: othercredit
-#: Author_Group.xml:56
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
-msgstr "<firstname>Terry</firstname> <surname>Chuang</surname>"
+msgid "Terry"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:59
 #, no-c-format
 msgid "Traditional Chinese Translation"
 msgstr "Chinesische Übersetzung (traditionell)"
 
-#. Tag: othercredit
-#: Author_Group.xml:64
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
-msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+msgid "Francesco"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:69
-#, fuzzy, no-c-format
-msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Sean"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:72
 #, fuzzy, no-c-format
 msgid "Simplified Chinese Translation"
 msgstr "Chinesische Übersetzung (traditionell)"
 
+#~ msgid "<firstname>Gavin</firstname> <surname>King</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#~ msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>David</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#~ msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+#~ msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+
+#~ msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+#~ msgstr "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+
+#~ msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+#~ msgstr "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+
+#~ msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
+#~ msgstr "<firstname>Terry</firstname> <surname>Chuang</surname>"
+
+#~ msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+#~ msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
 #~ msgid ""
 #~ "<jobtitle>JSR-299 specification lead</jobtitle> <orgname>Red Hat "
 #~ "Middleware LLC</orgname>"

Modified: doc/trunk/reference/de-DE/Book_Info.po
===================================================================
--- doc/trunk/reference/de-DE/Book_Info.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/Book_Info.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Book_Info\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-07 14:55+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,13 +16,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: Book_Info.xml:4
 #, no-c-format
 msgid "Weld - JSR-299 Reference Implementation"
 msgstr ""
 
 #. Tag: subtitle
-#: Book_Info.xml:5
 #, fuzzy, no-c-format
 msgid ""
 "JSR-299: The new Java standard for dependency injection and contextual "

Modified: doc/trunk/reference/de-DE/beans.po
===================================================================
--- doc/trunk/reference/de-DE/beans.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/beans.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: beans.xml:4
 #, no-c-format
 msgid "More about beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:6
 #, no-c-format
 msgid ""
 "A bean is usually an application class that contains business logic. It may "
@@ -32,7 +30,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:13
 #, no-c-format
 msgid ""
 "Let's back up a second. What does it really mean to be <emphasis>contextual</"
@@ -45,7 +42,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:21
 #, no-c-format
 msgid ""
 "However, like a stateless or singleton model, but <emphasis>unlike</"
@@ -55,19 +51,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:29
 #, no-c-format
 msgid "the lifecycle of each instance of the bean and"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:32
 #, no-c-format
 msgid "which clients share a reference to a particular instance of the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:36
 #, no-c-format
 msgid ""
 "For a given thread in a CDI application, there may be an <emphasis>active "
@@ -78,7 +71,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:43
 #, no-c-format
 msgid ""
 "Clients (for example, other beans) executing in the same context will see "
@@ -87,7 +79,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:49
 #, no-c-format
 msgid ""
 "One great advantage of the contextual model is that it allows stateful beans "
@@ -99,46 +90,39 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:58
 #, no-c-format
 msgid "they interact via well-defined public APIs"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:61
 #, no-c-format
 msgid "their lifecycles are completely decoupled"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:65
 #, no-c-format
 msgid ""
 "We can replace one bean with another different bean that implements the same "
 "interface and has a different lifecycle (a different scope) without "
 "affecting the other bean implementation. In fact, CDI defines a simple "
 "facility for overriding bean implementations at deployment time, as we will "
-"see in <xref linkend=\"alternatives\"/>."
+"see in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:71
 #, no-c-format
 msgid ""
 "Note that not all clients of a bean are beans themselves. Other objects such "
-"as servlets or message-driven beans&#8212;which are by nature not "
-"injectable, contextual objects&#8212;may also obtain references to beans by "
-"injection."
+"as servlets or message-driven beans—which are by nature not injectable, "
+"contextual objects—may also obtain references to beans by injection."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:78
 #, no-c-format
 msgid "The anatomy of a bean"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:80
 #, no-c-format
 msgid ""
 "Enough hand-waving. More formally, the anatomy of a bean, according to the "
@@ -146,67 +130,56 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:84
 #, no-c-format
 msgid "A bean comprises the following attributes:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:87
 #, no-c-format
 msgid "A (nonempty) set of bean types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:88
 #, no-c-format
 msgid "A (nonempty) set of qualifiers"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:89
 #, no-c-format
 msgid "A scope"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:90
 #, no-c-format
 msgid "Optionally, a bean EL name"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:91
 #, no-c-format
 msgid "A set of interceptor bindings"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:92
 #, no-c-format
 msgid "A bean implementation"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:95
 #, no-c-format
 msgid "Furthermore, a bean may or may not be an alternative."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:99
 #, no-c-format
 msgid "Let's see what all this new terminology means."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:102
 #, no-c-format
 msgid "Bean types, qualifiers and dependency injection"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:104
 #, no-c-format
 msgid ""
 "Beans usually acquire references to other beans via dependency injection. "
@@ -215,19 +188,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:110
 #, no-c-format
 msgid "a bean type, together with"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:111
 #, no-c-format
 msgid "a set of qualifiers."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:114
 #, no-c-format
 msgid ""
 "A bean type is a user-defined class or interface; a type that is client-"
@@ -237,19 +207,7 @@
 "types:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:120
-#, no-c-format
-msgid ""
-"<![CDATA[public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:122
 #, no-c-format
 msgid ""
 "The bean types are <literal>BookShop</literal>, <literal>Business</literal> "
@@ -259,7 +217,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:128
 #, no-c-format
 msgid ""
 "Meanwhile, this session bean has only the local interfaces "
@@ -268,29 +225,17 @@
 "<literal>BookShopBean</literal> is not a client-visible type."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"public class BookShopBean \n"
-"      extends Business \n"
-"      implements BookShop, Auditable {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:137
 #, no-c-format
 msgid ""
-"Most bean types you can probably figure out. One gotcha is primitive types. "
-"All primitive types are assumed to be identical to their corresponding "
-"wrapper types in <literal>java.lang</literal>."
+"The bean types of a session bean include local interfaces and the bean class "
+"local view (if any). EJB remote interfaces are not considered bean types of "
+"a session bean. You can't inject an EJB using its remote interface unless "
+"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
+"linkend=\"resources\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:143
 #, no-c-format
 msgid ""
 "Bean types may be restricted to an explicit set by annotating the bean with "
@@ -300,20 +245,7 @@
 "<literal>java.lang.Object</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:149
-#, no-c-format
-msgid ""
-"<![CDATA[@Typed(Shop.class)\n"
-"public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:151
 #, no-c-format
 msgid ""
 "Sometimes, a bean type alone does not provide enough information for the "
@@ -328,7 +260,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:160
 #, no-c-format
 msgid ""
 "A qualifier is a user-defined annotation that is itself annotated "
@@ -337,18 +268,7 @@
 "string-based names. Here's an example of a qualifier annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:166
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface CreditCard {}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:168
 #, no-c-format
 msgid ""
 "You may not be used to seeing the definition of an annotation. In fact, this "
@@ -358,7 +278,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:175
 #, no-c-format
 msgid ""
 "Pay attention to the names of the built-in annotations in CDI and EJB. "
@@ -368,7 +287,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:182
 #, no-c-format
 msgid ""
 "Now that we have defined a qualifier annotation, we can use it to "
@@ -377,14 +295,7 @@
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:188
-#, no-c-format
-msgid "<![CDATA[@Inject @CreditCard PaymentProcessor paymentProcessor]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:191
 #, no-c-format
 msgid ""
 "If an injection point does not explicitly specify a qualifier, it has the "
@@ -392,7 +303,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:197
 #, no-c-format
 msgid ""
 "For each injection point, the container searches for a bean which satisfies "
@@ -402,7 +312,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:203
 #, no-c-format
 msgid ""
 "How do we specify that qualifiers of a bean? By annotating the bean class, "
@@ -411,17 +320,7 @@
 "Therefore, it satisfies our qualified injection point:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:209
-#, no-c-format
-msgid ""
-"<![CDATA[@CreditCard\n"
-"public class CreditCardPaymentProcessor \n"
-"    implements PaymentProcessor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:212
 #, no-c-format
 msgid ""
 "If a bean does not explicitly specify a qualifier, it has the default "
@@ -429,23 +328,20 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:225
 #, no-c-format
 msgid ""
 "That's not quite the end of the story. CDI also defines a simple "
 "<emphasis>resolution rule</emphasis> that helps the container decide what to "
 "do if there is more than one bean that satisfies a particular contract. "
-"We'll get into the details in <xref linkend=\"injection\"/>."
+"We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:245
 #, no-c-format
 msgid "Scope"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:248
 #, no-c-format
 msgid ""
 "The <emphasis>scope</emphasis> of a bean defines the lifecycle and "
@@ -456,23 +352,13 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:255
 #, no-c-format
 msgid ""
 "For example, any web application may have <emphasis>session scoped</"
 "emphasis> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:259
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:261
 #, no-c-format
 msgid ""
 "An instance of a session-scoped bean is bound to a user session and is "
@@ -480,7 +366,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:265
 #, no-c-format
 msgid ""
 "Keep in mind that once a bean is bound to a context, it remains in that "
@@ -491,7 +376,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:273
 #, no-c-format
 msgid ""
 "If a scope is not explicitly specified, then the bean belongs to a special "
@@ -501,19 +385,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:279
 #, no-c-format
-msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\"/>."
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:284
 #, no-c-format
 msgid "EL name"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:286
 #, no-c-format
 msgid ""
 "If you want to reference a bean in non-Java code that supports Unified EL "
@@ -522,38 +403,18 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:291
 #, no-c-format
 msgid ""
 "The EL name is specified using the <literal>@Named</literal> annotation, as "
 "shown here:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:295
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named(\"cart\")\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:297
 #, no-c-format
 msgid "Now we can easily use the bean in any JSF or JSP page:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:299
-#, no-c-format
-msgid ""
-"<![CDATA[<h:dataTable value=\"#{cart.lineItems}\" var=\"item\">\n"
-"   ...\n"
-"</h:dataTable>]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:302
 #, no-c-format
 msgid ""
 "The <literal>@Named</literal> annotation is not what makes the class a bean. "
@@ -563,23 +424,13 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:309
 #, no-c-format
 msgid ""
 "We can let CDI choose a name for us by leaving off the value of the "
 "<literal>@Named</literal> annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:313
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:315
 #, no-c-format
 msgid ""
 "The name defaults to the unqualified class name, decapitalized; in this "
@@ -587,13 +438,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:325
 #, no-c-format
 msgid "Alternatives"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:327
 #, no-c-format
 msgid ""
 "We've already seen how qualifiers let us choose between multiple "
@@ -605,42 +454,30 @@
 "literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:335
-#, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class MockPaymentProcessor extends PaymentProcessorImpl { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:337
 #, no-c-format
 msgid ""
 "We normally annotate a bean <literal>@Alternative</literal> only when there "
 "is some other implementation of an interface it implements (or of any of its "
 "bean types). We can choose between alternatives at deployment time by "
 "<emphasis>selecting</emphasis> an alternative in the CDI deployment "
-"descriptor <literal>META-INF/beans.xml</literal> of the JAR or Java EE "
+"descriptor <literal>META-INF/beans.xml</literal> of the jar or Java EE "
 "module that uses it. Different modules can specify that they use different "
 "alternatives."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:345
 #, no-c-format
 msgid ""
-"We cover alternatives in more detail in <xref linkend=\"alternatives\"/>."
+"We cover alternatives in more detail in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:352
 #, no-c-format
 msgid "Interceptor binding types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:354
 #, no-c-format
 msgid ""
 "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, "
@@ -651,7 +488,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:361
 #, no-c-format
 msgid ""
 "The way that interceptors were defined in Java EE 5 was counter-intuitive. "
@@ -668,7 +504,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:372
 #, no-c-format
 msgid ""
 "CDI provides a new approach to binding interceptors to beans that introduces "
@@ -678,7 +513,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:378
 #, no-c-format
 msgid ""
 "An interceptor binding type is a user-defined annotation that is itself "
@@ -687,51 +521,21 @@
 "two classes."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:383
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Inherited\n"
-"@Target( { TYPE, METHOD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:385
 #, no-c-format
 msgid ""
 "The interceptor that implements transaction management declares this "
 "annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[public @Transactional @Interceptor\n"
-"class TransactionInterceptor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:391
 #, no-c-format
 msgid ""
 "We can apply the interceptor to a bean by annotating the bean class with the "
 "same interceptor binding type:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:395
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Transactional\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:397
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
@@ -740,32 +544,28 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:402
 #, no-c-format
 msgid ""
 "Interceptors are deployment-specific. (We don't need a "
 "<literal>TransactionInterceptor</literal> in our unit tests!) By default, an "
 "interceptor is disabled. We can enable an interceptor using the CDI "
-"deployment descriptor <literal>META-INF/beans.xml</literal> of the JAR or "
+"deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or "
 "Java EE module. This is also where we specify the interceptor ordering."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:409
 #, no-c-format
 msgid ""
 "We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
-"\"interceptors\"/> and <xref linkend=\"decorators\"/>."
+"\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:419
 #, no-c-format
 msgid "What kinds of classes are beans?"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:421
 #, no-c-format
 msgid ""
 "We've already seen two types of beans: JavaBeans and EJB session beans. Is "
@@ -774,13 +574,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:428
 #, no-c-format
 msgid "Managed beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:430
 #, no-c-format
 msgid ""
 "A managed bean is a Java class. The basic lifecycle and semantics of a "
@@ -792,19 +590,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:441
 #, no-c-format
 msgid "It is not a non-static inner class."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:444
 #, no-c-format
 msgid "It is a concrete class, or is annotated <literal>@Decorator</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:447
 #, no-c-format
 msgid ""
 "It is not annotated with an EJB component-defining annotation or declared as "
@@ -812,7 +607,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:453
 #, no-c-format
 msgid ""
 "It does not implement <literal>javax.enterprise.inject.spi.Extension</"
@@ -820,34 +614,41 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:456
 #, no-c-format
-msgid "It has an appropriate constructor&#8212;either:"
+msgid "It has an appropriate constructor—either:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:461
 #, no-c-format
 msgid "the class has a constructor with no parameters, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:464
 #, no-c-format
 msgid "the class declares a constructor annotated <literal>@Inject</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:472
 #, no-c-format
 msgid ""
+"According to this definition, JPA entities are technically managed beans. "
+"However, entities have their own special lifecycle, state and identity model "
+"and are usually instantiated by JPA or using <literal>new</literal>. "
+"Therefore we don't recommend directly injecting an entity class. We "
+"especially recommend against assigning a scope other than "
+"<literal>@Dependent</literal> to an entity class, since JPA is not able to "
+"persist injected CDI proxies."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The unrestricted set of bean types for a managed bean contains the bean "
 "class, every superclass and all interfaces it implements directly or "
 "indirectly."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:475
 #, no-c-format
 msgid ""
 "If a managed bean has a public field, it must have the default scope "
@@ -855,7 +656,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:477
 #, no-c-format
 msgid ""
 "Managed beans support the <literal>@PostConstruct</literal> and "
@@ -863,7 +663,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:480
 #, no-c-format
 msgid ""
 "Session beans are also, technically, managed beans. However, since they have "
@@ -873,13 +672,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:489
 #, no-c-format
 msgid "Session beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:491
 #, no-c-format
 msgid ""
 "Session beans belong to the EJB specification. They have a special "
@@ -892,7 +689,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:500
 #, no-c-format
 msgid ""
 "Message-driven and entity beans are by nature non-contextual objects and may "
@@ -904,7 +700,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:508
 #, no-c-format
 msgid ""
 "The unrestricted set of bean types for a session bean contains all local "
@@ -916,7 +711,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:516
 #, no-c-format
 msgid ""
 "There's no reason to explicitly declare the scope of a stateless session "
@@ -927,20 +721,18 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:520
 #, no-c-format
 msgid ""
 "Stateful session beans may define a <emphasis>remove method</emphasis>, "
 "annotated <literal>@Remove</literal>, that is used by the application to "
 "indicate that an instance should be destroyed. However, for a contextual "
-"instance of the bean&#8212;an instance under the control of CDI&#8212;this "
-"method may only be called by the application if the bean has scope "
-"<literal>@Dependent</literal>. For beans with other scopes, the application "
-"must let the container destroy the bean."
+"instance of the bean—an instance under the control of CDI—this method may "
+"only be called by the application if the bean has scope <literal>@Dependent</"
+"literal>. For beans with other scopes, the application must let the "
+"container destroy the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:528
 #, no-c-format
 msgid ""
 "So, when should we use a session bean instead of a plain managed bean? "
@@ -948,19 +740,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:535
 #, no-c-format
 msgid "method-level transaction management and security,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:538
 #, no-c-format
 msgid "concurrency management,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:541
 #, no-c-format
 msgid ""
 "instance-level passivation for stateful session beans and instance-pooling "
@@ -968,19 +757,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:545
 #, no-c-format
 msgid "remote or web service invocation, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:548
 #, no-c-format
 msgid "timers and asynchronous methods,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:552
 #, no-c-format
 msgid ""
 "When we don't need any of these things, an ordinary managed bean will serve "
@@ -988,7 +774,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:554
 #, no-c-format
 msgid ""
 "Many beans (including any <literal>@SessionScoped</literal> or "
@@ -998,7 +783,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:560
 #, no-c-format
 msgid ""
 "Beans which hold references to heavy-weight resources, or hold a lot of "
@@ -1008,7 +792,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:566
 #, no-c-format
 msgid ""
 "Finally, it's usually obvious when method-level transaction management, "
@@ -1017,7 +800,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:571
 #, no-c-format
 msgid ""
 "The point we're trying to make is: use a session bean when you need the "
@@ -1030,7 +812,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:579
 #, no-c-format
 msgid ""
 "On the other hand, don't be scared to use session beans just because you've "
@@ -1043,13 +824,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:590
 #, no-c-format
 msgid "Producer methods"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:592
 #, no-c-format
 msgid ""
 "Not everything that needs to be injected can be boiled down to a bean class "
@@ -1061,7 +840,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:600
 #, no-c-format
 msgid ""
 "A <emphasis>producer method</emphasis> is a method that acts as a source of "
@@ -1072,64 +850,31 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:607
 #, no-c-format
 msgid ""
 "A producer method is declared by annotating a method of a bean class with "
 "the <literal>@Produces</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:612
-#, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class RandomNumberGenerator {\n"
-"   \n"
-"   private Random random = new Random(System.currentTimeMillis());\n"
-"       \n"
-"   @Produces @Named @Random int getRandomNumber() {\n"
-"      return random.nextInt(100);\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:614
 #, no-c-format
 msgid ""
 "We can't write a bean class that is itself a random number. But we can "
 "certainly write a method that returns a random number. By making the method "
-"a producer method, we allow the return value of the method&#8212;in this "
-"case an <literal>Integer</literal>&#8212;to be injected. We can even specify "
-"a qualifier&#8212;in this case <literal>@Random</literal>, a scope&#8212;"
-"which in this case defaults to <literal>@Dependent</literal>, and an EL "
-"name&#8212;which in this case defaults to <literal>randomNumber</literal> "
-"according to the JavaBeans property name convention. Now we can get a random "
-"number anywhere:"
+"a producer method, we allow the return value of the method—in this case an "
+"<literal>Integer</literal>—to be injected. We can even specify a qualifier—"
+"in this case <literal>@Random</literal>, a scope—which in this case defaults "
+"to <literal>@Dependent</literal>, and an EL name—which in this case defaults "
+"to <literal>randomNumber</literal> according to the JavaBeans property name "
+"convention. Now we can get a random number anywhere:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:623
-#, no-c-format
-msgid "<![CDATA[@Inject @Random int randomNumber;]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:625
 #, no-c-format
 msgid "Even in a Unified EL expression:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:629
-#, no-c-format
-msgid "<![CDATA[<p>Your raffle number is #{randomNumber}.</p>]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:631
 #, no-c-format
 msgid ""
 "A producer method must be a non-abstract method of a managed bean class or "
@@ -1139,13 +884,11 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:637
 #, no-c-format
 msgid "The bean types of a producer method depend upon the method return type:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:643
 #, no-c-format
 msgid ""
 "If the return type is an interface, the unrestricted set of bean types "
@@ -1154,7 +897,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:649
 #, no-c-format
 msgid ""
 "If a return type is primitive or is a Java array type, the unrestricted set "
@@ -1163,7 +905,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:655
 #, no-c-format
 msgid ""
 "If the return type is a class, the unrestricted set of bean types contains "
@@ -1172,59 +913,43 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:662
 #, no-c-format
 msgid ""
-"If the producer method has method parameters, the container will look for a "
-"bean that satisfies the type and qualifiers of each parameter and pass it to "
-"the method automatically&#8212;another form of dependency injection."
+"Producer methods and fields may have a primitive bean type. For the purpose "
+"of resolving dependencies, primitive types are considered to be identical to "
+"their corresponding wrapper types in <literal>java.lang</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:668
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Produces Set<Roles> getRoles(User user) {\n"
-"   return user.getRoles();\n"
-"}]]>"
+"If the producer method has method parameters, the container will look for a "
+"bean that satisfies the type and qualifiers of each parameter and pass it to "
+"the method automatically—another form of dependency injection."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:670
 #, no-c-format
 msgid ""
 "We'll talk much more about producer methods in <xref linkend="
-"\"producermethods\"/>."
+"\"producermethods\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:675
 #, no-c-format
 msgid "Producer fields"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:677
 #, no-c-format
 msgid ""
 "A <emphasis>producer field</emphasis> is a simpler alternative to a producer "
 "method. A producer field is declared by annotating a field of a bean class "
-"with the <literal>@Produces</literal> annotation&#8212;the same annotation "
-"used for producer methods."
+"with the <literal>@Produces</literal> annotation—the same annotation used "
+"for producer methods."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:683
-#, no-c-format
-msgid ""
-"<![CDATA[public class Shop {\n"
-"   @Produces PaymentProcessor paymentProcessor = ....;\n"
-"   @Produces @Catalog List<Product> products = ....;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:685
 #, no-c-format
 msgid ""
 "The rules for determining the bean types of a producer field parallel the "
@@ -1232,415 +957,12 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:689
 #, no-c-format
 msgid ""
 "A producer field is really just a shortcut that lets us avoid writing a "
 "useless getter method. However, in addition to convenience, producer fields "
 "serve a specific purpose as an adaptor for Java EE component environment "
 "injection, but to learn more about that, you'll have to wait until <xref "
-"linkend=\"resources\"/>. Because we can't wait to get to work on some "
+"linkend=\"resources\" />. Because we can't wait to get to work on some "
 "examples."
 msgstr ""
-
-#. Tag: title
-#: beans.xml:701
-#, no-c-format
-msgid "The (minimal) bean descriptor"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:703
-#, no-c-format
-msgid ""
-"First, it's important to understand that the XML bean descriptor in CDI "
-"(beans.xml) is not there to define beans in XML, like in other popular bean "
-"containers. Rather, you use this file to enable CDI services for the current "
-"bean archive that is difficult to define consistently in Java or which you "
-"don't want to define in Java (e.g., to accomodate testing)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:710
-#, no-c-format
-msgid ""
-"For example, the XML is used to enable interceptors (which are disabled by "
-"default) and define interceptor ordering. So the bean descriptor "
-"<emphasis>complements</emphasis> the metadata that is provided in the Java "
-"language syntax. (You may still want to define beans in XML for other "
-"reasons, but that is the concern of an extension)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:717
-#, no-c-format
-msgid ""
-"Let's first ask why the beans.xml is required, then look at what services it "
-"is used used to enable."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:722
-#, no-c-format
-msgid "Why is beans.xml required?"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:724
-#, no-c-format
-msgid ""
-"You may be wondering, if beans are not described using XML, why do we need "
-"beans.xml at all, particularly if you don't have anything that you would "
-"need the bean descriptor to enable (alternatives, interceptors or "
-"decorators)?"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:730
-#, no-c-format
-msgid "There are two things about CDI that we need to keep in mind:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:736
-#, no-c-format
-msgid ""
-"CDI does not require any special declaration for a Java class to be injected "
-"- that's right, no annotation or XML declaration at all!"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:742
-#, no-c-format
-msgid ""
-"CDI does not define any special kind of module - CDI beans can be deployed "
-"in a library JAR, EJB JAR, WAR, RAR, or JVM classpath directory."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:749
-#, no-c-format
-msgid ""
-"The CDI specification calls the process of identifying beans in modules "
-"<emphasis>bean discovery</emphasis>."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:753
-#, no-c-format
-msgid ""
-"So there are potentially a lot of classes in the classpath which might be "
-"beans! We don't want to force the container to scan every one of those "
-"classes at startup and build its internal metamodel for each of them. This "
-"really could make bean discovery very slow."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:759
-#, no-c-format
-msgid ""
-"But there's another reason we need to give the user some control over which "
-"classes are available for injection. We don't want every class in the "
-"classpath to potentially match an injection point, including classes that "
-"were never intended to be injected into things. This would force the "
-"developer to have to use qualifiers much more often to disambiguate "
-"injection points."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:766
-#, no-c-format
-msgid "So we have two choices. We could have the developer:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:772
-#, no-c-format
-msgid "explicitly exclude modules which do not contain beans, or"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:775
-#, no-c-format
-msgid "explicitly declare modules which do contain beans."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:779
-#, no-c-format
-msgid ""
-"It should be clear that the second option is a much better way to go. Thus, "
-"CDI has the notion of a bean archive. A bean archive is just a module that "
-"has a file named beans.xml in the META-INF directory. The container looks "
-"for beans in bean archives. It ignores other modules."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:785
-#, no-c-format
-msgid ""
-"Now, you might be wondering if we've got the granularity wrong here. Why "
-"should module be the right criteria to use for including/excluding a class. "
-"Why not consider:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:792
-#, no-c-format
-msgid "a class-level annotation,"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:795
-#, no-c-format
-msgid "the package,"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:798
-#, no-c-format
-msgid "some type it implements or extends, or"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:801
-#, no-c-format
-msgid "some naming convention."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:805
-#, no-c-format
-msgid ""
-"We've got the first option covered. Annotate a bean <literal>@Alternative</"
-"literal>, or with an alternative stereotype, and it will be considered "
-"disabled by CDI, as long as you don't explicitly enable it in beans.xml. "
-"That's not quite the same thing as excluding the class from scanning "
-"altogether, but it's close. (One difference is that a portable extension "
-"with still get a <literal>ProcessAnnotatedType</literal> event for that "
-"class)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:813
-#, no-c-format
-msgid ""
-"A future version of CDI might allow you to declare excluded packages in "
-"beans.xml. Excluding a bean by type or naming convention isn't really that "
-"appealing. In the world of CDI, we use stereotypes for identifying "
-"architectural roles. We don't use marker interfaces or naming conventions. "
-"Names really shouldn't affect functionality as it is too fragile."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:820
-#, no-c-format
-msgid "Enough theory, what elements are available in beans.xml?"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:826
-#, no-c-format
-msgid "Bean descriptor schema"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:828
-#, no-c-format
-msgid ""
-"If you don't need to activate any interceptors, decorators or alternatives "
-"(you just have plain beans that you need to use in an archive), the beans."
-"xml file can be <emphasis>empty</emphasis>. If you do have one of these "
-"requirements, then you need to start popularing the descriptor."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:834
-#, no-c-format
-msgid ""
-"The root element of a beans.xml file is <literal>beans</literal>, with the "
-"following <ulink url=\"http://anonsvn.jboss.org/repos/weld/api/trunk/cdi/src/"
-"main/resources/beans.xsd\">schema</ulink>:"
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:839
-#, no-c-format
-msgid ""
-"<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<beans xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee \n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"</beans>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:841
-#, no-c-format
-msgid ""
-"The <literal>beans</literal> element can have one or more of each of the "
-"following children:"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:847
-#, no-c-format
-msgid "interceptors"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:850
-#, no-c-format
-msgid "decorators"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:853
-#, no-c-format
-msgid "alternatives"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:857
-#, no-c-format
-msgid "Let's look at each element in detail."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:862
-#, no-c-format
-msgid "&lt;interceptors&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:864
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled interceptors bound via interceptor "
-"bindings. An interceptor must be explicitly enabled by listing the fully "
-"qualified class name in a child &lt;class&gt; element of &lt;"
-"interceptors&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:870
-#, no-c-format
-msgid ""
-"There may be zero or more interceptor class elements. The order of the class "
-"declarations determines the interceptor ordering. Interceptors which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an interceptor "
-"class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:877
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.intercept.SecurityInterceptor</class>\n"
-"   <class>com.acme.intercept.TransactionInterceptor</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:883
-#, no-c-format
-msgid "&lt;decorators&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:885
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled decorators. A decorator must be "
-"explicitly enabled by listing the fully qualified class name in a child &lt;"
-"class&gt; element of &lt;decorators&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:891
-#, no-c-format
-msgid ""
-"There may be zero or more decorator class elements. The order of the class "
-"declarations determines the decorator ordering. Decorators which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an decorator class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:898
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.decorate.BigAccountDecorator</class>\n"
-"   <class>com.acme.decorate.SpecialGiftDecorator</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:903
-#, no-c-format
-msgid "&lt;alternatives&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:905
-#, no-c-format
-msgid ""
-"An alternative is a bean that must be explicitly declared in the beans.xml "
-"file if it should be available for lookup, injection or EL resolution. By "
-"default, a bean archive has no active alternatives. An alternative must be "
-"explicitly declared using the fully qualified bean class name or stereotype "
-"class name in either a child &lt;class&gt; or &lt;stereotype&gt; element of "
-"&lt;alternatives&gt;, respectively."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:913
-#, no-c-format
-msgid ""
-"An alternative is selected for the bean archive if either: the alternative "
-"is a managed bean or session bean and the bean class of the bean is listed, "
-"or the alternative is a producer method, field or resource, and the bean "
-"class that declares the method or field is listed, or any "
-"<literal>@Alternative</literal> stereotype of the alternative is listed."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:920
-#, no-c-format
-msgid ""
-"There may be zero or more alternative bean class elements. The same class "
-"may not be listed twice. And of course, the class must exist and it must be "
-"an alternative bean class."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:925
-#, no-c-format
-msgid ""
-"There may also be zero or more <literal>@Alternative</literal> stereotype "
-"elements. The same stereotype may not be listed twice. And of course, the "
-"stereotype class must exist and it must be an stereotype annotation."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:931
-#, no-c-format
-msgid ""
-"<![CDATA[<stereotypes>\n"
-"   <class>com.acme.business.MockPaymentProcessor</class>\n"
-"   <stereotype>com.acme.stereotype.Mock</stereotype>\n"
-"</stereotypes>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:935
-#, no-c-format
-msgid ""
-"And that's it! A very simple schema, used only to activate and order CDI "
-"services."
-msgstr ""

Modified: doc/trunk/reference/de-DE/decorators.po
===================================================================
--- doc/trunk/reference/de-DE/decorators.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/decorators.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: decorators\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-02 09:30+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,13 +16,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: decorators.xml:5
 #, no-c-format
 msgid "Decorators"
 msgstr "Dekoratoren"
 
 #. Tag: para
-#: decorators.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors are a powerful way to capture and separate concerns which are "
@@ -43,7 +41,6 @@
 "Separierung von unternehmensbezogenen Problemen."
 
 #. Tag: para
-#: decorators.xml:15
 #, fuzzy, no-c-format
 msgid ""
 "The reverse is true of <emphasis>decorators</emphasis>. A decorator "
@@ -65,31 +62,11 @@
 "viele disparate Typen verteilen."
 
 #. Tag: para
-#: decorators.xml:24
 #, no-c-format
 msgid "Suppose we have an interface that represents accounts:"
 msgstr "Nehmen wir an, wir besitzen ein Konten repräsentierendes Interface:"
 
-#. Tag: programlisting
-#: decorators.xml:26
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface Account {\n"
-"   public BigDecimal getBalance();\n"
-"   public User getOwner();\n"
-"   public void withdraw(BigDecimal amount);\n"
-"   public void deposit(BigDecimal amount);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface Account {\n"
-"    public BigDecimal getBalance();\n"
-"    public User getOwner();\n"
-"    public void withdraw(BigDecimal amount);\n"
-"    public void deposit(BigDecimal amount);\n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:28
 #, fuzzy, no-c-format
 msgid ""
 "Several different beans in our system implement the <literal>Account</"
@@ -104,7 +81,6 @@
 "müssen. Dies ist die perfekte Aufgabe für einen Dekorator."
 
 #. Tag: para
-#: decorators.xml:34
 #, fuzzy, no-c-format
 msgid ""
 "A decorator is a bean (possibly even an abstract class) that implements the "
@@ -113,74 +89,14 @@
 "Ein Dekorator ist ein einfaches Web Bean, das den Typ das es dekoriert "
 "implementiert und <literal>@Decorator</literal> annotiert ist."
 
-#. Tag: programlisting
-#: decorators.xml:39
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[<Decorators>\n"
-"    <myapp:LargeTransactionDecorator/>\n"
-"</Decorators>]]>"
-
 #. Tag: para
-#: decorators.xml:41
 #, no-c-format
 msgid ""
 "The decorator implements the methods of the decorated type that it wants to "
 "intercept."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:45
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      ...\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator \n"
-"        implements Account {\n"
-"    \n"
-"    @Decorates Account account;\n"
-"    \n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    public void withdraw(BigDecimal amount) {\n"
-"        account.withdraw(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedWithdrawl(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"    public void deposit(BigDecimal amount);\n"
-"        account.deposit(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedDeposit(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "Unlike other beans, a decorator may be an abstract class. Therefore, if "
@@ -193,7 +109,6 @@
 "Methode nicht zu implementieren."
 
 #. Tag: para
-#: decorators.xml:52
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors for a method are called before decorators that apply to the "
@@ -203,13 +118,11 @@
 "dieser Methode angewendet werden."
 
 #. Tag: title
-#: decorators.xml:57
 #, fuzzy, no-c-format
 msgid "Delegate object"
 msgstr "\"Delegate\" Attribute"
 
 #. Tag: para
-#: decorators.xml:59
 #, no-c-format
 msgid ""
 "Decorators have a special injection point, called the <emphasis>delegate "
@@ -219,32 +132,17 @@
 "method parameter or injected field."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:67
 #, fuzzy, no-c-format
 msgid "A decorator is bound to any bean which:"
 msgstr "Ein Dekorator wird an ein beliebiges Web Bean gebunden, das:"
 
 #. Tag: para
-#: decorators.xml:71
 #, fuzzy, no-c-format
 msgid "has the type of the delegate injection point as a bean type, and"
 msgstr "den Typ des \"Delegate\" Attributs als einen API-Typ hat und "
 
 #. Tag: para
-#: decorators.xml:74
 #, fuzzy, no-c-format
 msgid "has all qualifiers that are declared at the delegate injection point."
 msgstr ""
@@ -252,7 +150,6 @@
 "werden."
 
 #. Tag: para
-#: decorators.xml:78
 #, fuzzy, no-c-format
 msgid ""
 "This delegate injection point specifies that the decorator is bound to all "
@@ -261,14 +158,7 @@
 "Dieses \"Delegate\" Attribut legt fest, dass der Dekorator an alle "
 "<literal>Account</literal> implementierenden Web Beans gebunden wird:"
 
-#. Tag: programlisting
-#: decorators.xml:83
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
-msgstr "<![CDATA[@Decorates Account account;]]>"
-
 #. Tag: para
-#: decorators.xml:85
 #, fuzzy, no-c-format
 msgid ""
 "A delegate injection point may specify any number of qualifier annotations. "
@@ -277,14 +167,7 @@
 "Ein \"Delegate\" Attribut kann eine Binding-Annotation festlegen. Dann wird "
 "der Dekorator nur an Web Beans mit demselben Binding gebunden."
 
-#. Tag: programlisting
-#: decorators.xml:90
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
-msgstr "<![CDATA[@Decorates @Foreign Account account;]]>"
-
 #. Tag: para
-#: decorators.xml:92
 #, fuzzy, no-c-format
 msgid ""
 "The decorator may invoke the delegate object, which has much the same effect "
@@ -296,64 +179,12 @@
 "ähnliche Wirkung wie der Aufruf von <literal>InvocationContext.proceed()</"
 "literal> von einem Interzeptor hat."
 
-#. Tag: programlisting
-#: decorators.xml:98
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      account.withdraw(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedWithdrawl(amount) );\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      account.deposit(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedDeposit(amount) );\n"
-"      }\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator \n"
-"        implements Account {\n"
-"    \n"
-"    @Decorates Account account;\n"
-"    \n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    public void withdraw(BigDecimal amount) {\n"
-"        account.withdraw(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedWithdrawl(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"    public void deposit(BigDecimal amount);\n"
-"        account.deposit(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedDeposit(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: title
-#: decorators.xml:103
 #, no-c-format
 msgid "Enabling decorators"
 msgstr "Aktivierung von Dekoratoren"
 
 #. Tag: para
-#: decorators.xml:105
 #, no-c-format
 msgid ""
 "By default, all decorators are disabled. We need to <emphasis>enable</"
@@ -361,24 +192,7 @@
 "bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:111
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <decorators>\n"
-"         <class>org.mycompany.myapp.LargeTransactionDecorator</class>\n"
-"   </decorators>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:113
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
@@ -388,7 +202,6 @@
 "Interceptors&gt;</literal>-Deklaration für Interzeptoren erfüllt:"
 
 #. Tag: para
-#: decorators.xml:120
 #, no-c-format
 msgid ""
 "it enables us to specify a total ordering for all decorators in our system, "
@@ -399,14 +212,139 @@
 "und"
 
 #. Tag: para
-#: decorators.xml:126
 #, no-c-format
 msgid "it lets us enable or disable decorator classes at deployment time."
 msgstr ""
 "es gestattet uns, Dekorator-Klassen zum Deplyment-Zeitpunkt zu aktivieren "
 "oder zu deaktivieren."
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "   public BigDecimal getBalance();\n"
+#~ "   public User getOwner();\n"
+#~ "   public void withdraw(BigDecimal amount);\n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "    public BigDecimal getBalance();\n"
+#~ "    public User getOwner();\n"
+#~ "    public void withdraw(BigDecimal amount);\n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[<Decorators>\n"
+#~ "    <myapp:LargeTransactionDecorator/>\n"
+#~ "</Decorators>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator \n"
+#~ "        implements Account {\n"
+#~ "    \n"
+#~ "    @Decorates Account account;\n"
+#~ "    \n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    public void withdraw(BigDecimal amount) {\n"
+#~ "        account.withdraw(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "        account.deposit(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedDeposit(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
+#~ msgstr "<![CDATA[@Decorates Account account;]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
+#~ msgstr "<![CDATA[@Decorates @Foreign Account account;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      account.withdraw(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      account.deposit(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedDeposit(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator \n"
+#~ "        implements Account {\n"
+#~ "    \n"
+#~ "    @Decorates Account account;\n"
+#~ "    \n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    public void withdraw(BigDecimal amount) {\n"
+#~ "        account.withdraw(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "        account.deposit(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedDeposit(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "All decorators have a <emphasis>delegate attribute</emphasis>. The type "
 #~ "and binding types of the delegate attribute determine which Web Beans the "
 #~ "decorator is bound to. The delegate attribute type must implement or "

Modified: doc/trunk/reference/de-DE/dependencies.po
===================================================================
--- doc/trunk/reference/de-DE/dependencies.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/dependencies.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: dependencies.xml:5
 #, no-c-format
 msgid "Weld project dependencies"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:7
 #, no-c-format
 msgid ""
 "This section lists compile-time and runtime dependencies for Weld. This list "
@@ -30,105 +28,88 @@
 msgstr ""
 
 #. Tag: title
-#: dependencies.xml:13
 #, no-c-format
 msgid "Artifacts coming from Sun"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:21 dependencies.xml:110
 #, no-c-format
 msgid "Artifact"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:24 dependencies.xml:113
 #, no-c-format
 msgid "Scope"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:33
+#. Tag: para
 #, no-c-format
-msgid "javax.ejb:ejb-api:3.1"
+msgid "<literal>javax.ejb:ejb-api:3.1</literal>"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:36 dependencies.xml:44 dependencies.xml:52
-#: dependencies.xml:60 dependencies.xml:68 dependencies.xml:76
-#: dependencies.xml:128
 #, no-c-format
 msgid "compile"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:41
+#. Tag: para
 #, no-c-format
-msgid "javax.faces:jsf-api:2.0"
+msgid "<literal>javax.faces:jsf-api:2.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:49
+#. Tag: para
 #, no-c-format
-msgid "javax.el:el-api:2.1"
+msgid "<literal>javax.el:el-api:2.1</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:57
+#. Tag: para
 #, no-c-format
-msgid "javax.persistence:persistence-api:2.0"
+msgid "<literal>javax.persistence:persistence-api:2.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:65
+#. Tag: para
 #, no-c-format
-msgid "javax.servlet:servlet-api:3.0"
+msgid "<literal>javax.servlet:servlet-api:3.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:73
+#. Tag: para
 #, no-c-format
-msgid "javax.interceptor:interceptor-api:1.1"
+msgid "<literal>javax.interceptor:interceptor-api:1.1</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:81
+#. Tag: para
 #, no-c-format
-msgid "org.glasfish.web:el-impl:2.1.2"
+msgid "<literal>org.glasfish.web:el-impl:2.1.2</literal>"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:84 dependencies.xml:92
 #, no-c-format
 msgid "runtime"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:89
+#. Tag: para
 #, no-c-format
-msgid "javax.faces:jsf-impl:2.0.x"
+msgid "<literal>javax.faces:jsf-impl:2.0.x</literal>"
 msgstr ""
 
 #. Tag: title
-#: dependencies.xml:101
 #, no-c-format
 msgid "Artifacts coming from Hibernate"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:116
 #, no-c-format
 msgid "Notes"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:125
+#. Tag: para
 #, no-c-format
-msgid "javax.validation:validation-api"
+msgid "<literal>javax.validation:validation-api</literal>"
 msgstr ""
 
-#. Tag: ulink
-#: dependencies.xml:131
+#. Tag: para
 #, no-c-format
-msgid "BVAL-193"
+msgid ""
+"<ulink url=\"http://opensource.atlassian.com/projects/hibernate/browse/BVAL-"
+"193\">BVAL-193</ulink>"
 msgstr ""

Modified: doc/trunk/reference/de-DE/ee.po
===================================================================
--- doc/trunk/reference/de-DE/ee.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/ee.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: ee\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-09 20:55+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,13 +16,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: ee.xml:4
 #, no-c-format
 msgid "Java EE integration"
 msgstr "Java EE Integration"
 
 #. Tag: para
-#: ee.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "CDI is fully integrated into the Java EE environment. Beans have access to "
@@ -38,13 +36,11 @@
 "Beans, die keine Web Beans sind."
 
 #. Tag: title
-#: ee.xml:13
 #, no-c-format
 msgid "Built-in beans"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:15
 #, no-c-format
 msgid ""
 "In the Java EE environment, the container provides the following built-in "
@@ -52,20 +48,17 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:22
 #, no-c-format
 msgid "the current JTA <literal>UserTransaction</literal>,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:27
 #, no-c-format
 msgid ""
 "a <literal>Principal</literal> representing the current caller identity,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:32
 #, no-c-format
 msgid ""
 "the default <ulink url=\"http://jcp.org/en/jsr/detail?id=303\">Bean "
@@ -73,7 +66,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:38
 #, no-c-format
 msgid ""
 "a <literal>Validator</literal> for the default <literal>ValidationFactory</"
@@ -81,7 +73,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:45
 #, no-c-format
 msgid ""
 "The CDI specification does not require the servlet context objects, "
@@ -97,32 +88,18 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:57
 #, no-c-format
 msgid ""
 "Oh, you <emphasis>really</emphasis> want to inject the "
 "<literal>FacesContext</literal>? Alright then, try this producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[class FacesContextProducer {\n"
-"   @Produces @RequestScoped FacesContext getFacesContext() {\n"
-"      return FacesContext.getCurrentInstance();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: ee.xml:67
 #, fuzzy, no-c-format
 msgid "Injecting Java EE resources into a bean"
 msgstr "Einspeisung von Java EE Ressourcen in ein Web Bean"
 
 #. Tag: para
-#: ee.xml:69
 #, fuzzy, no-c-format
 msgid ""
 "All managed beans may take advantage of Java EE component environment "
@@ -137,51 +114,7 @@
 "einige Beispiele hierfür gesehen, obwohl wir diesen zum damaligen Zeitpunkt "
 "nicht viel Beachtung geschenkt haben:"
 
-#. Tag: programlisting
-#: ee.xml:76
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @Resource UserTransaction transaction;\n"
-"\n"
-"   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"throws Exception { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource Transaction transaction;\n"
-"\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"    \n"
-"}]]>"
-
-#. Tag: programlisting
-#: ee.xml:78
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Login implements Serializable {\n"
-"   @Inject Credentials credentials;\n"
-"   @PersistenceContext EntityManager userDatabase;\n"
-"    ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped\n"
-"public class Login {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @PersistenceContext EntityManager userDatabase;\n"
-"    \n"
-"    ...\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: ee.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "The Java EE <literal>@PostConstruct</literal> and <literal>@PreDestroy</"
@@ -195,7 +128,6 @@
 "nach Durchführung <emphasis>aller</emphasis> Einspeisungen aufgerufen."
 
 #. Tag: para
-#: ee.xml:86
 #, no-c-format
 msgid ""
 "Of course, we advise that component environment injection be used to define "
@@ -203,13 +135,11 @@
 msgstr ""
 
 #. Tag: title
-#: ee.xml:94
 #, fuzzy, no-c-format
 msgid "Calling a bean from a servlet"
 msgstr "Aufruf eines Web Bean von einem Servlet"
 
 #. Tag: para
-#: ee.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
@@ -220,55 +150,7 @@
 "Initialisierungsmethodeneinspeisung (sog. \"Initializer Method Injection\") "
 "ein."
 
-#. Tag: programlisting
-#: ee.xml:101
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Login extends HttpServlet {\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject Login login;\n"
-"\n"
-"   @Override\n"
-"   public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"      throws ServletException, IOException {\n"
-"      credentials.setUsername(request.getParameter(\"username\")):\n"
-"      credentials.setPassword(request.getParameter(\"password\")):\n"
-"      login.login();\n"
-"      if ( login.isLoggedIn() ) {\n"
-"         response.sendRedirect(\"/home.jsp\");\n"
-"      }\n"
-"      else {\n"
-"         response.sendRedirect(\"/loginError.jsp\");\n"
-"      }\n"
-"   }\n"
-"            \n"
-"}]]>"
-msgstr ""
-"public class Login extends HttpServlet {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @Current Login login;\n"
-"\n"
-"    @Override\n"
-"    public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"        throws ServletException, IOException {\n"
-"        credentials.setUsername( request.getAttribute(\"username\") ):\n"
-"        credentials.setPassword( request.getAttribute(\"password\") ):\n"
-"        login.login();\n"
-"        if ( login.isLoggedIn() ) {\n"
-"            response.sendRedirect(\"/home.jsp\");\n"
-"        }\n"
-"        else {\n"
-"            response.sendRedirect(\"/loginError.jsp\");\n"
-"        }\n"
-"    }\n"
-"            \n"
-"}"
-
 #. Tag: para
-#: ee.xml:103
 #, fuzzy, no-c-format
 msgid ""
 "Since instances of servlets are shared across all incoming threads, the bean "
@@ -282,13 +164,11 @@
 "korrigieren."
 
 #. Tag: title
-#: ee.xml:112
 #, fuzzy, no-c-format
 msgid "Calling a bean from a message-driven bean"
 msgstr "Aufruf eines Web Beans von einem Message-Driven Bean"
 
 #. Tag: para
-#: ee.xml:114
 #, no-c-format
 msgid ""
 "CDI injection applies to all EJBs, even when they aren't managed beans. In "
@@ -297,40 +177,12 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:119
 #, fuzzy, no-c-format
 msgid "You can even use CDI interceptor bindings for message-driven Beans."
 msgstr ""
 "Sie können sogar Web Beans Interzeptor-Bindings für Message-Driven Beans."
 
-#. Tag: programlisting
-#: ee.xml:121
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"   @Inject Inventory inventory;\n"
-"   @PersistenceContext EntityManager em;\n"
-"\n"
-"   public void onMessage(Message message) {\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"\n"
-"    @Current Inventory inventory;\n"
-"    @PersistenceContext EntityManager em;\n"
-"\n"
-"    public void onMessage(Message message) {\n"
-"        ...\n"
-"    }\n"
-"            \n"
-"}"
-
 #. Tag: para
-#: ee.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "Please note that there is no session or conversation context available when "
@@ -345,19 +197,16 @@
 "<literal>@ApplicationScoped</literal> Web Beans verfügbar."
 
 #. Tag: para
-#: ee.xml:129
 #, no-c-format
 msgid "But how about beans which <emphasis>send</emphasis> JMS messages?"
 msgstr ""
 
 #. Tag: title
-#: ee.xml:136
 #, no-c-format
 msgid "JMS endpoints"
 msgstr "JMS Endpunkte"
 
 #. Tag: para
-#: ee.xml:138
 #, no-c-format
 msgid ""
 "Sending messages using JMS can be quite complex, because of the number of "
@@ -382,96 +231,20 @@
 "eigenes Threading-Modell, das unsere Aufmerksamkeit erfordert."
 
 #. Tag: para
-#: ee.xml:147
 #, no-c-format
 msgid ""
 "You can use producer fields and methods to prepare all of these resources "
 "for injection into a bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[public class OrderResources {\n"
-"   @Resource(name=\"jms/ConnectionFactory\")\n"
-"   private ConnectionFactory connectionFactory;\n"
-"  \n"
-"   @Resource(name=\"jms/OrderQueue\")\n"
-"   private Queue orderQueue;\n"
-"  \n"
-"   @Produces @OrderConnection\n"
-"   public Connection createOrderConnection() throws JMSException {\n"
-"    return connectionFactory.createConnection();\n"
-"   }\n"
-"  \n"
-"   public void closeOrderConnection(@Disposes @OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      connection.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderSession\n"
-"   public Session createOrderSession(@OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      return connection.createSession(true, Session.AUTO_ACKNOWLEDGE);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderSession(@Disposes @OrderSession Session session)\n"
-"         throws JMSException {\n"
-"      session.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderMessageProducer\n"
-"   public MessageProducer createOrderMessageProducer(@OrderSession Session "
-"session)\n"
-"         throws JMSException {\n"
-"      return session.createProducer(orderQueue);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderMessageProducer(@Disposes @OrderMessageProducer "
-"MessageProducer producer)\n"
-"         throws JMSException {\n"
-"      producer.close();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: ee.xml:153
 #, no-c-format
 msgid ""
 "In this example, we can just inject the prepared <literal>MessageProducer</"
 "literal>, <literal>Connection</literal> or <literal>QueueSession</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:158
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject Order order;\n"
-"@Inject @OrderMessageProducer MessageProducer producer;\n"
-"@Inject @OrderSession QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"   MapMessage msg = orderSession.createMapMessage();\n"
-"   msg.setLong(\"orderId\", order.getId());\n"
-"   ...\n"
-"   producer.send(msg);\n"
-"}]]>"
-msgstr ""
-"@OrderProcessor QueueSender orderSender;\n"
-"@OrderProcessor QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"    MapMessage msg = orderSession.createMapMessage();\n"
-"    ...\n"
-"    orderSender.send(msg);\n"
-"}"
-
 #. Tag: para
-#: ee.xml:164
 #, fuzzy, no-c-format
 msgid ""
 "The lifecycle of the injected JMS objects is completely controlled by the "
@@ -481,22 +254,20 @@
 "Bean Manager gesteuert."
 
 #. Tag: title
-#: ee.xml:171
 #, no-c-format
 msgid "Packaging and deployment"
 msgstr "Packen und Deployment"
 
 #. Tag: para
-#: ee.xml:173
 #, fuzzy, no-c-format
 msgid ""
 "CDI doesn't define any special deployment archive. You can package beans in "
-"JARs, EJB-JARs or WARs&#8212;any deployment location in the application "
-"classpath. However, the archive must be a \"bean archive\". That means each "
-"archive that contains beans <emphasis>must</emphasis> include a file named "
+"jars, ejb jars or wars—any deployment location in the application classpath. "
+"However, the archive must be a \"bean archive\". That means each archive "
+"that contains beans <emphasis>must</emphasis> include a file named "
 "<literal>beans.xml</literal> in the <literal>META-INF</literal> directory of "
 "the classpath or <literal>WEB-INF</literal> directory of the web root (for "
-"WAR archives). The file may be empty. Beans deployed in archives that do not "
+"war archives). The file may be empty. Beans deployed in archives that do not "
 "have a <literal>beans.xml</literal> file will not be available for use in "
 "the application."
 msgstr ""
@@ -510,7 +281,6 @@
 "Verwendung in der Anwendung verfügbar."
 
 #. Tag: para
-#: ee.xml:182
 #, fuzzy, no-c-format
 msgid ""
 "In an embeddable EJB container, beans may be deployed in any location in "
@@ -522,7 +292,137 @@
 "Lite Container deployt werden können. Auch hier muss jeder Speicherort eine "
 "<literal>web-beans.xml</literal>-Datei enthalten."
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "throws Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource Transaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login implements Serializable {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @PersistenceContext EntityManager userDatabase;\n"
+#~ "    ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @PersistenceContext EntityManager userDatabase;\n"
+#~ "    \n"
+#~ "    ...\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Login extends HttpServlet {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject Login login;\n"
+#~ "\n"
+#~ "   @Override\n"
+#~ "   public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "      throws ServletException, IOException {\n"
+#~ "      credentials.setUsername(request.getParameter(\"username\")):\n"
+#~ "      credentials.setPassword(request.getParameter(\"password\")):\n"
+#~ "      login.login();\n"
+#~ "      if ( login.isLoggedIn() ) {\n"
+#~ "         response.sendRedirect(\"/home.jsp\");\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "            \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "public class Login extends HttpServlet {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @Current Login login;\n"
+#~ "\n"
+#~ "    @Override\n"
+#~ "    public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "        throws ServletException, IOException {\n"
+#~ "        credentials.setUsername( request.getAttribute(\"username\") ):\n"
+#~ "        credentials.setPassword( request.getAttribute(\"password\") ):\n"
+#~ "        login.login();\n"
+#~ "        if ( login.isLoggedIn() ) {\n"
+#~ "            response.sendRedirect(\"/home.jsp\");\n"
+#~ "        }\n"
+#~ "        else {\n"
+#~ "            response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "            \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "   @Inject Inventory inventory;\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "   public void onMessage(Message message) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "\n"
+#~ "    @Current Inventory inventory;\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "    public void onMessage(Message message) {\n"
+#~ "        ...\n"
+#~ "    }\n"
+#~ "            \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Order order;\n"
+#~ "@Inject @OrderMessageProducer MessageProducer producer;\n"
+#~ "@Inject @OrderSession QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "   MapMessage msg = orderSession.createMapMessage();\n"
+#~ "   msg.setLong(\"orderId\", order.getId());\n"
+#~ "   ...\n"
+#~ "   producer.send(msg);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@OrderProcessor QueueSender orderSender;\n"
+#~ "@OrderProcessor QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "    MapMessage msg = orderSession.createMapMessage();\n"
+#~ "    ...\n"
+#~ "    orderSender.send(msg);\n"
+#~ "}"
+
+#~ msgid ""
 #~ "There is one restriction to be aware of here: <literal>@PersistenceContext"
 #~ "(type=EXTENDED)</literal> is not supported for simple Web Beans."
 #~ msgstr ""

Modified: doc/trunk/reference/de-DE/environments.po
===================================================================
--- doc/trunk/reference/de-DE/environments.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/environments.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,22 +15,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: environments.xml:4
 #, no-c-format
 msgid "Application servers and environments supported by Weld"
 msgstr ""
 
 #. Tag: title
-#: environments.xml:7
 #, no-c-format
 msgid "Using Weld with JBoss AS"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:9
 #, no-c-format
 msgid ""
-"If you are using JBoss AS 5.2, no additional configuration is required to "
+"If you are using JBoss AS 6.0, no additional configuration is required to "
 "use Weld (or CDI for that matter). All you need to do is make your "
 "application a bean bean archive by adding <literal>META-INF/beans.xml</"
 "literal> to the classpath or <literal>WEB-INF/beans.xml</literal> to the web "
@@ -38,50 +35,39 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:15
 #, no-c-format
 msgid ""
 "Unfortunately, you can't use Weld with earlier versions of JBoss AS since "
 "they are missing key libraries. If you want to learn how to upgrade the "
-"built-in support on JBoss AS 5.2, then read on."
+"built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:20
 #, no-c-format
 msgid ""
-"Upgrading the Weld add-on is easy. The Weld distribution has a build that "
-"can take care of this task for you in a single command. First, we need to "
-"tell Weld where JBoss AS is located. Create a new file named <literal>local."
-"build.properties</literal> in the examples directory of the Weld "
-"distribution and assign the path of your JBoss AS installation to the "
-"property key <literal>jboss.home</literal>, as follows:"
+"If there is a newer release of Weld than what is included in the latest "
+"JBoss AS 6 release, upgrading the Weld add-on is easy. The Weld distribution "
+"includes a build script that can take care of this task for you in a single "
+"command."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:27
+#. Tag: para
 #, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"
+msgid ""
+"First, we need to tell Weld where JBoss AS is located. This information is "
+"communicated by assigning the <literal>JBOSS_HOME</literal> environment "
+"variable. In a bash shell, you can assign the environment variable as "
+"follows:"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:29
 #, no-c-format
 msgid ""
 "Now we can install the Weld deployer from the <literal>jboss-as</literal> "
 "directory of the Weld distribution:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:33
-#, no-c-format
-msgid ""
-"$> cd jboss-as\n"
-"$> ant update"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:36
 #, no-c-format
 msgid ""
 "A new deployer, <literal>weld.deployer</literal> is added to JBoss AS. This "
@@ -92,13 +78,11 @@
 msgstr ""
 
 #. Tag: title
-#: environments.xml:46
 #, no-c-format
 msgid "GlassFish"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:48
 #, no-c-format
 msgid ""
 "Weld is also built into GlassFish from V3 onwards. Since GlassFish V3 is the "
@@ -109,13 +93,11 @@
 msgstr ""
 
 #. Tag: title
-#: environments.xml:56
 #, no-c-format
 msgid "Servlet containers (such as Tomcat or Jetty)"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:58
 #, no-c-format
 msgid ""
 "While JSR-299 does not require support for servlet environments, Weld can be "
@@ -123,7 +105,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:64
 #, no-c-format
 msgid ""
 "There is a major limitation to using a servlet container. Weld doesn't "
@@ -134,7 +115,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:72
 #, no-c-format
 msgid ""
 "Weld should be used as a web application library in a servlet container. You "
@@ -145,62 +125,52 @@
 "could use its component jars:"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:84
+#. Tag: para
 #, no-c-format
-msgid "jsr299-api.jar"
+msgid "<literal>jsr299-api.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:89
+#. Tag: para
 #, no-c-format
-msgid "weld-api.jar"
+msgid "<literal>weld-api.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:94
+#. Tag: para
 #, no-c-format
-msgid "weld-spi.jar"
+msgid "<literal>weld-spi.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:99
+#. Tag: para
 #, no-c-format
-msgid "weld-core.jar"
+msgid "<literal>weld-core.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:104
+#. Tag: para
 #, no-c-format
-msgid "weld-logging.jar"
+msgid "<literal>weld-logging.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:109
+#. Tag: para
 #, no-c-format
-msgid "weld-servlet-int.jar"
+msgid "<literal>weld-servlet-int.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:114
+#. Tag: para
 #, no-c-format
-msgid "javassist.jar"
+msgid "<literal>javassist.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:119
+#. Tag: para
 #, no-c-format
-msgid "dom4j.jar"
+msgid "<literal>dom4j.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:124
+#. Tag: para
 #, no-c-format
-msgid "google-collections.jar"
+msgid "<literal>google-collections.jar</literal>"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:129
 #, no-c-format
 msgid ""
 "You also need to explicitly specify the servlet listener (used to boot Weld, "
@@ -208,24 +178,12 @@
 "literal> in the web root:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:137
 #, no-c-format
 msgid "Tomcat"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:139
 #, no-c-format
 msgid ""
 "Tomcat has a read-only JNDI, so Weld can't automatically bind the "
@@ -234,40 +192,14 @@
 "following contents:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:145
-#, no-c-format
-msgid ""
-"<![CDATA[<Context>\n"
-"   <Resource name=\"BeanManager\" \n"
-"      auth=\"Container\"\n"
-"      type=\"javax.enterprise.inject.spi.BeanManager\"\n"
-"      factory=\"org.jboss.weld.resources.ManagerObjectFactory\"/>\n"
-"</Context>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:147
 #, no-c-format
 msgid ""
 "and make it available to your deployment by adding this to the bottom of "
 "<literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[<resource-env-ref>\n"
-"   <resource-env-ref-name>BeanManager</resource-env-ref-name>\n"
-"   <resource-env-ref-type>\n"
-"      javax.enterprise.inject.spi.BeanManager\n"
-"   </resource-env-ref-type>\n"
-"</resource-env-ref>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:153
 #, no-c-format
 msgid ""
 "Tomcat only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -276,7 +208,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:158
 #, no-c-format
 msgid ""
 "Weld also supports Servlet injection in Tomcat. To enable this, place the "
@@ -284,22 +215,12 @@
 "literal>, and add the following to <literal>META-INF/context.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:164
-#, no-c-format
-msgid ""
-"<![CDATA[<Listener className=\"org.jboss.weld.environment.tomcat."
-"WeldLifecycleListener\"/>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:169
 #, no-c-format
 msgid "Jetty"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:171
 #, no-c-format
 msgid ""
 "Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind "
@@ -307,32 +228,7 @@
 "INF/jetty-env.xml</literal> with the following contents:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:176
-#, no-c-format
-msgid ""
-"<![CDATA[<!DOCTYPE Configure PUBLIC \"-//Mort Bay Consulting//DTD Configure//"
-"EN\"\n"
-"   \"http://jetty.mortbay.org/configure.dtd\">\n"
-"<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext"
-"\">\n"
-"   <New id=\"BeanManager\" class=\"org.mortbay.jetty.plus.naming.Resource"
-"\">\n"
-"      <Arg><Ref id=\"webAppCtx\"/></Arg> \n"
-"      <Arg>BeanManager</Arg>\n"
-"      <Arg>\n"
-"         <New class=\"javax.naming.Reference\">\n"
-"            <Arg>javax.enterprise.inject.spi.BeanManager</Arg> \n"
-"            <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>\n"
-"            <Arg/>\n"
-"         </New>\n"
-"      </Arg>\n"
-"   </New>\n"
-"</Configure>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:178
 #, no-c-format
 msgid ""
 "Notice that Jetty doesn't not have built-in support for an <literal>javax."
@@ -342,7 +238,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:184
 #, no-c-format
 msgid ""
 "Jetty only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -351,19 +246,16 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:189
 #, no-c-format
 msgid "Weld does not currently support Servlet injection in Jetty."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:198
 #, no-c-format
 msgid "Java SE"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:200
 #, no-c-format
 msgid ""
 "In addition to improved integration of the Enterprise Java stack, the "
@@ -376,7 +268,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:208
 #, no-c-format
 msgid ""
 "When executing in the SE environment the following features of Weld are "
@@ -384,7 +275,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:214
 #, no-c-format
 msgid ""
 "Managed beans with <literal>@PostConstruct</literal> and "
@@ -392,13 +282,11 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:220
 #, no-c-format
 msgid "Dependency injection with qualifiers and alternatives"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:225
 #, no-c-format
 msgid ""
 "<literal>@Application</literal>, <literal>@Dependent</literal> and "
@@ -406,43 +294,36 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:231
 #, no-c-format
 msgid "Interceptors and decorators"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:236
 #, no-c-format
 msgid "Stereotypes"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:241
 #, no-c-format
 msgid "Events"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:246
 #, no-c-format
 msgid "Portable extension support"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:252
 #, no-c-format
 msgid "EJB beans are not supported."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:257
 #, no-c-format
 msgid "CDI SE Module"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:259
 #, no-c-format
 msgid ""
 "Weld provides an extension which will boot a CDI bean manager in Java SE, "
@@ -450,26 +331,12 @@
 "command line parameters can be injected using either of the following:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:264
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters List<String> params;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: environments.xml:266
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters String[] paramsArray;]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:268
 #, no-c-format
 msgid "The second form is useful for compatibility with existing classes."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:273
 #, no-c-format
 msgid ""
 "The command line parameters do not become available for injection until the "
@@ -480,45 +347,26 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:282
 #, no-c-format
 msgid "Here's an example of a simple CDI SE application:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:286
-#, no-c-format
-msgid ""
-"<![CDATA[@Singleton\n"
-"public class HelloWorld\n"
-"{\n"
-"   public void printHello(@Observes ContainerInitialized event, @Parameters "
-"List<String> parameters) {\n"
-"       System.out.println(\"Hello \" + parameters.get(0));\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:292
 #, no-c-format
 msgid "Bootstrapping CDI SE"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:294
 #, no-c-format
 msgid "CDI SE applications can be bootstrapped in the following ways."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:300
 #, no-c-format
 msgid "The ContainerInitialized Event"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:302
 #, no-c-format
 msgid ""
 "Thanks to the power of CDI's typesafe event model, application developers "
@@ -530,27 +378,18 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:310
 #, no-c-format
 msgid ""
 "In this case your application can be started by calling the provided main "
 "method like so:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:313
-#, no-c-format
-msgid "<![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:319
 #, no-c-format
 msgid "Programatic Bootstrap API"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:321
 #, no-c-format
 msgid ""
 "For added flexibility, CDI SE also comes with a bootstrap API which can be "
@@ -559,90 +398,65 @@
 "classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:327
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class Weld\n"
-"{\n"
-"\n"
-"   /** Boots Weld and creates and returns a WeldContainer instance, through "
-"which\n"
-"    * beans and events can be accesed. */\n"
-"   public WeldContainer initialize() {...}\n"
-"\n"
-"   /** Convenience method for shutting down the container. */\n"
-"   public void shutdown() {...}\n"
-"\n"
-"}]]>"
+"Here's an example application main method which uses this API to initialize "
+"a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:329
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class WeldContainer\n"
-"{\n"
-"\n"
-"   /** Provides access to all beans within the application. */\n"
-"   public Instance<Object> instance() {...}\n"
-"\n"
-"   /** Provides access to all events within the application. */\n"
-"   public Event<Object> event() {...}\n"
-"\n"
-"   /** Provides direct access to the BeanManager. */\n"
-"   public BeanManager getBeanManager() {...}\n"
-"\n"
-"}]]>"
+"Alternatively the application could be started by firing a custom event "
+"which would then be observed by another simple bean. The following example "
+"fires <literal>MyEvent</literal> on startup."
 msgstr ""
 
-#. Tag: para
-#: environments.xml:331
+#. Tag: title
 #, no-c-format
-msgid ""
-"Here's an example application main method which uses this API to initialize "
-"a bean of type <literal>MyApplicationBean</literal>."
+msgid "Thread Context"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:334
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.instance().select(MyApplicationBean.class).get();\n"
-"   weld.shutdown();\n"
-"}]]>"
+"In contrast to Java EE applications, Java SE applications place no "
+"restrictions on developers regarding the creation and usage of threads. "
+"Therefore Weld SE provides a custom scope annotation, "
+"<literal>@ThreadScoped</literal>, and corresponding context implementation "
+"which can be used to bind bean instances to the current thread. It is "
+"intended to be used in scenarios where you might otherwise use "
+"<literal>ThreadLocal</literal>, and does in fact use <literal>ThreadLocal</"
+"literal> under the hood."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:336
 #, no-c-format
 msgid ""
-"Alternatively the application could be started by firing a custom event "
-"which would then be observed by another simple bean. The following example "
-"fires <literal>MyEvent</literal> on startup."
+"To use the @ThreadScoped annotation you need to enable the "
+"<literal>RunnableDecorator</literal> which 'listens' for all executions of "
+"<literal>Runnable.run()</literal> and decorates them by setting up the "
+"thread context beforehand, bound to the current thread, and destroying the "
+"context afterwards."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:340
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.event().select(MyEvent.class).fire( new MyEvent() );\n"
-"   weld.shutdown();\n"
-"}]]>"
+"It is not necessary to use @ThreadScoped in all multithreaded applications. "
+"The thread context is not intended as a replacement for defining your own "
+"application-specific contexts. It is generally only useful in situtations "
+"where you would otherwise have used ThreadLocal directly, which are "
+"typically rare."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:348
 #, no-c-format
 msgid "Setting the Classpath"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:350
 #, no-c-format
 msgid ""
 "Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld "

Modified: doc/trunk/reference/de-DE/events.po
===================================================================
--- doc/trunk/reference/de-DE/events.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/events.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: events\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-13 08:17+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,13 +16,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: events.xml:4
 #, no-c-format
 msgid "Events"
 msgstr "Ereignisse"
 
 #. Tag: para
-#: events.xml:6
 #, no-c-format
 msgid ""
 "Dependency injection enables loose-coupling by allowing the implementation "
@@ -33,7 +31,6 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:13
 #, no-c-format
 msgid ""
 "This basic schema might sound like the familiar observer/observable pattern, "
@@ -41,7 +38,6 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:18
 #, no-c-format
 msgid ""
 "not only are event producers decoupled from observers; observers are "
@@ -51,7 +47,6 @@
 "auch komplett von Producern abgekoppelt, "
 
 #. Tag: para
-#: events.xml:22
 #, no-c-format
 msgid ""
 "observers can specify a combination of \"selectors\" to narrow the set of "
@@ -61,7 +56,6 @@
 "von Ereignisbenachrichtigungen einzugrenzen, die sie erhalten und "
 
 #. Tag: para
-#: events.xml:28
 #, fuzzy, no-c-format
 msgid ""
 "observers can be notified immediately, or can specify that delivery of the "
@@ -72,7 +66,6 @@
 "verschoben wird "
 
 #. Tag: para
-#: events.xml:35
 #, no-c-format
 msgid ""
 "The CDI event notification facility uses more or less the same typesafe "
@@ -80,13 +73,11 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:39
 #, fuzzy, no-c-format
 msgid "Event payload"
 msgstr "Ereignis-Producer"
 
 #. Tag: para
-#: events.xml:41
 #, no-c-format
 msgid ""
 "The event object carries state from producer to consumer. The event object "
@@ -98,35 +89,18 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:48
 #, no-c-format
 msgid ""
 "An event qualifier is just a normal qualifier, defined using "
 "<literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({FIELD, PARAMETER})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated {}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated { ... }]]>"
-
 #. Tag: title
-#: events.xml:57
 #, no-c-format
 msgid "Event observers"
 msgstr "Ereignis-Observer"
 
 #. Tag: para
-#: events.xml:59
 #, fuzzy, no-c-format
 msgid ""
 "An <emphasis>observer method</emphasis> is a method of a bean with a "
@@ -135,18 +109,7 @@
 "Eine <emphasis>Observer-Methode</emphasis> ist eine Methode eines Web Beans "
 "mit einem Parameter, der <literal>@Observes</literal> annotiert ist."
 
-#. Tag: programlisting
-#: events.xml:64
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }]]>"
-
 #. Tag: para
-#: events.xml:66
 #, fuzzy, no-c-format
 msgid ""
 "The annotated parameter is called the <emphasis>event parameter</emphasis>. "
@@ -161,23 +124,12 @@
 "Ereignis-Selektor verwendet, so wird dies als <emphasis>Ereignis Binding-"
 "Typ</emphasis>."
 
-#. Tag: programlisting
-#: events.xml:72 events.xml:240
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:74
 #, fuzzy, no-c-format
 msgid ""
-"An observer method need not specify any event qualifiers&#8212;in this case "
-"it is interested in <emphasis>all</emphasis> events of a particular type. If "
-"it does specify qualifiers, it's only interested in events which have those "
+"An observer method need not specify any event qualifiers—in this case it is "
+"interested in <emphasis>all</emphasis> events of a particular type. If it "
+"does specify qualifiers, it's only interested in events which have those "
 "qualifiers."
 msgstr ""
 "Eine Observer-Methode muss keine Ereignis-Bindings &#151; festlegen, in "
@@ -186,7 +138,6 @@
 "sich nur für Ereignisse, die diese Ereignis-Bindings besitzen."
 
 #. Tag: para
-#: events.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "The observer method may have additional parameters, which are injection "
@@ -195,24 +146,12 @@
 "Die Observer-Methode kann zusätzliche Parameter besitzen, die gemäß der "
 "üblichen Einspeisungssemantik Web Beans Methodenparameter eingespeist werden:"
 
-#. Tag: programlisting
-#: events.xml:84
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document, User user) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document, User user) { ... }]]>"
-
 #. Tag: title
-#: events.xml:89
 #, no-c-format
 msgid "Event producers"
 msgstr "Ereignis-Producer"
 
 #. Tag: para
-#: events.xml:91
 #, no-c-format
 msgid ""
 "Event producers fire events using an instance of the parameterized "
@@ -220,14 +159,7 @@
 "obtained by injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:96
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
-msgstr "<![CDATA[@Observable Event<Document> documentEvent]]>"
-
 #. Tag: para
-#: events.xml:98
 #, fuzzy, no-c-format
 msgid ""
 "A producer raises events by calling the <literal>fire()</literal> method of "
@@ -237,20 +169,12 @@
 "<literal>Event</literal>-Interface Ereignisse auf, wobei ein "
 "<emphasis>Ereignisobjekt</emphasis> weitergegeben wird:"
 
-#. Tag: programlisting
-#: events.xml:103
-#, no-c-format
-msgid "<![CDATA[documentEvent.fire(document);]]>"
-msgstr "<![CDATA[documentEvent.fire(document);]]>"
-
 #. Tag: para
-#: events.xml:105
 #, fuzzy, no-c-format
 msgid "This particular event will be delivered to every observer method that:"
 msgstr "Das Ereignis wird an jede Observer-Methode geliefert, die:"
 
 #. Tag: para
-#: events.xml:111
 #, fuzzy, no-c-format
 msgid ""
 "has an event parameter to which the event object (the <literal>Document</"
@@ -260,13 +184,11 @@
 "kann und "
 
 #. Tag: para
-#: events.xml:115
 #, fuzzy, no-c-format
 msgid "specifies no qualifiers."
 msgstr "keine Ereignis-Bindings festlegt."
 
 #. Tag: para
-#: events.xml:119
 #, fuzzy, no-c-format
 msgid ""
 "The container simply calls all the observer methods, passing the event "
@@ -281,19 +203,16 @@
 "literal>-Methode erneut gemeldet."
 
 #. Tag: para
-#: events.xml:125
 #, no-c-format
 msgid "Qualifiers can be applied to an event in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: events.xml:131
 #, no-c-format
 msgid "by annotating the <literal>Event</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: events.xml:134
 #, no-c-format
 msgid ""
 "by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
@@ -301,19 +220,11 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:138
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is far simpler:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:142
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
-msgstr "<![CDATA[@Observable @Updated Event<Document> documentUpdatedEvent]]>"
-
 #. Tag: para
-#: events.xml:144
 #, fuzzy, no-c-format
 msgid ""
 "Then, every event fired via this instance of <literal>Event</literal> has "
@@ -325,7 +236,6 @@
 "jede Observer-Methode geliefert, die: "
 
 #. Tag: para
-#: events.xml:151
 #, no-c-format
 msgid "has an event parameter to which the event object is assignable, and"
 msgstr ""
@@ -333,7 +243,6 @@
 "kann und "
 
 #. Tag: para
-#: events.xml:154
 #, fuzzy, no-c-format
 msgid ""
 "does not have any event qualifier <emphasis>except</emphasis> for the event "
@@ -344,7 +253,6 @@
 "<literal>fire()</literal> weitergegebenen Ereignis-Bindings."
 
 #. Tag: para
-#: events.xml:161
 #, no-c-format
 msgid ""
 "The downside of annotating the injection point is that we can't specify the "
@@ -354,18 +262,7 @@
 "<literal>Event</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:167
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
-"(document);]]>"
-msgstr ""
-"<![CDATA[documentEvent.fire( document, new AnnotationLiteral<Updated>()"
-"{} );]]>"
-
 #. Tag: para
-#: events.xml:169
 #, no-c-format
 msgid ""
 "Events can have multiple event qualifiers, assembled using any combination "
@@ -374,13 +271,11 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:178
 #, fuzzy, no-c-format
 msgid "Conditional observer methods"
 msgstr "Transaktionale Observer"
 
 #. Tag: para
-#: events.xml:180
 #, no-c-format
 msgid ""
 "By default, if there is no instance of an observer in the current context, "
@@ -390,25 +285,13 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:186
 #, no-c-format
 msgid ""
 "A conditional observer is specified by adding <literal>receive = IF_EXISTS</"
 "literal> to the <literal>@Observes</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = IF_EXISTS) "
-"@Updated Document d) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:193
 #, no-c-format
 msgid ""
 "A bean with scope <literal>@Dependent</literal> cannot be a conditional "
@@ -416,37 +299,16 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:200
 #, fuzzy, no-c-format
 msgid "Event qualifiers with members"
 msgstr "Ereignis-Bindings mit Mitgliedern"
 
 #. Tag: para
-#: events.xml:202
 #, fuzzy, no-c-format
 msgid "An event qualifier type may have annotation members:"
 msgstr "Ein Ereignis-Binding-Typ kann Annotationsmitglieder besitzen:"
 
-#. Tag: programlisting
-#: events.xml:204
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"   RoleType value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"    RoleType value();\n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:206
 #, no-c-format
 msgid ""
 "The member value is used to narrow the messages delivered to the observer:"
@@ -454,18 +316,7 @@
 "Der Mitgliederwert dient der Eingrenzung von an den Observer gelieferten "
 "Nachrichten: "
 
-#. Tag: programlisting
-#: events.xml:208
-#, no-c-format
-msgid ""
-"<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
-"{ ... }]]>"
-
 #. Tag: para
-#: events.xml:210
 #, fuzzy, no-c-format
 msgid ""
 "Event qualifier type members may be specified statically by the event "
@@ -475,14 +326,7 @@
 "statisch festgelegt werden - dies erfolgt über Annotationen am "
 "Einspeisungspunkt der Ereignisbenachrichtigungen:"
 
-#. Tag: programlisting
-#: events.xml:215
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
-msgstr "<![CDATA[@Observable @Role(ADMIN) Event<LoggedIn> LoggedInEvent;}}]]>"
-
 #. Tag: para
-#: events.xml:217
 #, fuzzy, no-c-format
 msgid ""
 "Alternatively, the value of the event qualifier type member may be "
@@ -493,20 +337,7 @@
 "durch den Ereignis-Producer bestimmt werden. Wir beginnen durch Schreiben "
 "einer abstrakten Unterklasse von <literal>AnnotationLiteral</literal>:"
 
-#. Tag: programlisting
-#: events.xml:222
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[abstract class RoleBinding \n"
-"   extends AnnotationLiteral<Role> \n"
-"   implements Role {}]]>"
-msgstr ""
-"<![CDATA[abstract class RoleBinding \n"
-"    extends AnnotationLiteral<Role> \n"
-"    implements Role {}]]>"
-
 #. Tag: para
-#: events.xml:224
 #, fuzzy, no-c-format
 msgid ""
 "The event producer passes an instance of this class to <literal>select()</"
@@ -515,45 +346,17 @@
 "Der Ereignis-Producer gibt eine Instanz dieser Klasse an <literal>fire()</"
 "literal> weiter:"
 
-#. Tag: programlisting
-#: events.xml:226
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[documentEvent.select(new RoleBinding() {\n"
-"   public void value() { return user.getRole(); }\n"
-"}).fire(document);]]>"
-msgstr ""
-"<![CDATA[documentEvent.fire( document, new RoleBinding() { public void value"
-"() { return user.getRole(); } } );]]>"
-
 #. Tag: title
-#: events.xml:231
 #, fuzzy, no-c-format
 msgid "Multiple event qualifiers"
 msgstr "Multiple Ereignis-Bindings"
 
 #. Tag: para
-#: events.xml:233
 #, fuzzy, no-c-format
 msgid "Event qualifier types may be combined, for example:"
 msgstr "Typen von Ereignis-Bindings können kombiniert werden, zum Beispiel:"
 
-#. Tag: programlisting
-#: events.xml:235
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>(){})."
-"fire(document);]]>"
-msgstr ""
-"<![CDATA[@Observable @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.fire(document, new "
-"AnnotationLiteral<Updated>(){});]]>"
-
 #. Tag: para
-#: events.xml:237
 #, no-c-format
 msgid ""
 "When this event occurs, all of the following observer methods will be "
@@ -562,44 +365,12 @@
 "Findet dieses Ereignis statt, so werden alle folgenden Observer-Methoden "
 "benachrichtigt:"
 
-#. Tag: programlisting
-#: events.xml:239
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
-"document) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
-"document) { ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:241
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
-"{ ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:242
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }}}]]>"
-msgstr ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }}}]]>"
-
 #. Tag: title
-#: events.xml:247
 #, no-c-format
 msgid "Transactional observers"
 msgstr "Transaktionale Observer"
 
 #. Tag: para
-#: events.xml:249
 #, no-c-format
 msgid ""
 "Transactional observers receive their event notifications during the before "
@@ -615,31 +386,18 @@
 "ist, jedoch nur dann, wenn die den  <literal>Category</literal>-Baum "
 "aktualisierenden Transaktionen erfolgreich sind: "
 
-#. Tag: programlisting
-#: events.xml:256
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public void refreshCategoryTree(@Observes(during = AFTER_SUCCESS) "
-"CategoryUpdateEvent event) { ... }]]>"
-msgstr ""
-"<![CDATA[public void refreshCategoryTree(@AfterTransactionSuccess @Observes "
-"CategoryUpdateEvent event) { ... }]]>"
-
 #. Tag: para
-#: events.xml:258
 #, fuzzy, no-c-format
 msgid "There are five kinds of transactional observers:"
 msgstr "Es gibt drei Arten von transaktionalen Observern:"
 
 #. Tag: para
-#: events.xml:262
 #, no-c-format
 msgid ""
 "<literal>IN_PROGESS</literal> observers are called immediately (default)"
 msgstr ""
 
 #. Tag: para
-#: events.xml:265
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_SUCCESS</literal> observers are called during the after "
@@ -651,7 +409,6 @@
 "Abschluss der Transaktion"
 
 #. Tag: para
-#: events.xml:271
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_FAILURE</literal> observers are called during the after "
@@ -663,7 +420,6 @@
 "Abschluss der Transaktion fehlschlägt"
 
 #. Tag: para
-#: events.xml:277
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_COMPLETION</literal> observers are called during the after "
@@ -673,7 +429,6 @@
 "Nach-Abschlussphase der Transaktion aufgerufen "
 
 #. Tag: para
-#: events.xml:283
 #, fuzzy, no-c-format
 msgid ""
 "<literal>BEFORE_COMPLETION</literal> observers are called during the before "
@@ -683,7 +438,6 @@
 "Vor-Abschlussphase der Transaktion aufgerufen"
 
 #. Tag: para
-#: events.xml:290
 #, fuzzy, no-c-format
 msgid ""
 "Transactional observers are very important in a stateful object model "
@@ -694,7 +448,6 @@
 "atomare Transaktion."
 
 #. Tag: para
-#: events.xml:295
 #, no-c-format
 msgid ""
 "Imagine that we have cached a JPA query result set in the application scope:"
@@ -702,50 +455,7 @@
 "Stellen wir uns vor, wir besitzen einen gecachten Satz von JPA-"
 "Abfrageergebnissen im Geltungsbereich der Anwendung:"
 
-#. Tag: programlisting
-#: events.xml:297
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   List<Product> products;\n"
-"\n"
-"   @Produces @Catalog \n"
-"   List<Product> getCatalog() {\n"
-"      if (products==null) {\n"
-"         products = em.createQuery(\"select p from Product p where p.deleted "
-"= false\")\n"
-"            .getResultList();\n"
-"      }\n"
-"      return products;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    List<Product> products;\n"
-"\n"
-"    @Produces @Catalog \n"
-"    List<Product> getCatalog() {\n"
-"        if (products==null) {\n"
-"            products = em.createQuery(\"select p from Product p where p."
-"deleted = false\")\n"
-"                .getResultList();\n"
-"        }\n"
-"        return products;\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:299
 #, no-c-format
 msgid ""
 "From time to time, a <literal>Product</literal> is created or deleted. When "
@@ -759,7 +469,6 @@
 "erfolgreichen Abschluss der Transaktion warten!"
 
 #. Tag: para
-#: events.xml:305
 #, fuzzy, no-c-format
 msgid ""
 "The bean that creates and deletes <literal>Product</literal>s could raise "
@@ -768,51 +477,7 @@
 "Das Web Bean, das <literal>Product</literal>s erstellt oder löscht könnte "
 "Ereignisse aufrufen, zum Beispiel:"
 
-#. Tag: programlisting
-#: events.xml:309
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"   @PersistenceContext EntityManager em;\n"
-"   @Inject @Any Event<Product> productEvent;\n"
-"\n"
-"   public void delete(Product product) {\n"
-"      em.delete(product);\n"
-"      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
-"(product);\n"
-"   }\n"
-"    \n"
-"   public void persist(Product product) {\n"
-"      em.persist(product);\n"
-"      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
-"(product);\n"
-"   }\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"\n"
-"    @PersistenceContext EntityManager em;\n"
-"    @Observable Event<Product> productEvent;\n"
-"\n"
-"    public void delete(Product product) {\n"
-"        em.delete(product);\n"
-"        productEvent.fire(product, new AnnotationLiteral<Deleted>(){});\n"
-"    }\n"
-"    \n"
-"    public void persist(Product product) {\n"
-"        em.persist(product);\n"
-"        productEvent.fire(product, new AnnotationLiteral<Created>(){});\n"
-"    }\n"
-"    \n"
-"    ...\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:311
 #, no-c-format
 msgid ""
 "And now <literal>Catalog</literal> can observe the events after successful "
@@ -821,42 +486,270 @@
 "Und jetzt kann <literal>Catalog</literal> die Ereignisse nach erfolgreichem "
 "Abschluss der Transaktion beobachten:"
 
-#. Tag: programlisting
-#: events.xml:315
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"   ...\n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
-"product) {\n"
-"      products.add(product);\n"
-"   }\n"
-"    \n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
-"product) {\n"
-"      products.remove(product);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"    ...\n"
-"    \n"
-"    void addProduct(@AfterTransactionSuccess @Observes @Created Product "
-"product) {\n"
-"        products.add(product);\n"
-"    }\n"
-"    \n"
-"    void addProduct(@AfterTransactionSuccess @Observes @Deleted Product "
-"product) {\n"
-"        products.remove(product);\n"
-"    }\n"
-"    \n"
-"}]]>"
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({FIELD, PARAMETER})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated { ... }]]>"
 
 #~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
+#~ msgstr "<![CDATA[@Observable Event<Document> documentEvent]]>"
+
+#~ msgid "<![CDATA[documentEvent.fire(document);]]>"
+#~ msgstr "<![CDATA[documentEvent.fire(document);]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Updated Event<Document> documentUpdatedEvent]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
+#~ "(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.fire( document, new AnnotationLiteral<Updated>()"
+#~ "{} );]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = "
+#~ "IF_EXISTS) @Updated Document d) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "   RoleType value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "    RoleType value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Role(ADMIN) Event<LoggedIn> LoggedInEvent;}}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "   extends AnnotationLiteral<Role> \n"
+#~ "   implements Role {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "    extends AnnotationLiteral<Role> \n"
+#~ "    implements Role {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new RoleBinding() {\n"
+#~ "   public void value() { return user.getRole(); }\n"
+#~ "}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.fire( document, new RoleBinding() { public void "
+#~ "value() { return user.getRole(); } } );]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>()"
+#~ "{}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.fire(document, new "
+#~ "AnnotationLiteral<Updated>(){});]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public void refreshCategoryTree(@Observes(during = "
+#~ "AFTER_SUCCESS) CategoryUpdateEvent event) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void refreshCategoryTree(@AfterTransactionSuccess "
+#~ "@Observes CategoryUpdateEvent event) { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   List<Product> products;\n"
+#~ "\n"
+#~ "   @Produces @Catalog \n"
+#~ "   List<Product> getCatalog() {\n"
+#~ "      if (products==null) {\n"
+#~ "         products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "            .getResultList();\n"
+#~ "      }\n"
+#~ "      return products;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    List<Product> products;\n"
+#~ "\n"
+#~ "    @Produces @Catalog \n"
+#~ "    List<Product> getCatalog() {\n"
+#~ "        if (products==null) {\n"
+#~ "            products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "                .getResultList();\n"
+#~ "        }\n"
+#~ "        return products;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "   @Inject @Any Event<Product> productEvent;\n"
+#~ "\n"
+#~ "   public void delete(Product product) {\n"
+#~ "      em.delete(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void persist(Product product) {\n"
+#~ "      em.persist(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    @Observable Event<Product> productEvent;\n"
+#~ "\n"
+#~ "    public void delete(Product product) {\n"
+#~ "        em.delete(product);\n"
+#~ "        productEvent.fire(product, new AnnotationLiteral<Deleted>(){});\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void persist(Product product) {\n"
+#~ "        em.persist(product);\n"
+#~ "        productEvent.fire(product, new AnnotationLiteral<Created>(){});\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    ...\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "   ...\n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
+#~ "product) {\n"
+#~ "      products.add(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
+#~ "product) {\n"
+#~ "      products.remove(product);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "    ...\n"
+#~ "    \n"
+#~ "    void addProduct(@AfterTransactionSuccess @Observes @Created Product "
+#~ "product) {\n"
+#~ "        products.add(product);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    void addProduct(@AfterTransactionSuccess @Observes @Deleted Product "
+#~ "product) {\n"
+#~ "        products.remove(product);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "The Web Beans event notification facility allows Web Beans to interact in "
 #~ "a totally decoupled manner. Event <emphasis>producers</emphasis> raise "
 #~ "events that are then delivered to event <emphasis>observers</emphasis> by "

Modified: doc/trunk/reference/de-DE/example.po
===================================================================
--- doc/trunk/reference/de-DE/example.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/example.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: example\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-28 07:53+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,13 +16,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: example.xml:4
 #, no-c-format
 msgid "JSF web application example"
 msgstr "Beispiel einer JSF-Webanwendung"
 
 #. Tag: para
-#: example.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "Let's illustrate these ideas with a full example. We're going to implement "
@@ -36,113 +34,18 @@
 "implementieren. Zunächst definieren wir ein Web Bean das den während des "
 "Logins eingegebenen Benutzernamen und das Passwort verwahrt:"
 
-#. Tag: programlisting
-#: example.xml:12
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    @NotNull @Length(min=3, max=25)\n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    @NotNull @Length(min=6, max=20)\n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"        \n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:14
 #, fuzzy, no-c-format
 msgid "This bean is bound to the login prompt in the following JSF form:"
 msgstr ""
 "Dieses Web Bean ist an den Login-Prompt in folgendem JSF-Formular gebunden:"
 
-#. Tag: programlisting
-#: example.xml:16
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<h:form>\n"
-"   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"      <f:validateBean>\n"
-"         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"         <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"         <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"      </f:validateBean>\n"
-"   </h:panelGrid>\n"
-"   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-msgstr ""
-"<![CDATA[<h:form>\n"
-"    <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"        <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"        <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"        <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"        <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"    </h:panelGrid>\n"
-"    <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"    <h:commandButton value=\"Logout\" acion=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-
 #. Tag: para
-#: example.xml:18
 #, no-c-format
 msgid "Users are represented by a JPA entity:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:22
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Entity\n"
-"public class User {\n"
-"   private @NotNull @Length(min=3, max=25) @Id String username;\n"
-"   private @NotNull @Length(min=6, max=20) String password;\n"
-"   \n"
-"   public String getUsername() { return username; }\n"
-"   public void setUsername(String username) { this.username = username; }\n"
-"   public String setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"        \n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:24
 #, no-c-format
 msgid ""
 "(Note that we're also going to need a <literal>persistence.xml</literal> "
@@ -151,7 +54,6 @@
 msgstr ""
 
 #. Tag: para
-#: example.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "The actual work is done by a session-scoped bean that maintains information "
@@ -162,141 +64,21 @@
 "übernommen, dass Informationen zum aktuell eingeloggten Benutzer verwahrt "
 "und anderen Web Beans die <literal>User</literal>-Entity offenlegt:"
 
-#. Tag: programlisting
-#: example.xml:34
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login implements Serializable {\n"
-"\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject @UserDatabase EntityManager userDatabase;\n"
-"\n"
-"   private User user;\n"
-"    \n"
-"   public void login() {\n"
-"      List<User> results = userDatabase.createQuery(\n"
-"         \"select u from User u where u.username = :username and u.password "
-"= :password\")\n"
-"         .setParameter(\"username\", credentials.getUsername())\n"
-"         .setParameter(\"password\", credentials.getPassword())\n"
-"         .getResultList();\n"
-"        \n"
-"      if (!results.isEmpty()) {\n"
-"         user = results.get(0);\n"
-"      }\n"
-"      else {\n"
-"         // perhaps add code here to report a failed login\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void logout() {\n"
-"      user = null;\n"
-"   }\n"
-"    \n"
-"   public boolean isLoggedIn() {\n"
-"      return user != null;\n"
-"   }\n"
-"    \n"
-"   @Produces @LoggedIn User getCurrentUser() {\n"
-"      return user;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @PersistenceContext EntityManager userDatabase;\n"
-"\n"
-"    private User user;\n"
-"    \n"
-"    public void login() {\n"
-"            \n"
-"        List<User> results = userDatabase.createQuery(\n"
-"           \"select u from User u where u.username=:username and u.password=:"
-"password\")\n"
-"           .setParameter(\"username\", credentials.getUsername())\n"
-"           .setParameter(\"password\", credentials.getPassword())\n"
-"           .getResultList();\n"
-"        \n"
-"        if ( !results.isEmpty() ) {\n"
-"           user = results.get(0);\n"
-"        }\n"
-"        \n"
-"    }\n"
-"    \n"
-"    public void logout() {\n"
-"        user = null;\n"
-"    }\n"
-"    \n"
-"    public boolean isLoggedIn() {\n"
-"       return user!=null;\n"
-"    }\n"
-"    \n"
-"    @Produces @LoggedIn User getCurrentUser() {\n"
-"        return user;\n"
-"    }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:36
 #, no-c-format
 msgid ""
 "<literal>@LoggedIn</literal> and <literal>@UserDatabase</literal> are custom "
 "qualifier annotations:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:38
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"public @interface LoggedIn {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD})\n"
-"@BindingType\n"
-"public @interface LoggedIn {}]]>"
-
-#. Tag: programlisting
-#: example.xml:40
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, PARAMETER, FIELD})\n"
-"public @interface UserDatabase {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD})\n"
-"@BindingType\n"
-"public @interface LoggedIn {}]]>"
-
 #. Tag: para
-#: example.xml:42
 #, no-c-format
 msgid ""
 "We need an adaptor bean to expose our typesafe <literal>EntityManager</"
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:46
-#, no-c-format
-msgid ""
-"<![CDATA[class UserDatabaseProducer {\n"
-"   @Produces @UserDatabase @PersistenceContext \n"
-"   static EntityManager userDatabase;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "Now <literal>DocumentEditor</literal>, or any other bean, can easily inject "
@@ -305,51 +87,12 @@
 "Jetzt kann jedes andere Web Bean den aktuellen Benutzer auf leichte Weise "
 "einspeisen:"
 
-#. Tag: programlisting
-#: example.xml:50
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DocumentEditor {\n"
-"   @Inject Document document;\n"
-"   @Inject @LoggedIn User currentUser;\n"
-"   @Inject @DocumentDatabase EntityManager docDatabase;\n"
-"    \n"
-"   public void save() {\n"
-"      document.setCreatedBy(currentUser);\n"
-"      docDatabase.persist(document);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class DocumentEditor {\n"
-"\n"
-"    @Current Document document;\n"
-"    @LoggedIn User currentUser;\n"
-"    @PersistenceContext EntityManager docDatabase;\n"
-"    \n"
-"    public void save() {\n"
-"        document.setCreatedBy(currentUser);\n"
-"        docDatabase.persist(document);\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:52
 #, no-c-format
 msgid "Or we can reference the current user in a JSF view:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:54
-#, no-c-format
-msgid ""
-"<![CDATA[<h:panelGroup rendered=\"#{login.loggedIn}\">\n"
-"   signed in as #{currentUser.username}\n"
-"</h:panelGroup>]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:56
 #, fuzzy, no-c-format
 msgid ""
 "Hopefully, this example gave you a taste of the CDI programming model. In "
@@ -359,6 +102,229 @@
 "Programmiermodell gegeben hat. Im nächsten Kapitel sehen wir uns die Web "
 "Beans Dependency-Einspeisung näher an."
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=3, max=25)\n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=6, max=20)\n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "        \n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<h:form>\n"
+#~ "   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "      <f:validateBean>\n"
+#~ "         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"username\" value=\"#{credentials.username}\"/"
+#~ ">\n"
+#~ "         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"password\" value=\"#{credentials.password}\"/"
+#~ ">\n"
+#~ "      </f:validateBean>\n"
+#~ "   </h:panelGrid>\n"
+#~ "   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#"
+#~ "{!login.loggedIn}\"/>\n"
+#~ "   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</h:form>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<h:form>\n"
+#~ "    <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "        <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "        <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
+#~ "        <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "        <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
+#~ "    </h:panelGrid>\n"
+#~ "    <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered="
+#~ "\"#{!login.loggedIn}\"/>\n"
+#~ "    <h:commandButton value=\"Logout\" acion=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</h:form>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Entity\n"
+#~ "public class User {\n"
+#~ "   private @NotNull @Length(min=3, max=25) @Id String username;\n"
+#~ "   private @NotNull @Length(min=6, max=20) String password;\n"
+#~ "   \n"
+#~ "   public String getUsername() { return username; }\n"
+#~ "   public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "   public String setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "        \n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login implements Serializable {\n"
+#~ "\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject @UserDatabase EntityManager userDatabase;\n"
+#~ "\n"
+#~ "   private User user;\n"
+#~ "    \n"
+#~ "   public void login() {\n"
+#~ "      List<User> results = userDatabase.createQuery(\n"
+#~ "         \"select u from User u where u.username = :username and u."
+#~ "password = :password\")\n"
+#~ "         .setParameter(\"username\", credentials.getUsername())\n"
+#~ "         .setParameter(\"password\", credentials.getPassword())\n"
+#~ "         .getResultList();\n"
+#~ "        \n"
+#~ "      if (!results.isEmpty()) {\n"
+#~ "         user = results.get(0);\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         // perhaps add code here to report a failed login\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void logout() {\n"
+#~ "      user = null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public boolean isLoggedIn() {\n"
+#~ "      return user != null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "      return user;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @PersistenceContext EntityManager userDatabase;\n"
+#~ "\n"
+#~ "    private User user;\n"
+#~ "    \n"
+#~ "    public void login() {\n"
+#~ "            \n"
+#~ "        List<User> results = userDatabase.createQuery(\n"
+#~ "           \"select u from User u where u.username=:username and u."
+#~ "password=:password\")\n"
+#~ "           .setParameter(\"username\", credentials.getUsername())\n"
+#~ "           .setParameter(\"password\", credentials.getPassword())\n"
+#~ "           .getResultList();\n"
+#~ "        \n"
+#~ "        if ( !results.isEmpty() ) {\n"
+#~ "           user = results.get(0);\n"
+#~ "        }\n"
+#~ "        \n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void logout() {\n"
+#~ "        user = null;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public boolean isLoggedIn() {\n"
+#~ "       return user!=null;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "        return user;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface LoggedIn {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD})\n"
+#~ "@BindingType\n"
+#~ "public @interface LoggedIn {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface UserDatabase {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD})\n"
+#~ "@BindingType\n"
+#~ "public @interface LoggedIn {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "   @Inject Document document;\n"
+#~ "   @Inject @LoggedIn User currentUser;\n"
+#~ "   @Inject @DocumentDatabase EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "   public void save() {\n"
+#~ "      document.setCreatedBy(currentUser);\n"
+#~ "      docDatabase.persist(document);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "\n"
+#~ "    @Current Document document;\n"
+#~ "    @LoggedIn User currentUser;\n"
+#~ "    @PersistenceContext EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "    public void save() {\n"
+#~ "        document.setCreatedBy(currentUser);\n"
+#~ "        docDatabase.persist(document);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
 #~ msgid "Of course, <literal>@LoggedIn</literal> is a binding annotation:"
 #~ msgstr ""
 #~ "Natürlich handelt es sich bei <literal>@LoggedIn</literal> um eine "

Modified: doc/trunk/reference/de-DE/extend.po
===================================================================
--- doc/trunk/reference/de-DE/extend.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/extend.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: extend\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-14 06:59+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,13 +16,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: extend.xml:5
 #, no-c-format
 msgid "Portable extensions"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "CDI is intended to be a foundation for frameworks, extensions and "
@@ -37,13 +35,11 @@
 "Designern von Web Beans vorgesehen:"
 
 #. Tag: para
-#: extend.xml:15
 #, no-c-format
 msgid "integration with Business Process Management engines,"
 msgstr "Integration mit Business Process Management Engines,"
 
 #. Tag: para
-#: extend.xml:18
 #, no-c-format
 msgid ""
 "integration with third-party frameworks such as Spring, Seam, GWT or Wicket, "
@@ -53,31 +49,26 @@
 "Wicket und"
 
 #. Tag: para
-#: extend.xml:23
 #, fuzzy, no-c-format
 msgid "new technology based upon the CDI programming model."
 msgstr "neue, auf dem Web Beans Programmiermodell basierende Technologie."
 
 #. Tag: para
-#: extend.xml:27
 #, no-c-format
 msgid "More formally, according to the spec:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:32
 #, no-c-format
 msgid "A portable extension may integrate with the container by:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:35
 #, no-c-format
 msgid "Providing its own beans, interceptors and decorators to the container"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:40
 #, no-c-format
 msgid ""
 "Injecting dependencies into its own objects using the dependency injection "
@@ -85,13 +76,11 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:45
 #, no-c-format
 msgid "Providing a context implementation for a custom scope"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:50
 #, no-c-format
 msgid ""
 "Augmenting or overriding the annotation-based metadata with metadata from "
@@ -99,13 +88,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:58
 #, fuzzy, no-c-format
 msgid "Creating an <literal>Extension</literal>"
 msgstr "Die <literal>Bean</literal>-Klasse"
 
 #. Tag: para
-#: extend.xml:60
 #, no-c-format
 msgid ""
 "The first step in creating a portable extension is to write a class that "
@@ -114,14 +101,7 @@
 "service provider architecture."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:66
-#, no-c-format
-msgid "class MyExtension implements Extension { ... }"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:68
 #, no-c-format
 msgid ""
 "Next, we need to register our extension as a service provider by creating a "
@@ -129,14 +109,7 @@
 "literal>, which contains the name of our extension class:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:74
-#, no-c-format
-msgid "org.mydomain.extension.MyExtension"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:76
 #, no-c-format
 msgid ""
 "An extension is not a bean, exactly, since it is instantiated by the "
@@ -145,18 +118,7 @@
 "process is complete."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:82
-#, no-c-format
-msgid ""
-"@Inject \n"
-"MyBean(MyExtension myExtension) {\n"
-"   myExtension.doSomething();\n"
-"}"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:84
 #, no-c-format
 msgid ""
 "And, like beans, extensions can have observer methods. Usually, the observer "
@@ -164,33 +126,28 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:92
 #, no-c-format
 msgid "Container lifecycle events"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:94
 #, no-c-format
 msgid ""
 "During the initialization process, the container fires a series of events, "
 "including:"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:101
-#, no-c-format
-msgid "BeforeBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>BeforeBeanDiscovery</literal>"
+msgstr "Das <literal>Manager</literal>-Objekt"
 
-#. Tag: literal
-#: extend.xml:106
-#, no-c-format
-msgid "ProcessAnnotatedType"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>ProcessAnnotatedType</literal>"
+msgstr "Das <literal>Manager</literal>-Objekt"
 
 #. Tag: para
-#: extend.xml:110
 #, no-c-format
 msgid ""
 "<literal>ProcessInjectionTarget</literal> and <literal>ProcessProducer</"
@@ -198,54 +155,27 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:115
 #, no-c-format
 msgid ""
 "<literal>ProcessBean</literal> and <literal>ProcessObserverMethod</literal>"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:121
-#, no-c-format
-msgid "AfterBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>AfterBeanDiscovery</literal>"
+msgstr "Das <literal>Manager</literal>-Objekt"
 
-#. Tag: literal
-#: extend.xml:126
+#. Tag: para
 #, no-c-format
-msgid "AfterDeploymentValidation"
+msgid "<literal>AfterDeploymentValidation</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:131
 #, no-c-format
 msgid "Extensions may observe these events:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:135
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"   \n"
-"   void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bbd) {\n"
-"      Logger.global.debug(\"beginning the scanning process\");\n"
-"   }\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      Logger.global.debug(\"scanning type: \" + pat.getAnnotatedType()."
-"getJavaClass().getName());\n"
-"   } \n"
-"\n"
-"   void afterBeanDiscovery(@Observes AfterBeanDiscovery abd) {\n"
-"      Logger.global.debug(\"finished the scanning process\");\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:137
 #, no-c-format
 msgid ""
 "In fact, the extension can do a lot more than just observe. The extension is "
@@ -253,45 +183,19 @@
 "example:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:142
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      //tell the container to ignore the type if it is annotated @Ignore\n"
-"      if ( pat.getAnnotatedType().isAnnotionPresent(Ignore.class) ) pat.veto"
-"();   \n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:144
 #, fuzzy, no-c-format
 msgid "The observer method may inject a <literal>BeanManager</literal>"
 msgstr ""
 "Der zentrale Kern zur Erweiterung von Web Beans ist das <literal>Manager</"
 "literal>-Objekt."
 
-#. Tag: programlisting
-#: extend.xml:148
-#, no-c-format
-msgid ""
-"<![CDATA[<T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> "
-"pat, BeanManager beanManager) { ... }]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:153
 #, fuzzy, no-c-format
 msgid "The <literal>BeanManager</literal> object"
 msgstr "Das <literal>Manager</literal>-Objekt"
 
 #. Tag: para
-#: extend.xml:155
 #, fuzzy, no-c-format
 msgid ""
 "The nerve center for extending CDI is the <literal>BeanManager</literal> "
@@ -302,54 +206,7 @@
 "und den Erhalt von Web Beans, Interzeptoren, Dekoratoren, Observern und "
 "Kontexten."
 
-#. Tag: programlisting
-#: extend.xml:161
-#, no-c-format
-msgid ""
-"<![CDATA[public interface BeanManager {\n"
-"   public Object getReference(Bean<?> bean, Type beanType, "
-"CreationalContext<?> ctx);\n"
-"   public Object getInjectableReference(InjectionPoint ij, "
-"CreationalContext<?> ctx);\n"
-"   public <T> CreationalContext<T> createCreationalContext(Contextual<T> "
-"contextual);\n"
-"   public Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers);\n"
-"   public Set<Bean<?>> getBeans(String name);\n"
-"   public Bean<?> getPassivationCapableBean(String id);\n"
-"   public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);\n"
-"   public void validate(InjectionPoint injectionPoint);\n"
-"   public void fireEvent(Object event, Annotation... qualifiers);\n"
-"   public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, "
-"Annotation... qualifiers);\n"
-"   public List<Decorator<?>> resolveDecorators(Set<Type> types, "
-"Annotation... qualifiers);\n"
-"   public List<Interceptor<?>> resolveInterceptors(InterceptionType type, "
-"Annotation... interceptorBindings);\n"
-"   public boolean isScope(Class<? extends Annotation> annotationType);\n"
-"   public boolean isNormalScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isPassivatingScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isQualifier(Class<? extends Annotation> annotationType);\n"
-"   public boolean isInterceptorBinding(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isStereotype(Class<? extends Annotation> annotationType);\n"
-"   public Set<Annotation> getInterceptorBindingDefinition(Class<? extends "
-"Annotation> bindingType);\n"
-"   public Set<Annotation> getStereotypeDefinition(Class<? extends "
-"Annotation> stereotype);\n"
-"   public Context getContext(Class<? extends Annotation> scopeType);\n"
-"   public ELResolver getELResolver();\n"
-"   public ExpressionFactory wrapExpressionFactory(ExpressionFactory "
-"expressionFactory);\n"
-"   public <T> AnnotatedType<T> createAnnotatedType(Class<T> type);\n"
-"   public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> "
-"type);\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:163
 #, fuzzy, no-c-format
 msgid ""
 "Any bean or other Java EE component which supports injection can obtain an "
@@ -358,14 +215,7 @@
 "Wir können eine Instanz von <literal>Manager</literal> via Einspeisung "
 "erhalten:"
 
-#. Tag: programlisting
-#: extend.xml:166
-#, fuzzy, no-c-format
-msgid "@Inject BeanManager beanManager;"
-msgstr "@Current Manager Manager"
-
 #. Tag: para
-#: extend.xml:168
 #, no-c-format
 msgid ""
 "Java EE components may obtain an instance of <literal>BeanManager</literal> "
@@ -375,7 +225,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:174
 #, fuzzy, no-c-format
 msgid ""
 "Let's study some of the interfaces exposed by the <literal>BeanManager</"
@@ -385,13 +234,11 @@
 "literal>-Objekt."
 
 #. Tag: title
-#: extend.xml:179
 #, fuzzy, no-c-format
 msgid "The <literal>InjectionTarget</literal> interface"
 msgstr "Das <literal>Context</literal>-Interface"
 
 #. Tag: para
-#: extend.xml:181
 #, no-c-format
 msgid ""
 "The first thing that a framework developer is going to look for in the "
@@ -401,7 +248,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:188
 #, no-c-format
 msgid ""
 "We recommend that frameworks let CDI take over the job of actually "
@@ -412,50 +258,12 @@
 "field injection will be supported."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:196
-#, no-c-format
-msgid ""
-"<![CDATA[//get the BeanManager from JNDI\n"
-"BeanManager beanManager = (BeanManager) new InitialContext().lookup(\"java:"
-"comp/BeanManager\");\n"
-"\n"
-"//CDI uses an AnnotatedType object to read the annotations of a class\n"
-"AnnotatedType<SomeFrameworkComponent> type = beanManager.createAnnotatedType"
-"(SomeFrameworkComponent.class);\n"
-"\n"
-"//The extension uses an InjectionTarget to delegate instantiation, "
-"dependency injection \n"
-"//and lifecycle callbacks to the CDI container\n"
-"InjectionTarget<SomeFrameworkComponent> it = beanManager."
-"createInjectionTarget(type);\n"
-"\n"
-"//each instance needs its own CDI CreationalContext\n"
-"CreationalContext ctx = beanManager.createCreationalContext(null);\n"
-"\n"
-"//instantiate the framework component and inject its dependencies\n"
-"SomeFrameworkComponent instance = it.produce(ctx);  //call the constructor\n"
-"it.inject(instance, ctx);  //call initializer methods and perform field "
-"injection\n"
-"it.postConstruct(instance);  //call the @PostConstruct method\n"
-"\n"
-"...\n"
-"\n"
-"//destroy the framework component instance and clean up dependent objects\n"
-"it.preDestroy(instance);  //call the @PreDestroy method\n"
-"it.dispose(instance);  //it is now safe to discard the instance\n"
-"ctx.release();  //clean up dependent objects\n"
-"]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:201
 #, fuzzy, no-c-format
 msgid "The <literal>Bean</literal> interface"
 msgstr "Das <literal>Context</literal>-Interface"
 
 #. Tag: para
-#: extend.xml:203
 #, fuzzy, no-c-format
 msgid ""
 "Instances of the interface <literal>Bean</literal> represent beans. There is "
@@ -470,46 +278,18 @@
 "registriert."
 
 #. Tag: para
-#: extend.xml:210
 #, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface exposes all the interesting things we "
-"dicussed in <xref linkend=\"bean-anatomy\"/>."
+"dicussed in <xref linkend=\"bean-anatomy\" />."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:215
-#, no-c-format
-msgid ""
-"<![CDATA[public interface Bean<T> extends Contextual<T> {\n"
-"   public Set<Type> getTypes();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public String getName();\n"
-"   public Set<Class<? extends Annotation>> getStereotypes();\n"
-"   public Class<?> getBeanClass();\n"
-"   public boolean isAlternative();\n"
-"   public boolean isNullable();\n"
-"   public Set<InjectionPoint> getInjectionPoints();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:217
 #, no-c-format
 msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:221
-#, no-c-format
-msgid ""
-"<![CDATA[Set<Bean<?>> allBeans = beanManager.getBeans(Obect.class, new "
-"AnnotationLiteral<Any>() {});]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:223
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface makes it possible for a portable "
@@ -528,13 +308,11 @@
 "werden."
 
 #. Tag: title
-#: extend.xml:233
 #, fuzzy, no-c-format
 msgid "Registering a <literal>Bean</literal>"
 msgstr "Die <literal>Bean</literal>-Klasse"
 
 #. Tag: para
-#: extend.xml:235
 #, no-c-format
 msgid ""
 "The most common kind of CDI portable extension registers a bean (or beans) "
@@ -542,7 +320,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:239
 #, no-c-format
 msgid ""
 "In this example, we make a framework class, <literal>SecurityManager</"
@@ -552,101 +329,7 @@
 "<literal>SecurityManager</literal> instance."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[public class SecurityManagerExtension implements Extension {\n"
-"    \n"
-"    void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager "
-"bm) {\n"
-"            \n"
-"        //use this to read annotations of the class\n"
-"        AnnotatedType<SecurityManager> at = bm.createAnnotatedType"
-"(SecurityManager.class); \n"
-"\n"
-"        //use this to instantiate the class and inject dependencies\n"
-"        final InjectionTarget<SecurityManager> it = bm.createInjectionTarget"
-"(at); \n"
-"\n"
-"        abd.addBean( new Bean<SecurityManager>() {\n"
-"\n"
-"            @Override\n"
-"            public Class<?> getBeanClass() {\n"
-"                return SecurityManager.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public String getName() {\n"
-"                return \"securityManager\";\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getQualifiers() {\n"
-"                Set<Annotation> qualifiers = new HashSet<Annotation>();\n"
-"                qualifiers.add( new AnnotationLiteral<Default>() {} );\n"
-"                qualifiers.add( new AnnotationLiteral<Any>() {} );\n"
-"                return qualifiers;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<? extends Annotation> getScope() {\n"
-"                return SessionScoped.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Class<? extends Annotation>> getStereotypes() {\n"
-"                return Collections.emptySet();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypes() {\n"
-"                Set<Type> types = new HashSet<Type>();\n"
-"                types.add(SecurityManager.class);\n"
-"                types.add(Object.class);\n"
-"                return types;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAlternative() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isNullable() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public SecurityManager create(CreationalContext<SecurityManager> "
-"ctx) {\n"
-"                SecurityManager instance = it.produce(ctx);\n"
-"                it.inject(instance, ctx);\n"
-"                it.postConstruct(instance);\n"
-"                return instance;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void destroy(SecurityManager instance, \n"
-"                                CreationalContext<SecurityManager> ctx) {\n"
-"                it.preDestroy(instance);\n"
-"                it.dispose(instance);\n"
-"                ctx.release();\n"
-"            }\n"
-"            \n"
-"        } );\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:248
 #, no-c-format
 msgid ""
 "But a portable extension can also mess with beans that are discovered "
@@ -654,13 +337,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:255
 #, no-c-format
 msgid "Wrapping an <literal>AnnotatedType</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:257
 #, no-c-format
 msgid ""
 "One of the most interesting things that an extension class can do is process "
@@ -669,7 +350,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:262
 #, no-c-format
 msgid ""
 "Let's start with an example of an extension that provides support for the "
@@ -680,101 +360,7 @@
 "<literal>value()</literal> of the <literal>@Named</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:270
-#, no-c-format
-msgid ""
-"<![CDATA[public class QualifiedNameExtension implements Extension {\n"
-"\n"
-"    <X> void processAnnotatedType(@Observes ProcessAnnotatedType<X> pat) {\n"
-"\n"
-"        //wrap this to override the annotations of the class\n"
-"        final AnnotatedType<X> at = pat.getAnnotatedType();\n"
-"        \n"
-"        AnnotatedType<X> wrapped = new AnnotatedType<X>() {\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedConstructor<X>> getConstructors() {\n"
-"                return at.getConstructors();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedField<? super X>> getFields() {\n"
-"                return at.getFields();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<X> getJavaClass() {\n"
-"                return at.getJavaClass();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedMethod<? super X>> getMethods() {\n"
-"                return at.getMethods();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public <T extends Annotation> T getAnnotation(final Class<T> "
-"annType) {\n"
-"                if ( Named.class.equals(annType) ) {\n"
-"                    class NamedLiteral \n"
-"                            extends AnnotationLiteral<Named> \n"
-"                            implements Named {\n"
-"                        @Override\n"
-"                        public String value() {\n"
-"                            Package pkg = at.getClass().getPackage();\n"
-"                            String unqualifiedName = at.getAnnotation(Named."
-"class).value();\n"
-"                            final String qualifiedName;\n"
-"                            if ( pkg.isAnnotationPresent(Named.class) ) {\n"
-"                                qualifiedName = pkg.getAnnotation(Named."
-"class).value() \n"
-"                                      + '.' + unqualifiedName;\n"
-"                            }\n"
-"                            else {\n"
-"                                qualifiedName = unqualifiedName;\n"
-"                            }\n"
-"                            return qualifiedName;\n"
-"                        }\n"
-"                    }\n"
-"                    return (T) new NamedLiteral();\n"
-"                }\n"
-"                else {\n"
-"                    return at.getAnnotation(annType);\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getAnnotations() {\n"
-"                return at.getAnnotations();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Type getBaseType() {\n"
-"                return at.getBaseType();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypeClosure() {\n"
-"                return at.getTypeClosure();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annType) {\n"
-"                return at.isAnnotationPresent(annType);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pat.setAnnotatedType(wrapped);\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:272
 #, no-c-format
 msgid ""
 "Here's a second example, which adds the <literal>@Alternative</literal> "
@@ -782,41 +368,7 @@
 "literal> interface."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:277
-#, no-c-format
-msgid ""
-"<![CDATA[class ServiceAlternativeExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"   \n"
-"      final AnnotatedType<T> type = pat.getAnnotatedType();\n"
-"      \n"
-"      if ( Service.class.isAssignableFrom( type.getJavaClass() ) ) {\n"
-"      \n"
-"         //if the class implements Service, make it an @Alternative\n"
-"         AnnotatedType<T> wrapped = new AnnotatedType<T>() {\n"
-"         \n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annotationType) {\n"
-"               return annotationType.equals(Alternative.class) ? \n"
-"                  true : type.isAnnotationPresent(annotationType);\n"
-"            }\n"
-"            \n"
-"            //remaining methods of AnnotatedType\n"
-"            ...\n"
-"         }\n"
-"         \n"
-"         pat.setAnnotatedType(wrapped);\n"
-"      }\n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:283
 #, no-c-format
 msgid ""
 "The <literal>AnnotatedType</literal> is not the only thing that can be "
@@ -824,13 +376,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:288
 #, no-c-format
 msgid "Wrapping an <literal>InjectionTarget</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:290
 #, no-c-format
 msgid ""
 "The <literal>InjectionTarget</literal> interface exposes operations for "
@@ -842,7 +392,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:297
 #, no-c-format
 msgid ""
 "Here's a CDI portable extension that reads values from properties files and "
@@ -854,16 +403,7 @@
 "<literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:305
-#, no-c-format
-msgid ""
-"firstName=Gavin\n"
-"lastName=King"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:307
 #, no-c-format
 msgid ""
 "The portable extension works by wrapping the containers "
@@ -871,121 +411,7 @@
 "<literal>inject()</literal> method."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:310
-#, no-c-format
-msgid ""
-"<![CDATA[public class ConfigExtension implements Extension {\n"
-"\n"
-"        <X> void processInjectionTarget(@Observes ProcessInjectionTarget<X> "
-"pit) {\n"
-"                \n"
-"                //wrap this to intercept the component lifecycle\n"
-"            final InjectionTarget<X> it = pit.getInjectionTarget();\n"
-"            \n"
-"        final Map<Field, Object> configuredValues = new HashMap<Field, "
-"Object>();\n"
-"        \n"
-"        //use this to read annotations of the class and its members\n"
-"        AnnotatedType<X> at = pit.getAnnotatedType();\n"
-"        \n"
-"        //read the properties file\n"
-"        String propsFileName = at.getClass().getSimpleName() + \".properties"
-"\";\n"
-"        InputStream stream = at.getJavaClass().getResourceAsStream"
-"(propsFileName);\n"
-"        if (stream!=null) {\n"
-"            \n"
-"            try {\n"
-"                Properties props = new Properties();\n"
-"                props.load(stream);\n"
-"                for (Map.Entry<Object, Object> property : props.entrySet()) "
-"{\n"
-"                    String fieldName = property.getKey().toString();\n"
-"                    Object value = property.getValue();\n"
-"                    try {\n"
-"                        Field field = at.getJavaClass().getField"
-"(fieldName);\n"
-"                        field.setAccessible(true);\n"
-"                        if ( field.getType().isAssignableFrom( value.getClass"
-"() ) ) {\n"
-"                            configuredValues.put(field, value);\n"
-"                        }\n"
-"                        else {\n"
-"                            //TODO: do type conversion automatically\n"
-"                            pit.addDefinitionError( new InjectionException(\n"
-"                                   \"field is not of type String: \" + "
-"field ) );\n"
-"                        }\n"
-"                    }\n"
-"                    catch (NoSuchFieldException nsfe) {\n"
-"                        pit.addDefinitionError(nsfe);\n"
-"                    }\n"
-"                    finally {\n"
-"                        stream.close();\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"            catch (IOException ioe) {\n"
-"                pit.addDefinitionError(ioe);\n"
-"            }\n"
-"        }\n"
-"        \n"
-"        InjectionTarget<X> wrapped = new InjectionTarget<X>() {\n"
-"\n"
-"            @Override\n"
-"            public void inject(X instance, CreationalContext<X> ctx) {\n"
-"                it.inject(instance, ctx);\n"
-"                \n"
-"                //set the values onto the new instance of the component\n"
-"                for (Map.Entry<Field, Object> configuredValue: "
-"configuredValues.entrySet()) {\n"
-"                    try {\n"
-"                        configuredValue.getKey().set(instance, "
-"configuredValue.getValue());\n"
-"                    }\n"
-"                    catch (Exception e) {\n"
-"                        throw new InjectionException(e);\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void postConstruct(X instance) {\n"
-"                it.postConstruct(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void preDestroy(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void dispose(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public X produce(CreationalContext<X> ctx) {\n"
-"                return it.produce(ctx);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pit.setInjectionTarget(wrapped);\n"
-"        \n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:312
 #, no-c-format
 msgid ""
 "There's a lot more to the portable extension SPI than what we've discussed "
@@ -994,13 +420,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:320
 #, no-c-format
 msgid "The <literal>Context</literal> interface"
 msgstr "Das <literal>Context</literal>-Interface"
 
 #. Tag: para
-#: extend.xml:322
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Context</literal> interface supports addition of new scopes to "
@@ -1010,30 +434,7 @@
 "Geltungsbereiche zu Web Beans oder die Erweiterung eingebauter "
 "Geltungsbereiche zu neuen Umgebungen."
 
-#. Tag: programlisting
-#: extend.xml:327
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface Context {\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
-"creationalContext);\n"
-"   public <T> T get(Contextual<T> contextual);\n"
-"   boolean isActive();\n"
-"}]]>"
-msgstr ""
-"public interface Context {\n"
-"    \n"
-"    public Class&lt;? extends Annotation&gt; getScopeType();\n"
-"    \n"
-"    public &lt;T&gt; T get(Bean&lt;T&gt; bean, boolean create);\n"
-"    \n"
-"    boolean isActive();\n"
-"    \n"
-"}"
-
 #. Tag: para
-#: extend.xml:329
 #, fuzzy, no-c-format
 msgid ""
 "For example, we might implement <literal>Context</literal> to add a business "
@@ -1046,7 +447,31 @@
 "hinzuzufügen."
 
 #, fuzzy
+#~ msgid "@Inject BeanManager beanManager;"
+#~ msgstr "@Current Manager Manager"
+
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public interface Context {\n"
+#~ "   public Class<? extends Annotation> getScope();\n"
+#~ "   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
+#~ "creationalContext);\n"
+#~ "   public <T> T get(Contextual<T> contextual);\n"
+#~ "   boolean isActive();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "public interface Context {\n"
+#~ "    \n"
+#~ "    public Class&lt;? extends Annotation&gt; getScopeType();\n"
+#~ "    \n"
+#~ "    public &lt;T&gt; T get(Bean&lt;T&gt; bean, boolean create);\n"
+#~ "    \n"
+#~ "    boolean isActive();\n"
+#~ "    \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
 #~ "There are two subinterfaces of <literal>Bean</literal> defined by the CDI "
 #~ "specification: <literal>Interceptor</literal> and <literal>Decorator</"
 #~ "literal>."

Modified: doc/trunk/reference/de-DE/extensions.po
===================================================================
--- doc/trunk/reference/de-DE/extensions.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/extensions.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,25 +15,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: extensions.xml:8
 #, no-c-format
 msgid "CDI extensions available as part of Weld"
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:11
 #, no-c-format
 msgid "These modules are usable on any JSR-299 implementation, not just Weld!"
 msgstr ""
 
 #. Tag: title
-#: extensions.xml:17
 #, no-c-format
 msgid "Weld Logger"
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:19
 #, no-c-format
 msgid ""
 "Adding logging to your application is now even easier with simple injection "
@@ -42,26 +38,7 @@
 "will be injected into any instance of the bean."
 msgstr ""
 
-#. Tag: programlisting
-#: extensions.xml:25
-#, no-c-format
-msgid ""
-"<![CDATA[import org.slf4j.Logger;\n"
-"import javax.inject.Inject;\n"
-"\n"
-"public class Checkout {\n"
-"   private @Inject Logger log;\n"
-"\n"
-"   public void invoiceItems() {\n"
-"      ShoppingCart cart;\n"
-"      ...\n"
-"      log.debug(\"Items invoiced for {}\", cart);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extensions.xml:27
 #, no-c-format
 msgid ""
 "The example shows how objects can be interpolated into a message. If you use "
@@ -71,7 +48,6 @@
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:34
 #, no-c-format
 msgid ""
 "You can add Weld logging to your project by including weld-logger.jar, sl4j-"
@@ -81,7 +57,6 @@
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:39
 #, no-c-format
 msgid ""
 "If you are using Weld as your JSR-299 implementation, there's no need to "

Modified: doc/trunk/reference/de-DE/gettingstarted.po
===================================================================
--- doc/trunk/reference/de-DE/gettingstarted.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/gettingstarted.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: ri\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-27 15:36+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,27 +16,24 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: gettingstarted.xml:5
 #, no-c-format
 msgid "Getting started with Weld"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:7
 #, no-c-format
 msgid ""
 "Weld comes with two starter example applications, in addition to more "
 "specialized examples. The first, <literal>weld-numberguess</literal>, is a "
-"web (WAR) example containing only non-transactional managed beans. This "
+"web (war) example containing only non-transactional managed beans. This "
 "example can be run on a wide range of servers, including JBoss AS, "
 "GlassFish, Apache Tomcat, Jetty, Google App Engine, and any compliant Java "
 "EE 6 container. The second example, <literal>weld-translator</literal>, is "
-"an enterprise (EAR) example that contains session beans. This example must "
-"be run on JBoss AS 5.2, Glassfish 3.0 or any compliant Java EE 6 container."
+"an enterprise (ear) example that contains session beans. This example must "
+"be run on JBoss AS 6.0, Glassfish 3.0 or any compliant Java EE 6 container."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:16
 #, no-c-format
 msgid ""
 "Both examples use JSF 2.0 as the web framework and, as such, can be found in "
@@ -44,13 +41,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:22
 #, no-c-format
 msgid "Prerequisites"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:24
 #, no-c-format
 msgid ""
 "To run the examples with the provided build scripts, you'll need the "
@@ -58,58 +53,47 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:30
 #, fuzzy, no-c-format
 msgid "the latest release of Weld, which contains the examples"
 msgstr "die aktuellste Release der Web Beans RI,"
 
 #. Tag: para
-#: gettingstarted.xml:33
 #, no-c-format
 msgid "Ant 1.7.0, to build and deploy the examples"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:36
 #, no-c-format
 msgid "a supported runtime environment (minimum versions shown)"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:39
-#, no-c-format
-msgid ""
-"JBoss AS 5.2.0 (currently only nightly builds of JBoss AS 5.2.0.Beta1 are "
-"available),"
-msgstr ""
+#, fuzzy, no-c-format
+msgid "JBoss AS 6.0.0,"
+msgstr "JBoss AS 5.0.0.GA und"
 
 #. Tag: para
-#: gettingstarted.xml:42
 #, no-c-format
 msgid "GlassFish 3.0,"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:45
 #, no-c-format
-msgid "Apache Tomcat 6.0.x (WAR example only), or"
+msgid "Apache Tomcat 6.0.x (war example only), or"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:48
 #, no-c-format
-msgid "Jetty 6.1.x (WAR example only)"
+msgid "Jetty 6.1.x (war example only)"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:53
 #, no-c-format
 msgid ""
 "(optionally) Maven 2.x, to run the examples in an embedded servlet container"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:58
 #, no-c-format
 msgid ""
 "You'll need a full install of Ant 1.7.0. Some linux distributions only "
@@ -118,27 +102,24 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:64
 #, no-c-format
 msgid ""
 "In the next few sections, you'll be using the Ant command (<literal>ant</"
 "literal>) to invoke the Ant build script in each example to compile, "
-"assemble and deploy the example to JBoss AS and, for the WAR example, Apache "
-"Tomcat. You can also deploy the generated artifact (WAR or EAR) to any other "
+"assemble and deploy the example to JBoss AS and, for the war example, Apache "
+"Tomcat. You can also deploy the generated artifact (war or ear) to any other "
 "container that supports Java EE 6, such as GlassFish 3."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:71
 #, no-c-format
 msgid ""
 "If you have Maven installed, you can use the Maven command (<literal>mvn</"
-"literal>) to compile and assemble the standalone artifact (WAR or EAR) and, "
-"for the WAR example, run it in an embedded container."
+"literal>) to compile and assemble the standalone artifact (war or ear) and, "
+"for the war example, run it in an embedded container."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:76
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
@@ -146,28 +127,25 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:81
 #, no-c-format
 msgid "Deploying to JBoss AS"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:83
 #, no-c-format
 msgid ""
 "To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss."
-"org/jbossas/\">JBoss AS 5.2.0.Beta1</ulink> or above. If a release of the "
-"JBoss AS 5.2 line isn't yet available, you can download a <ulink url="
-"\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-5.x-sun16/"
-"\">nightly snapshot</ulink>. The reason JBoss AS 5.2.0.Beta1 or above is "
-"required is because it's the first release that has both CDI and Bean "
-"Validation support built-in, making it close enough to Java EE 6 to run the "
-"examples. The good news is that there are no additional modifications you "
-"have to make to the server. It's ready to go!"
+"org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS "
+"6.0 line isn't yet available, you can download a <ulink url=\"http://hudson."
+"jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</"
+"ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the "
+"first release that has both CDI and Bean Validation support built-in, making "
+"it close enough to Java EE 6 to run the examples. The good news is that "
+"there are no additional modifications you have to make to the server. It's "
+"ready to go!"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:92
 #, no-c-format
 msgid ""
 "After you have downloaded JBoss AS, extract it. (We recommended renaming the "
@@ -177,16 +155,7 @@
 "installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[$> unzip jboss-5.2.*.zip\n"
-"$> mv jboss-5.2.*/ jboss-as-5.2]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:101
 #, no-c-format
 msgid ""
 "In order for the build scripts to know where to deploy the example, you have "
@@ -197,74 +166,36 @@
 "<literal>jboss.home</literal>, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:108
-#, fuzzy, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
-msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
-
 #. Tag: para
-#: gettingstarted.xml:110
 #, fuzzy, no-c-format
 msgid "You're now ready to deploy your first example!"
 msgstr "Jetzt können Sie Ihr erstes Beispiel deployen!"
 
 #. Tag: para
-#: gettingstarted.xml:114
 #, no-c-format
 msgid ""
 "Switch to the <literal>examples/jsf/numberguess</literal> directory and "
 "execute the Ant <literal>deploy</literal> target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:119
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant deploy]]>"
-msgstr ""
-"$ cd examples/numberguess\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:121
 #, no-c-format
 msgid ""
 "If you haven't already, start JBoss AS. You can either start JBoss AS from a "
 "Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:125
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/jboss-as-5.2\n"
-"$> ./bin/run.sh]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:127 gettingstarted.xml:369
 #, no-c-format
 msgid "a Windows command window:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:131
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\jboss-as-5.2\\bin\n"
-"$> run]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:133 gettingstarted.xml:375
 #, no-c-format
 msgid "or you can start the server using an IDE, like Eclipse."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:138
 #, no-c-format
 msgid ""
 "If you are using Eclipse, you should seriously consider installing the "
@@ -274,7 +205,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:145
 #, fuzzy, no-c-format
 msgid ""
 "Wait a few seconds for the application to deploy (or the application server "
@@ -288,7 +218,6 @@
 "translator</ulink>)."
 
 #. Tag: para
-#: gettingstarted.xml:152
 #, no-c-format
 msgid ""
 "The Ant build script includes additional targets for JBoss AS to deploy and "
@@ -297,7 +226,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:158
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant restart</literal> - deploy the example in exploded format to "
@@ -307,7 +235,6 @@
 "Format"
 
 #. Tag: para
-#: gettingstarted.xml:163
 #, no-c-format
 msgid ""
 "<literal>ant explode</literal> - update an exploded example, without "
@@ -317,7 +244,6 @@
 "Beispiels ohne Neustart des Deployments"
 
 #. Tag: para
-#: gettingstarted.xml:168
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant deploy</literal> - deploy the example in compressed jar format "
@@ -327,19 +253,16 @@
 "jar-Format"
 
 #. Tag: para
-#: gettingstarted.xml:173
 #, fuzzy, no-c-format
 msgid "<literal>ant undeploy</literal> - remove the example from JBoss AS"
 msgstr "<literal>ant undeploy</literal> - das Beispiel vom Server entfernen"
 
 #. Tag: para
-#: gettingstarted.xml:178
 #, no-c-format
 msgid "<literal>ant clean</literal> - clean the example"
 msgstr "<literal>ant clean</literal> - Das Beispiel bereinigen"
 
 #. Tag: para
-#: gettingstarted.xml:185
 #, no-c-format
 msgid ""
 "The second starter example, <literal>weld-translator</literal>, will "
@@ -348,27 +271,15 @@
 "translator example directory and execute the deploy target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/translator\n"
-"$> ant deploy]]>"
-msgstr ""
-"$ cd examples/translator\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:194
 #, no-c-format
 msgid ""
 "The translator uses session beans, which are packaged in an EJB module "
-"within an EAR. Java EE 6 will allow session beans to be deployed in WAR "
+"within an ear. Java EE 6 will allow session beans to be deployed in war "
 "modules, but that's a topic for a later chapter."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:200
 #, fuzzy, no-c-format
 msgid ""
 "Again, wait a few seconds for the application to deploy (if you're really "
@@ -380,55 +291,32 @@
 "\"http://localhost:8080/webbeans-translator\">http://localhost:8080/webbeans-"
 "translator</ulink>)."
 
-#. Tag: para
-#: gettingstarted.xml:206
-#, no-c-format
-msgid ""
-"TODO Insert note about upgrading the Weld deployer that directs reader to "
-"section on the JBoss AS environment"
-msgstr ""
-
 #. Tag: title
-#: gettingstarted.xml:213
 #, no-c-format
 msgid "Deploying to GlassFish"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:215
 #, no-c-format
 msgid ""
-"Deploying to GlassFish should be easy, right? After all, it's the Java EE 6 "
-"reference implementation. Since it's the Java EE 6 reference implementation, "
-"that means it also bundles the JSR-299 reference implementation, Weld! So "
-"yes, it's very easy."
+"Deploying to GlassFish should be easy and familiar, right? After all, it's "
+"the Java EE 6 reference implementation and Weld is the JSR-299 reference "
+"implementation, meaning Weld gets bundled with GlassFish. So yes, it's all "
+"quite easy and familiar."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:221
 #, no-c-format
 msgid ""
 "To deploy the examples to GlassFish, you'll need the final <ulink url="
-"\"https://glassfish.dev.java.net/\">GlassFish V3</ulink> release (the "
-"preview release won't do). If the final release isn't yet available, you can "
-"download a <ulink url=\"http://download.java.net/glassfish/v3/promoted/"
-"\">promoted build</ulink> in the meantime. Select the b69 preview release or "
-"above that ends in either <literal>-unix.sh</literal> or <literal>-windows."
-"exe</literal> depending on your platform. After the download is complete, "
-"execute the installer. On Linux/Unix, you'll need to first make the script "
-"executable."
+"\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</"
+"ulink> release. Select the release that ends in either <literal>-unix.sh</"
+"literal> or <literal>-windows.exe</literal> depending on your platform. "
+"After the download is complete, execute the installer. On Linux/Unix, you'll "
+"need to first make the script executable."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:231
-#, no-c-format
-msgid ""
-"<![CDATA[$> chmod 755 glassfish-v3-b69-unix.sh\n"
-"$> ./glassfish-v3-b69-unix.sh]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:233
 #, no-c-format
 msgid ""
 "On Windows you can just click on the executable. Follow the instructions in "
@@ -439,7 +327,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:240
 #, no-c-format
 msgid ""
 "If you've deployed either of the starter examples, <literal>weld-"
@@ -448,16 +335,7 @@
 "either of the two directories and build it."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess (or examples/jsf/translator)\n"
-"$> ant package]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:248
 #, no-c-format
 msgid ""
 "The deployable archive for the <literal>weld-numberguess</literal>, named "
@@ -469,24 +347,17 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:255
 #, no-c-format
 msgid ""
-"You deploy applications to GlassFish using the <ulink url=\"http://"
-"localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin Console "
-"running, you need to start a GlassFish domain, in our case <literal>domain1</"
-"literal>. Switch to the <literal>bin</literal> folder in the directory where "
-"you installed GlassFish and execute the following command:"
+"One way to deploy applications to GlassFish is by using the <ulink url="
+"\"http://localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin "
+"Console running, you need to start a GlassFish domain, in our case "
+"<literal>domain1</literal>. Switch to the <literal>bin</literal> folder in "
+"the directory where you installed GlassFish and execute the following "
+"command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:262
-#, no-c-format
-msgid "<![CDATA[$> asadmin start-domain domain1]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:264
 #, no-c-format
 msgid ""
 "After a few seconds you can visit the Admin Console in the browser at the "
@@ -503,22 +374,26 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:276
 #, no-c-format
 msgid ""
+"Alternatively, you can deploy the application to GlassFish using the asadmin "
+"command:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The reason the same artifact can be deployed to both JBoss AS and GlassFish, "
 "without any modifications, is because all of the features being used are "
 "part of the standard platform. And what a capable platform it has become!"
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:285
 #, no-c-format
 msgid "Deploying to Apache Tomcat"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:287
 #, no-c-format
 msgid ""
 "Servlet containers are not required to support Java EE services like CDI. "
@@ -527,7 +402,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:291
 #, no-c-format
 msgid ""
 "Weld comes with a servlet listener which bootstraps the CDI environment, "
@@ -538,7 +412,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:297
 #, fuzzy, no-c-format
 msgid ""
 "Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll "
@@ -549,16 +422,7 @@
 "seamframework.org/Download\">seamframework.org</ulink> herunter und "
 "entzippen diese. Zum Beispiel "
 
-#. Tag: programlisting
-#: gettingstarted.xml:302
-#, fuzzy, no-c-format
-msgid "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
-msgstr ""
-"<![CDATA[$ cd /Applications\n"
-"$ unzip ~/jboss-5.0.0.GA.zip]]>"
-
 #. Tag: para
-#: gettingstarted.xml:304
 #, no-c-format
 msgid ""
 "You have two choices for how you can deploy the application to Tomcat. You "
@@ -569,13 +433,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:312
 #, no-c-format
 msgid "Deploying with Ant"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:314
 #, no-c-format
 msgid ""
 "In order for Ant to push the artifact to the Tomcat hot deploy directory, it "
@@ -586,38 +448,19 @@
 "property key <literal>tomcat.home</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:321
-#, fuzzy, no-c-format
-msgid "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
-msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
-
 #. Tag: para
-#: gettingstarted.xml:323
 #, fuzzy, no-c-format
 msgid "Now you're ready to deploy the numberguess example to Tomcat!"
 msgstr "Um das numberguess Beispiel zu deployen:"
 
 #. Tag: para
-#: gettingstarted.xml:327
 #, no-c-format
 msgid ""
 "Change to the <literal>examples/jsf/numberguess</literal> directory again "
 "and run the Ant <literal>deploy</literal> target for Tomcat:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:332
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant tomcat.deploy]]>"
-msgstr ""
-"$ cd examples/numberguess\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:335
 #, no-c-format
 msgid ""
 "The Ant build script includes additional targets for Tomcat to deploy and "
@@ -626,7 +469,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:341
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.restart</literal> - deploy the example in exploded "
@@ -636,7 +478,6 @@
 "Format"
 
 #. Tag: para
-#: gettingstarted.xml:346
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.explode</literal> - update an exploded example, without "
@@ -646,7 +487,6 @@
 "Beispiels ohne Neustart des Deployments"
 
 #. Tag: para
-#: gettingstarted.xml:351
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.deploy</literal> - deploy the example in compressed jar "
@@ -656,39 +496,18 @@
 "jar-Format"
 
 #. Tag: para
-#: gettingstarted.xml:356
 #, fuzzy, no-c-format
 msgid "<literal>ant tomcat.undeploy</literal> - remove the example from Tomcat"
 msgstr "<literal>ant undeploy</literal> - das Beispiel vom Server entfernen"
 
 #. Tag: para
-#: gettingstarted.xml:363
 #, no-c-format
 msgid ""
 "If you haven't already, start Tomcat. You can either start Tomcat from a "
 "Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:367
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/apache-tomcat-6\n"
-"$> ./bin/start.sh]]>"
-msgstr "$ /Application/jboss-5.0.0.GA/bin/run.sh"
-
-#. Tag: programlisting
-#: gettingstarted.xml:373
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
-"$> start]]>"
-msgstr ""
-"<![CDATA[$ cd /Applications\n"
-"$ unzip ~/jboss-5.0.0.GA.zip]]>"
-
 #. Tag: para
-#: gettingstarted.xml:379
 #, no-c-format
 msgid ""
 "Wait a few seconds for the application to deploy (or the application server "
@@ -699,13 +518,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:388
 #, no-c-format
 msgid "Deploying with Maven"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:390
 #, no-c-format
 msgid ""
 "You can also deploy the application to Tomcat using Maven. This section is a "
@@ -715,7 +532,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:396
 #, no-c-format
 msgid ""
 "The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
@@ -727,7 +543,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:403
 #, no-c-format
 msgid ""
 "To allow Maven to communicate with Tomcat over HTTP, edit the <literal>conf/"
@@ -735,41 +550,20 @@
 "following line:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:408
-#, no-c-format
-msgid "<![CDATA[<user username=\"admin\" password=\"\" roles=\"manager\"/>]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:410
 #, no-c-format
 msgid ""
 "Restart Tomcat. You can now deploy the application to Tomcat with Maven "
 "using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:414
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:exploded tomcat:exploded -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:416
 #, no-c-format
 msgid ""
 "Once the application is deployed, you can redeploy it using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:420
-#, no-c-format
-msgid "<![CDATA[$> mvn tomcat:redeploy -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:422
 #, no-c-format
 msgid ""
 "The <literal>-Ptomcat</literal> argument activates the <literal>tomcat</"
@@ -778,21 +572,13 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:427
 #, no-c-format
 msgid ""
 "Rather than shipping the container off to a standalone Tomcat installation, "
 "you can also execute the application in an embedded Tomcat 6 container:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:432
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace tomcat:run -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:434
 #, no-c-format
 msgid ""
 "The advantage of using the embedded server is that changes to assets in "
@@ -802,14 +588,7 @@
 "classpath resource, you need to execute a build:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:441
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:443
 #, no-c-format
 msgid ""
 "There are several other Maven goals that you can use if you are hacking on "
@@ -818,13 +597,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:453
 #, no-c-format
 msgid "Deploying to Jetty"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:457
 #, no-c-format
 msgid ""
 "Support for Jetty in the examples is a more recent addition. Since Jetty is "
@@ -835,7 +612,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:464
 #, no-c-format
 msgid ""
 "If you've read through the entire Tomcat section, then you're all ready to "
@@ -845,7 +621,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:470
 #, no-c-format
 msgid ""
 "The Maven POM (<literal>pom.xml</literal>) includes a profile named "
@@ -857,25 +632,15 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:479
 #, no-c-format
 msgid ""
 "To run the <literal>weld-numberguess</literal> example on Jetty, switch to "
 "the example directory and execute the <literal>inplace</literal> goal of the "
-"Maven WAR plugin followed by the <literal>run</literal> goal of the Maven "
+"Maven war plugin followed by the <literal>run</literal> goal of the Maven "
 "Jetty plugin with the <literal>jetty</literal> profile enabled, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:485
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> mvn war:inplace jetty:run -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:487
 #, no-c-format
 msgid ""
 "The log output of Jetty will be shown in the console. Once Jetty reports "
@@ -886,7 +651,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:494
 #, no-c-format
 msgid ""
 "Any changes to assets in <literal>src/main/webapp</literal> take effect "
@@ -894,30 +658,22 @@
 "application may automatically redeploy. The redeploy behavior can be fined-"
 "tuned in the plugin configuration. If you make a change to a classpath "
 "resource, you need to execute a build and the <literal>inplace</literal> "
-"goal of the Maven WAR plugin, again with the <literal>jetty</literal> "
+"goal of the Maven war plugin, again with the <literal>jetty</literal> "
 "profile enabled."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:501
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:503
 #, no-c-format
 msgid ""
-"The <literal>war:inplace</literal> goal copies the compiled classes and JARs "
+"The <literal>war:inplace</literal> goal copies the compiled classes and jars "
 "inside <literal>src/main/webapp</literal>, under <literal>WEB-INF/classes</"
 "literal> and <literal>WEB-INF/lib</literal>, respectively, mixing source and "
 "compiled files. However, the build does work around these temporary files by "
-"excluding them from the packaged WAR and cleaning them during the Maven "
+"excluding them from the packaged war and cleaning them during the Maven "
 "clean phase."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:510
 #, no-c-format
 msgid ""
 "You have two options if you want to run the example on Jetty from the IDE. "
@@ -927,33 +683,18 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:516
 #, no-c-format
 msgid "First, initialize the Eclipse project:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:520
-#, no-c-format
-msgid "<![CDATA[$> mvn clean eclipse:clean eclipse:eclipse -Pjetty-ide]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:522
 #, no-c-format
 msgid ""
 "Next, assemble all the necessary resources under <literal>src/main/webapp</"
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:526
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace -Pjetty-ide]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:528
 #, no-c-format
 msgid ""
 "Now, you are ready to run the server in Eclipse. Import the project into "
@@ -966,7 +707,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:536
 #, no-c-format
 msgid ""
 "Now that you have gotten the starter applications deployed on the server of "
@@ -975,7 +715,59 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
+
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> ant deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/numberguess\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/translator\n"
+#~ "$> ant deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/translator\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
+#~ msgstr ""
+#~ "<![CDATA[$ cd /Applications\n"
+#~ "$ unzip ~/jboss-5.0.0.GA.zip]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> ant tomcat.deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/numberguess\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd /path/to/apache-tomcat-6\n"
+#~ "$> ./bin/start.sh]]>"
+#~ msgstr "$ /Application/jboss-5.0.0.GA/bin/run.sh"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
+#~ "$> start]]>"
+#~ msgstr ""
+#~ "<![CDATA[$ cd /Applications\n"
+#~ "$ unzip ~/jboss-5.0.0.GA.zip]]>"
+
+#, fuzzy
+#~ msgid ""
 #~ "Getting started with Web Beans, the Reference Implementation of JSR-299"
 #~ msgstr "Die Web Beans Referenzimplementierung"
 
@@ -1008,10 +800,6 @@
 #~ "ear-Beispiel, dasEnterprise Beans enthält. Um Beispiele auszuführen "
 #~ "benötigen Sie folgendes:"
 
-#, fuzzy
-#~ msgid "JBoss AS 5.0.1.GA, or"
-#~ msgstr "JBoss AS 5.0.0.GA und"
-
 #~ msgid "Ant 1.7.0."
 #~ msgstr "Ant 1.7.0."
 

Modified: doc/trunk/reference/de-DE/injection.po
===================================================================
--- doc/trunk/reference/de-DE/injection.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/injection.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: injection\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-15 15:56+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,28 +16,24 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: injection.xml:4
 #, fuzzy, no-c-format
 msgid "Dependency injection and programmatic lookup"
 msgstr "Dependency-Einspeisung"
 
 #. Tag: para
-#: injection.xml:6
 #, no-c-format
 msgid ""
-"One of the most significant features of CDI&#8212;certainly the most "
-"recognized&#8212;is dependency injection; excuse me, <emphasis>typesafe</"
-"emphasis> dependency injection."
+"One of the most significant features of CDI—certainly the most recognized—is "
+"dependency injection; excuse me, <emphasis>typesafe</emphasis> dependency "
+"injection."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:12
 #, no-c-format
 msgid "Injection points"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:14
 #, no-c-format
 msgid ""
 "The <literal>@Inject</literal> annotation lets us define an injection point "
@@ -46,77 +42,21 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:19
 #, fuzzy, no-c-format
 msgid "<emphasis>Bean constructor</emphasis> parameter injection:"
 msgstr "<emphasis>Initializer</emphasis>-Methode Parameter-Einspeisung:"
 
-#. Tag: programlisting
-#: injection.xml:23
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private final ShoppingCart cart;\n"
-"    \n"
-"   @Inject\n"
-"   public Checkout(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"    private final ShoppingCart cart;\n"
-"    \n"
-"    @Initializer\n"
-"    public Checkout(ShoppingCart cart) {\n"
-"        this.cart = cart;\n"
-"    }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:26
 #, no-c-format
 msgid "A bean can only have one injectable constructor."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:31
 #, fuzzy, no-c-format
 msgid "<emphasis>Initializer method</emphasis> parameter injection:"
 msgstr "<emphasis>Initializer</emphasis>-Methode Parameter-Einspeisung:"
 
-#. Tag: programlisting
-#: injection.xml:35
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private ShoppingCart cart;\n"
-"\n"
-"   @Inject\n"
-"   void setShoppingCart(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"    private ShoppingCart cart;\n"
-"\n"
-"    @Initializer \n"
-"    void setShoppingCart(ShoppingCart cart) {\n"
-"        this.cart = cart;\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:38
 #, no-c-format
 msgid ""
 "A bean can have multiple initializer methods. If the bean is a session bean, "
@@ -125,29 +65,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:44
 #, no-c-format
 msgid "And direct field injection:"
 msgstr "Und direkte Feldeinspeisung:"
 
-#. Tag: programlisting
-#: injection.xml:48
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"   private @Inject ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"    private @Current ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:51
 #, no-c-format
 msgid ""
 "Getter and setter methods are not required for field injection to work "
@@ -155,7 +77,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:56
 #, fuzzy, no-c-format
 msgid ""
 "Dependency injection always occurs when the bean instance is first "
@@ -166,7 +87,6 @@
 "Bean Instanz statt."
 
 #. Tag: para
-#: injection.xml:63
 #, fuzzy, no-c-format
 msgid ""
 "First, the container calls the bean constructor (the default constructor or "
@@ -177,7 +97,6 @@
 "Instanz des Web Beans zu erhalten."
 
 #. Tag: para
-#: injection.xml:69
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container initializes the values of all injected fields of the "
@@ -187,7 +106,6 @@
 "eingespeisten Felder des Web Beans."
 
 #. Tag: para
-#: injection.xml:74
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container calls all initializer methods of bean (the call order is "
@@ -197,7 +115,6 @@
 "Beans auf."
 
 #. Tag: para
-#: injection.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "Finally, the <literal>@PostConstruct</literal> method, if any, is called."
@@ -206,7 +123,6 @@
 "falls vorhanden, aufgerufen."
 
 #. Tag: para
-#: injection.xml:86
 #, no-c-format
 msgid ""
 "(The only complication is that the container might call initializer methods "
@@ -215,7 +131,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:90
 #, no-c-format
 msgid ""
 "One major advantage of constructor injection is that it allows the bean to "
@@ -223,7 +138,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:95
 #, no-c-format
 msgid ""
 "CDI also supports parameter injection for some other methods that are "
@@ -231,36 +145,21 @@
 "producer methods:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:100
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:102
 #, no-c-format
 msgid ""
 "This is a case where the <literal>@Inject</literal> annotation <emphasis>is "
 "not</emphasis> required at the injection point. The same is true for "
-"observer methods (which we'll meet in <xref linkend=\"events\"/>) and "
+"observer methods (which we'll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:110
 #, no-c-format
 msgid "What gets injected"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:112
 #, fuzzy, no-c-format
 msgid ""
 "The CDI specification defines a procedure, called <emphasis>typesafe "
@@ -284,7 +183,6 @@
 "<literal>AmbiguousDependencyException</literal>."
 
 #. Tag: para
-#: injection.xml:120
 #, fuzzy, no-c-format
 msgid ""
 "The purpose of this algorithm is to allow multiple beans to implement the "
@@ -294,7 +192,6 @@
 "desselben API-Typs zu gestatten und entweder:"
 
 #. Tag: para
-#: injection.xml:126
 #, fuzzy, no-c-format
 msgid ""
 "allow the client to select which implementation it requires using a "
@@ -304,7 +201,6 @@
 "auszuwählen, welche Implemetierung er benötigt, "
 
 #. Tag: para
-#: injection.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "allow the application deployer to select which implementation is appropriate "
@@ -317,13 +213,11 @@
 "zu Änderungen am Client kommt oder "
 
 #. Tag: para
-#: injection.xml:137
 #, no-c-format
 msgid "allow the beans to be isolated into separate modules."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:143
 #, no-c-format
 msgid ""
 "Obviously, if you have exactly one bean of a given type, and an injection "
@@ -333,7 +227,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:149
 #, no-c-format
 msgid ""
 "But then, things start to get complicated. Let's explore how the container "
@@ -342,13 +235,11 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:157
 #, fuzzy, no-c-format
 msgid "Qualifier annotations"
 msgstr "Binding-Annotationen"
 
 #. Tag: para
-#: injection.xml:159
 #, fuzzy, no-c-format
 msgid ""
 "If we have more than one bean that implements a particular bean type, the "
@@ -361,36 +252,7 @@
 "Bean eingespeist wird mittels Binding-Annotation. Zum Beispiel können zwei "
 "Implementierungen von <literal>PaymentProcessor</literal> vorhanden sein:"
 
-#. Tag: programlisting
-#: injection.xml:165
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Synchronous\n"
-"public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: injection.xml:167
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Asynchronous\n"
-"public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:169
 #, fuzzy, no-c-format
 msgid ""
 "Where <literal>@Synchronous</literal> and <literal>@Asynchronous</literal> "
@@ -399,36 +261,7 @@
 "Wo <literal>@PayByCheque</literal> und <literal>@PayByCreditCard</literal> "
 "Binding-Annotationen sind:"
 
-#. Tag: programlisting
-#: injection.xml:173
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Synchronous {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayByCheque {}]]>"
-
-#. Tag: programlisting
-#: injection.xml:175
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Asynchronous {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayByCheque {}]]>"
-
 #. Tag: para
-#: injection.xml:177
 #, fuzzy, no-c-format
 msgid ""
 "A client bean developer uses the qualifier annotation to specify exactly "
@@ -438,76 +271,21 @@
 "festzulegen, welches Web Bean eingespeist werden sollte."
 
 #. Tag: para
-#: injection.xml:181
 #, no-c-format
 msgid "Using field injection:"
 msgstr "Verwendung der Feldeinspeisung:"
 
-#. Tag: programlisting
-#: injection.xml:183
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
-"@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@PayByCheque PaymentProcessor chequePaymentProcessor;\n"
-"@PayByCreditCard PaymentProcessor creditCardPaymentProcessor;]]>"
-
 #. Tag: para
-#: injection.xml:185
 #, no-c-format
 msgid "Using initializer method injection:"
 msgstr "Verwendung der Initialisierermethoden-Einspeisung:"
 
-#. Tag: programlisting
-#: injection.xml:187
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public void setPaymentProcessors(@Synchronous PaymentProcessor "
-"syncPaymentProcessor, \n"
-"                                 @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public void setPaymentProcessors(@PayByCheque PaymentProcessor "
-"chequePaymentProcessor, \n"
-"                                 @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:189
 #, fuzzy, no-c-format
 msgid "Using constructor injection:"
 msgstr "Oder Verwendung der Konstruktoreinspeisung:"
 
-#. Tag: programlisting
-#: injection.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
-"                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public Checkout(@PayByCheque PaymentProcessor chequePaymentProcessor, \n"
-"                @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:193
 #, no-c-format
 msgid ""
 "Qualifier annotations can also qualify method arguments of producer, "
@@ -516,29 +294,7 @@
 "runtime based on the state of the system:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:199
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces\n"
-"PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
-"syncPaymentProcessor,\n"
-"                                     @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   return isSynchronous() ? syncPaymentProcessor : asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public void setPaymentProcessors(@PayByCheque PaymentProcessor "
-"chequePaymentProcessor, \n"
-"                                 @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:201
 #, no-c-format
 msgid ""
 "If an injected field or a parameter of a bean constructor or initializer "
@@ -547,7 +303,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:206
 #, no-c-format
 msgid ""
 "Now, you may be thinking, <emphasis>\"What's the different between using a "
@@ -559,7 +314,6 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:216
 #, fuzzy, no-c-format
 msgid ""
 "The built-in qualifiers <literal>@Default</literal> and <literal>@Any</"
@@ -569,7 +323,6 @@
 "und <literal>@PreDestroy</literal> Callbacks."
 
 #. Tag: para
-#: injection.xml:218
 #, no-c-format
 msgid ""
 "Whenever a bean or injection point does not explicitly declare a qualifier, "
@@ -582,33 +335,18 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:225
 #, no-c-format
 msgid ""
 "This is especially useful if you want to iterate over all beans with a "
 "certain bean type. For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:226
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject \n"
-"void initServices(@Any Instance<Service> services) { \n"
-"   for (Service service: services) {\n"
-"      service.init();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:232
 #, no-c-format
 msgid "Qualifiers with members"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:234
 #, no-c-format
 msgid ""
 "Java annotations can have members. We can use annotation members to further "
@@ -618,41 +356,13 @@
 "single annotation with a member:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:240
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayBy {\n"
-"    PaymentType value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:242
 #, no-c-format
 msgid ""
 "Then we select one of the possible member values when appling the qualifier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:246
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:248
 #, fuzzy, no-c-format
 msgid ""
 "We can force the container to ignore a member of a qualifier type by "
@@ -662,49 +372,18 @@
 "Annotationstyps zu ignorieren, indem Sie das Mitglied mit "
 "<literal>@NonBinding</literal> annotieren."
 
-#. Tag: programlisting
-#: injection.xml:253
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"   @Nonbinding String comment() default \"\";\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @NonBinding public String value();\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:258
 #, no-c-format
 msgid "Multiple qualifiers"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:260
 #, fuzzy, no-c-format
 msgid "An injection point may specify multiple qualifiers:"
 msgstr ""
 "Ein Einspeisungspunkt kann sogar mehrere Binding-Annotationen festlegen:"
 
-#. Tag: programlisting
-#: injection.xml:264
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
-"syncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:266
 #, fuzzy, no-c-format
 msgid ""
 "Then only a bean which has <emphasis>both</emphasis> qualifier annotations "
@@ -713,29 +392,12 @@
 "In diesem Fall würde nur ein Web Bean mit <emphasis>beiden</emphasis> "
 "Binding-Annotationen eingespeist."
 
-#. Tag: programlisting
-#: injection.xml:271
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Synchronous @Reliable\n"
-"public class SynchronousReliablePaymentProcessor implements PaymentProcessor "
-"{\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:276
 #, no-c-format
 msgid "Alternatives"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:278
 #, no-c-format
 msgid ""
 "Alternatives are beans whose implementation is specific to a particular "
@@ -744,22 +406,7 @@
 "<literal>@Asynchronous PaymentProcessor</literal>, all in one:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:282
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Synchronous @Asynchronous\n"
-"public class MockPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:284
 #, no-c-format
 msgid ""
 "By default, <literal>@Alternative</literal> beans are disabled. We need to "
@@ -768,24 +415,7 @@
 "and injection. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:290
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <class>org.mycompany.mock.MockPaymentProcessor</class>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:292
 #, no-c-format
 msgid ""
 "When an ambiguous dependency exists at an injection point, the container "
@@ -795,13 +425,11 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:301
 #, fuzzy, no-c-format
 msgid "Fixing unsatisfied and ambiguous dependencies"
 msgstr "Unbefriedigende Abhängigkeiten beheben"
 
 #. Tag: para
-#: injection.xml:303
 #, fuzzy, no-c-format
 msgid ""
 "The typesafe resolution algorithm fails when, after considering the "
@@ -817,7 +445,6 @@
 "nicht dazu in der Lage ist, ein einzuspeisendes Web Bean zu identifizieren."
 
 #. Tag: para
-#: injection.xml:310
 #, no-c-format
 msgid ""
 "During the course of your development, you're going to encounter this "
@@ -825,13 +452,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:314
 #, no-c-format
 msgid "To fix an <emphasis>unsatisfied dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:320
 #, no-c-format
 msgid ""
 "create a bean which implements the bean type and has all the qualifier types "
@@ -839,7 +464,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:325
 #, no-c-format
 msgid ""
 "make sure that the bean you already have is in the classpath of the module "
@@ -847,7 +471,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:330
 #, no-c-format
 msgid ""
 "explicitly enable an <literal>@Alternative</literal> bean that implements "
@@ -856,13 +479,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:337
 #, no-c-format
 msgid "To fix an <emphasis>ambiguous dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:343
 #, no-c-format
 msgid ""
 "introduce a qualifier to distinguish between the two implementations of the "
@@ -870,14 +491,12 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:348
 #, no-c-format
 msgid ""
 "disable one of the beans by annotating it <literal>@Alternative</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:353
 #, no-c-format
 msgid ""
 "move one of the implementations to a module that is not in the classpath of "
@@ -885,7 +504,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:359
 #, no-c-format
 msgid ""
 "disable one of two <literal>@Alternative</literal> beans that are trying to "
@@ -893,7 +511,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:366
 #, no-c-format
 msgid ""
 "See <ulink url=\"http://sfwk.org/Documentation/"
@@ -904,22 +521,19 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:374
 #, no-c-format
 msgid "Just remember: \"There can be only one.\""
 msgstr ""
 
 #. Tag: para
-#: injection.xml:377
 #, no-c-format
 msgid ""
 "On the other hand, if you really do have an optional or multivalued "
 "injection point, you should change the type of your injection point to "
-"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\"/>."
+"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:382
 #, fuzzy, no-c-format
 msgid ""
 "Now there's one more issue you need to be aware of when using the dependency "
@@ -929,13 +543,11 @@
 "\"Dependency\"-Einspeisung in Web Beans gewahr sein sollte."
 
 #. Tag: title
-#: injection.xml:389
 #, no-c-format
 msgid "Client proxies"
 msgstr "Client-Proxies"
 
 #. Tag: para
-#: injection.xml:391
 #, fuzzy, no-c-format
 msgid ""
 "Clients of an injected bean do not usually hold a direct reference to a bean "
@@ -946,13 +558,12 @@
 "Verweis an eine Web Bean Instanz."
 
 #. Tag: para
-#: injection.xml:396
 #, fuzzy, no-c-format
 msgid ""
 "Imagine that a bean bound to the application scope held a direct reference "
 "to a bean bound to the request scope. The application-scoped bean is shared "
 "between many different requests. However, each request should see a "
-"different instance of the request scoped bean&#8212;the current one!"
+"different instance of the request scoped bean—the current one!"
 msgstr ""
 "Stellen wir uns vor, ein an den Geltungsbereich der Anwendung gebundenes Web "
 "Bean hielte einen direkten Verweis auf ein an den Geltungsbereich der "
@@ -962,7 +573,6 @@
 "Anfrage gebundenen Web Beans sehen!"
 
 #. Tag: para
-#: injection.xml:402
 #, fuzzy, no-c-format
 msgid ""
 "Now imagine that a bean bound to the session scope holds a direct reference "
@@ -981,7 +591,6 @@
 "serialisiert werden!"
 
 #. Tag: para
-#: injection.xml:409
 #, fuzzy, no-c-format
 msgid ""
 "Therefore, unless a bean has the default scope <literal>@Dependent</"
@@ -1003,7 +612,6 @@
 "dassrekursiv andere eingespeiste Web Beans serialisiert werden."
 
 #. Tag: para
-#: injection.xml:417
 #, fuzzy, no-c-format
 msgid ""
 "Unfortunately, due to limitations of the Java language, some Java types "
@@ -1018,7 +626,6 @@
 "Einspeisungspunkts nicht geproxiet werden kann."
 
 #. Tag: para
-#: injection.xml:423
 #, fuzzy, no-c-format
 msgid "The following Java types cannot be proxied by the container:"
 msgstr ""
@@ -1026,7 +633,6 @@
 "werden:"
 
 #. Tag: para
-#: injection.xml:427
 #, fuzzy, no-c-format
 msgid ""
 "classes which don't have a non-private constructor with no parameters, and"
@@ -1034,7 +640,6 @@
 "Klassen, die keinen nicht-privaten Konstruktor ohne Parameter besitzen sowie "
 
 #. Tag: para
-#: injection.xml:430
 #, no-c-format
 msgid ""
 "classes which are declared <literal>final</literal> or have a "
@@ -1044,13 +649,11 @@
 "<literal>final</literal>-Methode besitzen,"
 
 #. Tag: para
-#: injection.xml:435
 #, no-c-format
 msgid "arrays and primitive types."
 msgstr "Arrays und primitive Typen."
 
 #. Tag: para
-#: injection.xml:439
 #, no-c-format
 msgid ""
 "It's usually very easy to fix an unproxyable dependency problem. If an "
@@ -1059,13 +662,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:446
 #, no-c-format
 msgid "add a constructor with no parameters to <literal>X</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:451
 #, no-c-format
 msgid ""
 "change the type of the injection point to <literal>Instance&lt;X&gt;</"
@@ -1073,7 +674,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:456
 #, no-c-format
 msgid ""
 "introduce an interface <literal>Y</literal>, implemented by the injected "
@@ -1081,7 +681,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:462
 #, no-c-format
 msgid ""
 "if all else fails, change the scope of the injected bean to "
@@ -1089,7 +688,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:469
 #, no-c-format
 msgid ""
 "A future release of Weld will likely support a non-standard workaround for "
@@ -1097,7 +695,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:476
 #, no-c-format
 msgid ""
 "Sun, IcedTea, Mac: <literal>Unsafe.allocateInstance()</literal> (The most "
@@ -1105,7 +702,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:481
 #, no-c-format
 msgid ""
 "IBM, JRockit: <literal>ReflectionFactory.newConstructorForSerialization()</"
@@ -1113,19 +709,16 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:487
 #, no-c-format
 msgid "But we didn't get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:496
 #, fuzzy, no-c-format
 msgid "Obtaining a contextual instance by programmatic lookup"
 msgstr "Erhalt eines Web Beans durch programmatsichen \"Lookup\""
 
 #. Tag: para
-#: injection.xml:498
 #, no-c-format
 msgid ""
 "In certain situations, injection is not the most convenient way to obtain a "
@@ -1133,13 +726,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:505
 #, no-c-format
 msgid "the bean type or qualifiers vary dynamically at runtime, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:510
 #, no-c-format
 msgid ""
 "depending upon the deployment, there may be no bean which satisfies the type "
@@ -1147,13 +738,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:515
 #, no-c-format
 msgid "we would like to iterate over all beans of a certain type."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:521
 #, fuzzy, no-c-format
 msgid ""
 "In these situations, the application may obtain an instance of the interface "
@@ -1162,14 +751,7 @@
 "Die Anwendung kann durch Einspeisung eine Instanz des Interface "
 "<literal>Manager</literal> erhalten:"
 
-#. Tag: programlisting
-#: injection.xml:526
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:528
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>get()</literal> method of <literal>Instance</literal> produces "
@@ -1178,26 +760,17 @@
 "<literal>@Mock</literal> und <literal>@Staging</literal> Deployment-Typen zu "
 "Testzwecken "
 
-#. Tag: programlisting
-#: injection.xml:532
-#, fuzzy, no-c-format
-msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:534
 #, no-c-format
 msgid "Qualifiers can be specified in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:540
 #, no-c-format
 msgid "by annotating the <literal>Instance</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:543
 #, fuzzy, no-c-format
 msgid ""
 "by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
@@ -1207,22 +780,11 @@
 "und <literal>@PreDestroy</literal> Callbacks."
 
 #. Tag: para
-#: injection.xml:547
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is much, much easier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:551
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
-"paymentProcessorSource;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:553
 #, no-c-format
 msgid ""
 "Now, the <literal>PaymentProcessor</literal> returned by <literal>get()</"
@@ -1230,7 +792,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:558
 #, no-c-format
 msgid ""
 "Alternatively, we can specify the qualifier dynamically. First, we add the "
@@ -1238,15 +799,7 @@
 "default qualifier. (All beans have the qualifier <literal>@Any</literal>.)"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:563
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:565
 #, no-c-format
 msgid ""
 "Next, we need to obtain an instance of our qualifier type. Since annotatons "
@@ -1256,68 +809,30 @@
 "subclassing the helper class <literal>AnnotationLiteral</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:572
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[abstract class AsynchronousQualifier\n"
-"extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
-msgstr ""
-"<![CDATA[abstract class CreditCardBinding \n"
-"    extends AnnotationLiteral<CreditCard> \n"
-"    implements CreditCard {}]]>"
-
 #. Tag: para
-#: injection.xml:574
 #, no-c-format
 msgid "In some cases, we can use an anonymous class:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:578
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
-"   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
-msgstr ""
-"<![CDATA[PaymentProcessor p = manager.getInstanceByType(PaymentProcessor."
-"class, \n"
-"                                               new "
-"AnnotationLiteral<CreditCard>(){});]]>"
-
 #. Tag: para
-#: injection.xml:581
 #, no-c-format
 msgid ""
 "We can't use an anonymous class to implement a qualifier type with members."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:586
 #, no-c-format
 msgid ""
 "Now, finally, we can pass the qualifier to the <literal>select()</literal> "
 "method of <literal>Instance</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:590
-#, no-c-format
-msgid ""
-"<![CDATA[Annotation qualifier = synchronously ?\n"
-"      new SynchronousQualifier() : new AsynchronousQualifier();\n"
-"PaymentProcessor p = anyPaymentProcessor.select(qualifier).get().process"
-"(payment);]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:595
 #, no-c-format
 msgid "The <literal>InjectionPoint</literal> object"
 msgstr "Das <literal>InjectionPoint</literal>-Objekt"
 
 #. Tag: para
-#: injection.xml:597
 #, fuzzy, no-c-format
 msgid ""
 "There are certain kinds of dependent objects (beans with scope "
@@ -1331,7 +846,6 @@
 "müssen, um ihre Aufgabe zu erledigen. Zum Beispiel: "
 
 #. Tag: para
-#: injection.xml:603
 #, no-c-format
 msgid ""
 "The log category for a <literal>Logger</literal> depends upon the class of "
@@ -1341,7 +855,6 @@
 "Klasse des sie besitzenden Objekts ab."
 
 #. Tag: para
-#: injection.xml:607
 #, no-c-format
 msgid ""
 "Injection of a HTTP parameter or header value depends upon what parameter or "
@@ -1351,7 +864,6 @@
 "welcher Parameter oder Header-Name am Einspeisungspunkt festgelegt wurde."
 
 #. Tag: para
-#: injection.xml:611
 #, no-c-format
 msgid ""
 "Injection of the result of an EL expression evaluation depends upon the "
@@ -1361,7 +873,6 @@
 "Einspeisungspunkt festgelegten Ausdruck ab."
 
 #. Tag: para
-#: injection.xml:616
 #, fuzzy, no-c-format
 msgid ""
 "A bean with scope <literal>@Dependent</literal> may inject an instance of "
@@ -1373,7 +884,6 @@
 "zugreifen, die mit dem zugehörigen Einspeisungspunkt zu tun haben."
 
 #. Tag: para
-#: injection.xml:620
 #, no-c-format
 msgid ""
 "Let's look at an example. The following code is verbose, and vulnerable to "
@@ -1382,14 +892,7 @@
 "Sehen wir uns ein Beispiel an. Der folgende Code ist umfangreich und "
 "empfänglich für Refaktorierungsprobleme:"
 
-#. Tag: programlisting
-#: injection.xml:623
-#, no-c-format
-msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-msgstr "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-
 #. Tag: para
-#: injection.xml:625
 #, no-c-format
 msgid ""
 "This clever little producer method lets you inject a JDK <literal>Logger</"
@@ -1399,42 +902,12 @@
 "<literal>Logger</literal>, ohne dass explizit eine Protokollkategorie "
 "festgelegt werden müsste:"
 
-#. Tag: programlisting
-#: injection.xml:628
-#, no-c-format
-msgid ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:630
 #, no-c-format
 msgid "We can now write:"
 msgstr "Wir können jetzt schreiben:"
 
-#. Tag: programlisting
-#: injection.xml:632
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject Logger log;]]>"
-msgstr "<![CDATA[@Current Logger log;]]>"
-
 #. Tag: para
-#: injection.xml:634
 #, fuzzy, no-c-format
 msgid ""
 "Not convinced? Then here's a second example. To inject HTTP parameters, we "
@@ -1444,73 +917,18 @@
 "Beispiel an. Zur Einspeisung von HTTP-Parametern müssen wir einen Binding-"
 "Typ festlegen:"
 
-#. Tag: programlisting
-#: injection.xml:637
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @Nonbinding public String value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @NonBinding public String value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:639
 #, fuzzy, no-c-format
 msgid "We would use this qualifier type at injection points as follows:"
 msgstr ""
 "Wir würden diesen Binding-Typ an Einspeisungspunkten wie folgt verwenden:"
 
-#. Tag: programlisting
-#: injection.xml:641
-#, no-c-format
-msgid ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-msgstr ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-
 #. Tag: para
-#: injection.xml:643
 #, no-c-format
 msgid "The following producer method does the work:"
 msgstr "Die folgende Producer-Methode erledigt die Arbeit:"
 
-#. Tag: programlisting
-#: injection.xml:645
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotated().getAnnotation(HttpParam."
-"class).value());\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotation(HttpParam.class).value"
-"());\n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:647
 #, fuzzy, no-c-format
 msgid ""
 "(Note that the <literal>value()</literal> member of the <literal>HttpParam</"
@@ -1522,7 +940,6 @@
 "<literal>@NonBinding.</literal> annotiert ist)"
 
 #. Tag: para
-#: injection.xml:650
 #, fuzzy, no-c-format
 msgid ""
 "The container provides a built-in bean that implements the "
@@ -1531,30 +948,395 @@
 "Der Web Bean Manager liefert ein eingebautes Web Bean, das das "
 "<literal>InjectionPoint</literal>-Interface implementiert:"
 
-#. Tag: programlisting
-#: injection.xml:653
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Type getType();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Bean<?> getBean();\n"
-"   public Member getMember();\n"
-"   public Annotated getAnnotated();\n"
-"   public boolean isDelegate();\n"
-"   public boolean isTransient();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Object getInstance(); \n"
-"   public Bean<?> getBean(); \n"
-"   public Member getMember(): \n"
-"   public <T extends Annotation> T getAnnotation(Class<T> annotation); \n"
-"   public Set<T extends Annotation> getAnnotations(); \n"
-"}]]>"
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   public Checkout(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "    private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "    @Initializer\n"
+#~ "    public Checkout(ShoppingCart cart) {\n"
+#~ "        this.cart = cart;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "}]]>"
 
 #, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private ShoppingCart cart;\n"
+#~ "\n"
+#~ "   @Inject\n"
+#~ "   void setShoppingCart(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "    private ShoppingCart cart;\n"
+#~ "\n"
+#~ "    @Initializer \n"
+#~ "    void setShoppingCart(ShoppingCart cart) {\n"
+#~ "        this.cart = cart;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "   private @Inject ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "    private @Current ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Synchronous\n"
+#~ "public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Asynchronous\n"
+#~ "public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Synchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayByCheque {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Asynchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayByCheque {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
+#~ "@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque PaymentProcessor chequePaymentProcessor;\n"
+#~ "@PayByCreditCard PaymentProcessor creditCardPaymentProcessor;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public void setPaymentProcessors(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor, \n"
+#~ "                                 @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public void setPaymentProcessors(@PayByCheque PaymentProcessor "
+#~ "chequePaymentProcessor, \n"
+#~ "                                 @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
+#~ "                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public Checkout(@PayByCheque PaymentProcessor chequePaymentProcessor, \n"
+#~ "                @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces\n"
+#~ "PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor,\n"
+#~ "                                     @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   return isSynchronous() ? syncPaymentProcessor : "
+#~ "asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public void setPaymentProcessors(@PayByCheque PaymentProcessor "
+#~ "chequePaymentProcessor, \n"
+#~ "                                 @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayBy {\n"
+#~ "    PaymentType value();\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "   @Nonbinding String comment() default \"\";\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @NonBinding public String value();\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
+#~ "syncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Synchronous @Reliable\n"
+#~ "public class SynchronousReliablePaymentProcessor implements "
+#~ "PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative @Synchronous @Asynchronous\n"
+#~ "public class MockPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
+#~ "paymentProcessorSource;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]"
+#~ ">"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[abstract class AsynchronousQualifier\n"
+#~ "extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[abstract class CreditCardBinding \n"
+#~ "    extends AnnotationLiteral<CreditCard> \n"
+#~ "    implements CreditCard {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
+#~ "   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
+#~ msgstr ""
+#~ "<![CDATA[PaymentProcessor p = manager.getInstanceByType(PaymentProcessor."
+#~ "class, \n"
+#~ "                                               new "
+#~ "AnnotationLiteral<CreditCard>(){});]]>"
+
+#~ msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
+#~ msgstr "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
+
+#~ msgid ""
+#~ "<![CDATA[class LogFactory {\n"
+#~ "\n"
+#~ "   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
+#~ "      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass"
+#~ "().getName()); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[class LogFactory {\n"
+#~ "\n"
+#~ "   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
+#~ "      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass"
+#~ "().getName()); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject Logger log;]]>"
+#~ msgstr "<![CDATA[@Current Logger log;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @Nonbinding public String value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @NonBinding public String value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@HttpParam(\"username\") String username;\n"
+#~ "@HttpParam(\"password\") String password;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@HttpParam(\"username\") String username;\n"
+#~ "@HttpParam(\"password\") String password;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[class HttpParams\n"
+#~ "\n"
+#~ "   @Produces @HttpParam(\"\")\n"
+#~ "   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
+#~ "      return request.getParameter(ip.getAnnotated().getAnnotation"
+#~ "(HttpParam.class).value());\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[class HttpParams\n"
+#~ "\n"
+#~ "   @Produces @HttpParam(\"\")\n"
+#~ "   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
+#~ "      return request.getParameter(ip.getAnnotation(HttpParam.class).value"
+#~ "());\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public interface InjectionPoint { \n"
+#~ "   public Type getType();\n"
+#~ "   public Set<Annotation> getQualifiers();\n"
+#~ "   public Bean<?> getBean();\n"
+#~ "   public Member getMember();\n"
+#~ "   public Annotated getAnnotated();\n"
+#~ "   public boolean isDelegate();\n"
+#~ "   public boolean isTransient();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface InjectionPoint { \n"
+#~ "   public Object getInstance(); \n"
+#~ "   public Bean<?> getBean(); \n"
+#~ "   public Member getMember(): \n"
+#~ "   public <T extends Annotation> T getAnnotation(Class<T> annotation); \n"
+#~ "   public Set<T extends Annotation> getAnnotations(); \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
 #~ "It's usually very easy to fix an unproxyable dependency problem. Simply "
 #~ "add a constructor with no parameters to the injected class, introduce an "
 #~ "interface, or, if all else fails, change the scope of the injected bean "

Modified: doc/trunk/reference/de-DE/interceptors.po
===================================================================
--- doc/trunk/reference/de-DE/interceptors.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/interceptors.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: interceptors\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-15 19:11+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,13 +16,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: interceptors.xml:5
 #, no-c-format
 msgid "Interceptors"
 msgstr "Interzeptoren"
 
 #. Tag: para
-#: interceptors.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Interceptor functionality is defined in the Java Interceptors specification. "
@@ -33,7 +31,6 @@
 "Vorgehensweise bei der Bindung von Interzeptoren an Web Beans."
 
 #. Tag: para
-#: interceptors.xml:12
 #, fuzzy, no-c-format
 msgid ""
 "The Interceptors specification defines two kinds of interception points:"
@@ -42,19 +39,16 @@
 "\"Interception Points\"):"
 
 #. Tag: para
-#: interceptors.xml:18
 #, no-c-format
 msgid "business method interception, and"
 msgstr "Business Methoden Interception und"
 
 #. Tag: para
-#: interceptors.xml:21
 #, no-c-format
 msgid "lifecycle callback interception."
 msgstr "Lebenszyklus-Callback Interception."
 
 #. Tag: para
-#: interceptors.xml:25
 #, fuzzy, no-c-format
 msgid "In addition, the EJB specification defines timeout method interception."
 msgstr ""
@@ -62,7 +56,6 @@
 "\"Interception Points\"):"
 
 #. Tag: para
-#: interceptors.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>business method interceptor</emphasis> applies to invocations of "
@@ -71,23 +64,7 @@
 "Ein <emphasis>Business Methoden Interzeptor</emphasis> gilt für Aufrufe von "
 "Methoden des Web Beans durch Clients des Web Beans:"
 
-#. Tag: programlisting
-#: interceptors.xml:34
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:36
 #, no-c-format
 msgid ""
 "A <emphasis>lifecycle callback interceptor</emphasis> applies to invocations "
@@ -96,22 +73,7 @@
 "Ein <emphasis>Lebenszyklus Callback-Interzeptor</emphasis> gilt für Aufrufe "
 "von Lebenszyklus Callbacks durch den Container:"
 
-#. Tag: programlisting
-#: interceptors.xml:41
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"   @PostConstruct \n"
-"   public void injectDependencies(InvocationContext ctx) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"    @PostConstruct public void injectDependencies(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:43
 #, no-c-format
 msgid ""
 "An interceptor class may intercept both lifecycle callbacks and business "
@@ -121,7 +83,6 @@
 "Methoden abfangen."
 
 #. Tag: para
-#: interceptors.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>timeout method interceptor</emphasis> applies to invocations of "
@@ -130,29 +91,12 @@
 "Ein <emphasis>Lebenszyklus Callback-Interzeptor</emphasis> gilt für Aufrufe "
 "von Lebenszyklus Callbacks durch den Container:"
 
-#. Tag: programlisting
-#: interceptors.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TimeoutInterceptor {\n"
-"   @AroundTimeout \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:55
 #, no-c-format
 msgid "Interceptor bindings"
 msgstr "Interzeptor-Bindings"
 
 #. Tag: para
-#: interceptors.xml:57
 #, fuzzy, no-c-format
 msgid ""
 "Suppose we want to declare that some of our beans are transactional. The "
@@ -164,22 +108,7 @@
 "<emphasis>Interzeptor bindende Annotation</emphasis>, um festzulegen, für "
 "welches Web Bean wir uns interessieren:"
 
-#. Tag: programlisting
-#: interceptors.xml:62
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-
 #. Tag: para
-#: interceptors.xml:64
 #, no-c-format
 msgid ""
 "Now we can easily specify that our <literal>ShoppingCart</literal> is a "
@@ -188,44 +117,19 @@
 "Jetzt können wir ganz leicht unser <literal>ShoppingCart</literal> als ein "
 "transaktionales Objekt festlegen:"
 
-#. Tag: programlisting
-#: interceptors.xml:68
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:70
 #, no-c-format
 msgid "Or, if we prefer, we can specify that just one method is transactional:"
 msgstr ""
 "Oder, falls uns das lieber ist, können wir festlegen, dass nur eine Methode "
 "transaktional ist:"
 
-#. Tag: programlisting
-#: interceptors.xml:74
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class ShoppingCart {\n"
-"    @Transactional public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:79
 #, no-c-format
 msgid "Implementing interceptors"
 msgstr "Implementierung von Interzeptoren"
 
 #. Tag: para
-#: interceptors.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "That's great, but somewhere along the line we're going to have to actually "
@@ -238,69 +142,23 @@
 "EJB-Interzeptor erstellen und ihn mit <literal>@Interceptor</literal> und "
 "<literal>@Transactional</literal> annotieren."
 
-#. Tag: programlisting
-#: interceptors.xml:87
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:89
 #, no-c-format
 msgid "Interceptors can take advantage of dependency injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:93
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource UserTransaction transaction;\n"
-"\n"
-"    @AroundInvoke \n"
-"    public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource Transaction transaction;\n"
-"\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:95
 #, no-c-format
 msgid "Multiple interceptors may use the same interceptor binding type."
 msgstr ""
 "Mehrere Interzeptoren können denselben Interzeptor Binding-Typ verwenden."
 
 #. Tag: title
-#: interceptors.xml:102
 #, no-c-format
 msgid "Enabling interceptors"
 msgstr "Interzeptoren aktivieren"
 
 #. Tag: para
-#: interceptors.xml:104
 #, no-c-format
 msgid ""
 "By default, all interceptors are disabled. We need to <emphasis>enable</"
@@ -308,30 +166,12 @@
 "a bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:110
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:112
 #, no-c-format
 msgid "Whoah! Why the angle bracket stew?"
 msgstr "Puh! Warum diese Suppe an Klammern?"
 
 #. Tag: para
-#: interceptors.xml:114
 #, fuzzy, no-c-format
 msgid ""
 "Well, having the XML declaration is actually a <emphasis>good thing</"
@@ -339,7 +179,6 @@
 msgstr "Nun, die XML-Deklaration löst zwei Probleme:"
 
 #. Tag: para
-#: interceptors.xml:120
 #, no-c-format
 msgid ""
 "it enables us to specify a total ordering for all the interceptors in our "
@@ -350,7 +189,6 @@
 "wird und "
 
 #. Tag: para
-#: interceptors.xml:126
 #, no-c-format
 msgid "it lets us enable or disable interceptor classes at deployment time."
 msgstr ""
@@ -358,7 +196,6 @@
 "werden können."
 
 #. Tag: para
-#: interceptors.xml:130
 #, fuzzy, no-c-format
 msgid ""
 "For example, we could specify that our security interceptor runs before our "
@@ -367,25 +204,7 @@
 "Zum Beispiel könnten wir festlegen, dass unser Sicherheitsinterzeptor vor "
 "unserem <literal>TransactionInterceptor</literal> ausgeführt wird."
 
-#. Tag: programlisting
-#: interceptors.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.SecurityInterceptor</class>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:136
 #, no-c-format
 msgid ""
 "Or we could turn them both off in our test environment by simply not "
@@ -393,13 +212,11 @@
 msgstr ""
 
 #. Tag: title
-#: interceptors.xml:142
 #, no-c-format
 msgid "Interceptor bindings with members"
 msgstr "Interzeptor-Bindings mit Mitgliedern"
 
 #. Tag: para
-#: interceptors.xml:144
 #, no-c-format
 msgid ""
 "Suppose we want to add some extra information to our "
@@ -408,26 +225,7 @@
 "Nehmen wir an, wir wollten unserer <literal>@Transactional</literal>-"
 "Annotation weitere Informationen hinzufügen:"
 
-#. Tag: programlisting
-#: interceptors.xml:148
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"   boolean requiresNew() default false;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"    boolean requiresNew() default false;\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:150
 #, fuzzy, no-c-format
 msgid ""
 "CDI will use the value of <literal>requiresNew</literal> to choose between "
@@ -439,25 +237,7 @@
 "literal> und <literal>RequiresNewTransactionInterceptor</literal> "
 "auszuwählen."
 
-#. Tag: programlisting
-#: interceptors.xml:155
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional(requiresNew=true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:157
 #, no-c-format
 msgid ""
 "Now we can use <literal>RequiresNewTransactionInterceptor</literal> like "
@@ -466,18 +246,7 @@
 "Jetzt können wir <literal>RequiresNewTransactionInterceptor</literal> wie "
 "folgt verwenden:"
 
-#. Tag: programlisting
-#: interceptors.xml:161
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true)\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional(requiresNew=true)\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:163
 #, fuzzy, no-c-format
 msgid ""
 "But what if we only have one interceptor and we want the container to ignore "
@@ -490,32 +259,12 @@
 "<literal>requiresNew</literal> ignoriert? Wir können die "
 "<literal>@NonBinding</literal>-Annotation verwenden:"
 
-#. Tag: programlisting
-#: interceptors.xml:169
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"   @Nonbinding String[] rolesAllowed() default {};\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"    @NonBinding String[] rolesAllowed() default {};\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:174
 #, no-c-format
 msgid "Multiple interceptor binding annotations"
 msgstr "Multiple Interzeptor bindende Annotationen"
 
 #. Tag: para
-#: interceptors.xml:176
 #, fuzzy, no-c-format
 msgid ""
 "Usually we use combinations of interceptor bindings types to bind multiple "
@@ -528,18 +277,7 @@
 "würde verwendet, um <literal>TransactionInterceptor</literal> und "
 "<literal>SecurityInterceptor</literal> an dasselbe Web Bean zu binden:"
 
-#. Tag: programlisting
-#: interceptors.xml:182
-#, no-c-format
-msgid ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:184
 #, no-c-format
 msgid ""
 "However, in very complex cases, an interceptor itself may specify some "
@@ -548,18 +286,7 @@
 "In sehr komplexen Fällen aber kann ein Interzeptor selbst eine Kombination "
 "von Interzeptor-Binding-Typen festlegen:"
 
-#. Tag: programlisting
-#: interceptors.xml:189
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:191
 #, no-c-format
 msgid ""
 "Then this interceptor could be bound to the <literal>checkout()</literal> "
@@ -568,68 +295,12 @@
 "Dann könnte dieser Interzeptor an die <literal>checkout()</literal>-Methode "
 "gebunden werden, indem eine der folgenden Kombinationen verwendet wird:"
 
-#. Tag: programlisting
-#: interceptors.xml:196
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class ShoppingCart {\n"
-"    @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:198
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"    @Transactional public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:200
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart {\n"
-"   @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactionl\n"
-"public class ShoppingCart {\n"
-"    @Secure public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:202
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"    public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:207
 #, no-c-format
 msgid "Interceptor binding type inheritance"
 msgstr "Vererbung von Interzeptor-Binding-Typen"
 
 #. Tag: para
-#: interceptors.xml:209
 #, no-c-format
 msgid ""
 "One limitation of the Java language support for annotations is the lack of "
@@ -640,23 +311,14 @@
 "von Annotationsvererbung. Eigentlich sollten Annotationen eine eingebaute "
 "Wiederverwendung besitzen, damit diese Art von Sache funktioniert:"
 
-#. Tag: programlisting
-#: interceptors.xml:214
-#, no-c-format
-msgid ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-msgstr ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:216
 #, fuzzy, no-c-format
 msgid ""
 "Well, fortunately, CDI works around this missing feature of Java. We may "
 "annotate one interceptor binding type with other interceptor binding types "
 "(termed a <emphasis>meta-annotation</emphasis>). The interceptor bindings "
-"are transitive &#8212; any bean with the first interceptor binding inherits "
-"the interceptor bindings declared as meta-annotations."
+"are transitive — any bean with the first interceptor binding inherits the "
+"interceptor bindings declared as meta-annotations."
 msgstr ""
 "Nun, zum Glück umgeht Web Beans dieses fehlende Feature von Java. Wir können "
 "einen Interzeptor Binding-Typ mit anderen Interzeptor Binding-Typen "
@@ -664,24 +326,7 @@
 "mit demselben Interzeptor-Binding erbt die als Meta-Annotationen "
 "deklarierten Interzeptor-Bindings."
 
-#. Tag: programlisting
-#: interceptors.xml:223
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBinding\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBindingType\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:225
 #, fuzzy, no-c-format
 msgid ""
 "Now, any bean annotated <literal>@Action</literal> will be bound to both "
@@ -695,13 +340,11 @@
 "<literal>TransactionalSecureInterceptor</literal>, falls es existiert)."
 
 #. Tag: title
-#: interceptors.xml:234
 #, no-c-format
 msgid "Use of <literal>@Interceptors</literal>"
 msgstr "Verwendung von <literal>@Interceptors</literal>"
 
 #. Tag: para
-#: interceptors.xml:236
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>@Interceptors</literal> annotation defined by the interceptor "
@@ -712,36 +355,17 @@
 "Annotation wird sowohl für Enterprise als auch einfache Web Beans "
 "unterstützt, zum Beispiel:"
 
-#. Tag: programlisting
-#: interceptors.xml:239
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"    public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:241
 #, no-c-format
 msgid "However, this approach suffers the following drawbacks:"
 msgstr "Allerdings besitzt diese Vorgehensweise folgende Nachteile:"
 
 #. Tag: para
-#: interceptors.xml:245
 #, no-c-format
 msgid "the interceptor implementation is hardcoded in business code,"
 msgstr "Die Interzeptorimplementierung ist im Business Code hardkodiert,"
 
 #. Tag: para
-#: interceptors.xml:250
 #, no-c-format
 msgid "interceptors may not be easily disabled at deployment time, and"
 msgstr ""
@@ -749,25 +373,276 @@
 "werden und "
 
 #. Tag: para
-#: interceptors.xml:255
 #, fuzzy, no-c-format
 msgid ""
-"the interceptor ordering is non-global &#8212; it is determined by the order "
-"in which interceptors are listed at the class level."
+"the interceptor ordering is non-global — it is determined by the order in "
+"which interceptors are listed at the class level."
 msgstr ""
 "Die Interzeptorreihenfolge ist nicht allgemeingültig &#151; sie wird durch "
 "die Reihenfolge, in der Interzeptoren auf Klassenebene aufgeführt sind, "
 "festgelegt."
 
 #. Tag: para
-#: interceptors.xml:262
 #, fuzzy, no-c-format
 msgid "Therefore, we recommend the use of CDI-style interceptor bindings."
 msgstr ""
 "Daher empfehlen wir die Verwendung von Interzeptor-Bindings im Web Beans "
 "Stil."
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DependencyInjectionInterceptor {\n"
+#~ "   @PostConstruct \n"
+#~ "   public void injectDependencies(InvocationContext ctx) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DependencyInjectionInterceptor {\n"
+#~ "    @PostConstruct public void injectDependencies(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class TimeoutInterceptor {\n"
+#~ "   @AroundTimeout \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "    @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke \n"
+#~ "    public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource Transaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {\n"
+#~ "   boolean requiresNew() default false;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {\n"
+#~ "    boolean requiresNew() default false;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
+#~ "public class RequiresNewTransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional(requiresNew=true) @Interceptor\n"
+#~ "public class RequiresNewTransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional(requiresNew = true)\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional(requiresNew=true)\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Secure {\n"
+#~ "   @Nonbinding String[] rolesAllowed() default {};\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Secure {\n"
+#~ "    @NonBinding String[] rolesAllowed() default {};\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure @Interceptor\n"
+#~ "public class TransactionalSecureInterceptor { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure @Interceptor\n"
+#~ "public class TransactionalSecureInterceptor { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "    @Transactional @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "    @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactionl\n"
+#~ "public class ShoppingCart {\n"
+#~ "    @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "    public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "@InterceptorBinding\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Action { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "@InterceptorBindingType\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Action { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
+#~ "class})\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
+#~ "class})\n"
+#~ "public class ShoppingCart {\n"
+#~ "    public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "Web Beans re-uses the basic interceptor architecture of EJB 3.0, "
 #~ "extending the functionality in two directions:"
 #~ msgstr ""

Modified: doc/trunk/reference/de-DE/intro.po
===================================================================
--- doc/trunk/reference/de-DE/intro.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/intro.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: intro\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-02-22 13:52+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,13 +16,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: intro.xml:4
 #, no-c-format
 msgid "Introduction"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "So you're keen to get started writing your first bean? Or perhaps you're "
@@ -39,13 +37,11 @@
 "Sie je geschrieben haben."
 
 #. Tag: title
-#: intro.xml:13
 #, fuzzy, no-c-format
 msgid "What is a bean?"
 msgstr "Was ist ein Web Bean?"
 
 #. Tag: para
-#: intro.xml:15
 #, no-c-format
 msgid ""
 "A bean is exactly what you think it is. Only now, it has a true identity in "
@@ -53,7 +49,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:19
 #, no-c-format
 msgid ""
 "Prior to Java EE 6, there was no clear definition of the term \"bean\" in "
@@ -66,7 +61,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:27
 #, no-c-format
 msgid ""
 "Java EE 6 finally lays down that common definition in the Managed Beans "
@@ -80,14 +74,13 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:36
 #, no-c-format
 msgid ""
 "With very few exceptions, almost every concrete Java class that has a "
 "constructor with no parameters (or a constructor designated with the "
 "annotation <literal>@Inject</literal>) is a bean. This includes every "
 "JavaBean and every EJB session bean. If you've already got some JavaBeans or "
-"session beans lying around, they're already beans&#8212;you won't need any "
+"session beans lying around, they're already beans—you won't need any "
 "additional special metadata. There's just little one thing you need to do "
 "before you can start injecting them into stuff: you need to put them in an "
 "archive (a jar, or a Java EE module such as a war or EJB jar) that contains "
@@ -95,33 +88,29 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:45
 #, no-c-format
 msgid ""
 "The JavaBeans and EJBs you've been writing every day, up until now, have not "
 "been able to take advantage of the new services defined by the CDI "
-"specification. But you'll be able to use every one of them with CDI&#8212;"
-"allowing the container to create and destroy instances of your beans and "
-"associate them with a designated context, injecting them into other beans, "
-"using them in EL expressions, specializing them with qualifier annotations, "
-"even adding interceptors and decorators to them&#8212;without modifying your "
-"existing code. At most, you'll need to add some annotations."
+"specification. But you'll be able to use every one of them with CDI—allowing "
+"the container to create and destroy instances of your beans and associate "
+"them with a designated context, injecting them into other beans, using them "
+"in EL expressions, specializing them with qualifier annotations, even adding "
+"interceptors and decorators to them—without modifying your existing code. At "
+"most, you'll need to add some annotations."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:54
 #, no-c-format
 msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
-#: intro.xml:61
 #, no-c-format
 msgid "Getting our feet wet"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:63
 #, fuzzy, no-c-format
 msgid ""
 "Suppose that we have two existing Java classes that we've been using for "
@@ -132,20 +121,7 @@
 "verschiedenen Anwendungen verwendet wurden. Die erste Klasse parst einen "
 "String in eine Liste von Sätzen:"
 
-#. Tag: programlisting
-#: intro.xml:68
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class SentenceParser {\n"
-"   public List<String> parse(String text) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class SentenceParser {\n"
-"    public List<String> parse(String text) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:70
 #, no-c-format
 msgid ""
 "The second existing class is a stateless session bean front-end for an "
@@ -156,42 +132,12 @@
 "\"stateless Session Beans\" für ein externes System, das in der Lage ist "
 "Sätze von einer Sprache in eine andere zu übersetzen:"
 
-#. Tag: programlisting
-#: intro.xml:75
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"   public String translate(String sentence) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"    public String translate(String sentence) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:77
 #, fuzzy, no-c-format
 msgid "Where <literal>Translator</literal> is the EJB local interface:"
 msgstr "Wo <literal>Translator</literal> das lokale Interface ist:"
 
-#. Tag: programlisting
-#: intro.xml:79
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"   public String translate(String sentence);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"    public String translate(String sentence);\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "Unfortunately, we don't have a class that translates whole text documents. "
@@ -200,54 +146,7 @@
 "Leider besitzen wir keine bereits bestehende Klasse die ganze Textdokumente "
 "übersetzt. Schreiben wir also ein Web Bean, das diesen Job übernimmt:"
 
-#. Tag: programlisting
-#: intro.xml:85
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator {\n"
-"   private SentenceParser sentenceParser;\n"
-"   private Translator sentenceTranslator;\n"
-"    \n"
-"   @Inject\n"
-"   TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"      this.sentenceParser = sentenceParser;\n"
-"      this.sentenceTranslator = sentenceTranslator;\n"
-"   }\n"
-"    \n"
-"   public String translate(String text) {\n"
-"      StringBuilder sb = new StringBuilder();\n"
-"      for (String sentence: sentenceParser.parse(text)) {\n"
-"          sb.append(sentenceTranslator.translate(sentence));\n"
-"      }\n"
-"      return sb.toString();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TextTranslator {\n"
-"    \n"
-"    private SentenceParser sentenceParser;\n"
-"    private Translator sentenceTranslator;\n"
-"    \n"
-"    @Initializer\n"
-"    TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"        this.sentenceParser = sentenceParser;\n"
-"        this.sentenceTranslator = sentenceTranslator;\n"
-"    }\n"
-"    \n"
-"    public String translate(String text) {\n"
-"        StringBuilder sb = new StringBuilder();\n"
-"        for (String sentence: sentenceParser.parse(text)) {\n"
-"            sb.append(sentenceTranslator.translate(sentence));\n"
-"        }\n"
-"        return sb.toString();\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:87
 #, fuzzy, no-c-format
 msgid ""
 "But wait! <literal>TextTranslator</literal> does not have a constructor with "
@@ -262,7 +161,6 @@
 "Konstruktor besitzt."
 
 #. Tag: para
-#: intro.xml:93
 #, fuzzy, no-c-format
 msgid ""
 "As you've guessed, the <literal>@Inject</literal> annotation has something "
@@ -280,7 +178,6 @@
 "Konstruktors oder der Methode ein."
 
 #. Tag: para
-#: intro.xml:100
 #, no-c-format
 msgid ""
 "We may obtain an instance of <literal>TextTranslator</literal> by injecting "
@@ -291,7 +188,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:107
 #, no-c-format
 msgid ""
 "Let's create a UI controller bean that uses field injection to obtain an "
@@ -299,44 +195,12 @@
 "entered by a user:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:116
-#, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class TranslateController {\n"
-"   @Inject TextTranslator textTranslator;\n"
-"\n"
-"   private String inputText;\n"
-"   private String translation;\n"
-"\n"
-"   // JSF action method, perhaps\n"
-"   public void translate() {\n"
-"      translation = textTranslator.translate(inputText); \n"
-"   }\n"
-"\n"
-"   public String getInputText() {\n"
-"      return inputText;\n"
-"   }\n"
-"\n"
-"   public void setInputText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"\n"
-"   public String getTranslation() {\n"
-"      return translation;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:119
 #, fuzzy, no-c-format
 msgid "Field injection of <literal>TextTranslator</literal> instance"
 msgstr "Wo <literal>Translator</literal> das lokale Interface ist:"
 
 #. Tag: para
-#: intro.xml:127
 #, no-c-format
 msgid ""
 "Notice the controller bean is request-scoped and named. Since this "
@@ -347,7 +211,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:135
 #, fuzzy, no-c-format
 msgid ""
 "Alternatively, we may obtain an instance of <literal>TextTranslator</"
@@ -357,23 +220,7 @@
 "Wir erhalten eine Instanz von <literal>TextTranslator</literal> durch dessen "
 "Einspeisung in ein Web Bean, Servlet oder EJB:"
 
-#. Tag: programlisting
-#: intro.xml:140
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
-"...\n"
-"public void translate() {\n"
-"   textTranslatorInstance.get().translate(inputText);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public setTextTranslator(TextTranslator textTranslator) {\n"
-"    this.textTranslator = textTranslator;\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:142
 #, no-c-format
 msgid ""
 "Notice that it isn't necessary to create a getter or setter method to inject "
@@ -384,17 +231,15 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:148
 #, fuzzy, no-c-format
 msgid ""
 "At system initialization time, the container must validate that exactly one "
 "bean exists which satisfies each injection point. In our example, if no "
-"implementation of <literal>Translator</literal> is available&#8212;if the "
-"<literal>SentenceTranslator</literal> EJB was not deployed&#8212;the "
-"container would inform us of an <emphasis>unsatisfied dependency</emphasis>. "
-"If more than one implementation of <literal>Translator</literal> were "
-"available, the container would inform us of the <emphasis>ambiguous "
-"dependency</emphasis>."
+"implementation of <literal>Translator</literal> is available—if the "
+"<literal>SentenceTranslator</literal> EJB was not deployed—the container "
+"would inform us of an <emphasis>unsatisfied dependency</emphasis>. If more "
+"than one implementation of <literal>Translator</literal> were available, the "
+"container would inform us of the <emphasis>ambiguous dependency</emphasis>."
 msgstr ""
 "Zum Zeitpunkt der Systeminitialisierung muss der Web Bean Manager "
 "validieren, dass genau ein Web Bean existiert, das jedem Einspeisungspunkt "
@@ -407,7 +252,6 @@
 "<literal>AmbiguousDependencyException</literal> melden."
 
 #. Tag: para
-#: intro.xml:156
 #, no-c-format
 msgid ""
 "Before we get too deep in the details, let's pause and examine a bean's "
@@ -416,6 +260,97 @@
 "what <emphasis>makes</emphasis> something a bean."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class SentenceParser {\n"
+#~ "   public List<String> parse(String text) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class SentenceParser {\n"
+#~ "    public List<String> parse(String text) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator {\n"
+#~ "   public String translate(String sentence) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator {\n"
+#~ "    public String translate(String sentence) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Local\n"
+#~ "public interface Translator {\n"
+#~ "   public String translate(String sentence);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Local\n"
+#~ "public interface Translator {\n"
+#~ "    public String translate(String sentence);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class TextTranslator {\n"
+#~ "   private SentenceParser sentenceParser;\n"
+#~ "   private Translator sentenceTranslator;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) {\n"
+#~ "      this.sentenceParser = sentenceParser;\n"
+#~ "      this.sentenceTranslator = sentenceTranslator;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public String translate(String text) {\n"
+#~ "      StringBuilder sb = new StringBuilder();\n"
+#~ "      for (String sentence: sentenceParser.parse(text)) {\n"
+#~ "          sb.append(sentenceTranslator.translate(sentence));\n"
+#~ "      }\n"
+#~ "      return sb.toString();\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TextTranslator {\n"
+#~ "    \n"
+#~ "    private SentenceParser sentenceParser;\n"
+#~ "    private Translator sentenceTranslator;\n"
+#~ "    \n"
+#~ "    @Initializer\n"
+#~ "    TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) {\n"
+#~ "        this.sentenceParser = sentenceParser;\n"
+#~ "        this.sentenceTranslator = sentenceTranslator;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public String translate(String text) {\n"
+#~ "        StringBuilder sb = new StringBuilder();\n"
+#~ "        for (String sentence: sentenceParser.parse(text)) {\n"
+#~ "            sb.append(sentenceTranslator.translate(sentence));\n"
+#~ "        }\n"
+#~ "        return sb.toString();\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
+#~ "...\n"
+#~ "public void translate() {\n"
+#~ "   textTranslatorInstance.get().translate(inputText);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public setTextTranslator(TextTranslator textTranslator) {\n"
+#~ "    this.textTranslator = textTranslator;\n"
+#~ "}]]>"
+
 #~ msgid "Getting started with Web Beans"
 #~ msgstr "Erste Schritte mit Web Beans"
 

Modified: doc/trunk/reference/de-DE/master.po
===================================================================
--- doc/trunk/reference/de-DE/master.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/master.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-02-22 13:55+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,13 +16,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: master.xml:9
 #, no-c-format
 msgid "A note about naming and nomenclature"
 msgstr ""
 
 #. Tag: para
-#: master.xml:10
 #, no-c-format
 msgid ""
 "Shortly before the final draft of JSR-299 was submitted, the specification "
@@ -37,7 +35,6 @@
 msgstr ""
 
 #. Tag: para
-#: master.xml:19
 #, no-c-format
 msgid ""
 "You'll also find that some of the functionality that once existed in the "
@@ -47,43 +44,37 @@
 msgstr ""
 
 #. Tag: para
-#: master.xml:25
 #, no-c-format
 msgid ""
 "Note that this reference guide was started while changes were still being "
 "made to the specification. We've done our best to update it for accuracy. If "
 "you discover a conflict between what is written in this guide and the "
-"specification, the specification is the authority&#8212;assume it is "
-"correct. If you believe you have found an error in the specification, please "
-"report it to the JSR-299 EG."
+"specification, the specification is the authority—assume it is correct. If "
+"you believe you have found an error in the specification, please report it "
+"to the JSR-299 EG."
 msgstr ""
 
 #. Tag: title
-#: master.xml:36
 #, no-c-format
 msgid "Beans"
 msgstr ""
 
 #. Tag: title
-#: master.xml:49
 #, no-c-format
 msgid "Weld, the CDI Reference Implementation"
 msgstr ""
 
 #. Tag: title
-#: master.xml:59
 #, fuzzy, no-c-format
 msgid "Loose coupling with strong typing"
 msgstr "Das meiste aus starkem Tippen machen "
 
 #. Tag: title
-#: master.xml:75
 #, fuzzy, no-c-format
 msgid "CDI and the Java EE ecosystem"
 msgstr "Web Beans und das Java EE-Ökosystem"
 
 #. Tag: title
-#: master.xml:87
 #, no-c-format
 msgid "Weld reference"
 msgstr ""

Modified: doc/trunk/reference/de-DE/next.po
===================================================================
--- doc/trunk/reference/de-DE/next.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/next.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: next\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-28 06:27+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,13 +16,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: next.xml:4
 #, no-c-format
 msgid "Next steps"
 msgstr "Die nächsten Schritte"
 
 #. Tag: para
-#: next.xml:6
 #, no-c-format
 msgid ""
 "Because CDI is so new, there's not yet a lot of information available "
@@ -35,7 +33,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:14
 #, fuzzy, no-c-format
 msgid ""
 "The CDI reference implementation, Weld, is being developed at the <ulink url="
@@ -53,7 +50,6 @@
 "veröffentlichte Reihe von Blog-Einträgen."
 
 #. Tag: para
-#: next.xml:22
 #, no-c-format
 msgid ""
 "We encourage you to follow the <ulink url=\"https://lists.jboss.org/mailman/"
@@ -63,7 +59,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:28
 #, no-c-format
 msgid ""
 "We are eager to find volunteers to help revise, proofread or translate this "
@@ -72,7 +67,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:35
 #, no-c-format
 msgid ""
 "Checkout source from <ulink url=\"http://anonsvn.jboss.org/repos/weld/doc/"
@@ -80,16 +74,7 @@
 "ulink> using SVN"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:40
-#, no-c-format
-msgid ""
-"<![CDATA[$> svn co http://anonsvn.jboss.org/repos/weld/doc/trunk/reference "
-"weld-reference]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:43
 #, no-c-format
 msgid ""
 "Edit the <literal>pom.xml</literal> file in the root of the checkout and "
@@ -98,19 +83,11 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:49
 #, no-c-format
 msgid "Build using Maven 2"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:52
-#, no-c-format
-msgid "<![CDATA[$> mvn]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:54
 #, no-c-format
 msgid ""
 "If you experience an out of memory error, try setting this environment "
@@ -118,7 +95,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:61
 #, no-c-format
 msgid ""
 "The PDF version of the reference guide will appear the current directory. "
@@ -127,7 +103,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:66
 #, no-c-format
 msgid "We look forward to your participation!"
 msgstr ""

Modified: doc/trunk/reference/de-DE/part1.po
===================================================================
--- doc/trunk/reference/de-DE/part1.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/part1.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: part1\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-02-22 16:09+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,7 +16,6 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: para
-#: part1.xml:14
 #, fuzzy, no-c-format
 msgid ""
 "The <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-299</ulink> "
@@ -33,7 +32,6 @@
 "traditionellen Java EE Programmiermodells bieten Web Beans Dienste:"
 
 #. Tag: para
-#: part1.xml:23
 #, fuzzy, no-c-format
 msgid ""
 "an improved lifecycle for stateful objects, bound to well-defined "
@@ -43,7 +41,6 @@
 "definierte <emphasis>Kontexte</emphasis> gebunden sind,"
 
 #. Tag: para
-#: part1.xml:28
 #, no-c-format
 msgid "a typesafe approach to <emphasis>dependency injection</emphasis>,"
 msgstr ""
@@ -51,7 +48,6 @@
 "emphasis>,"
 
 #. Tag: para
-#: part1.xml:33
 #, fuzzy, no-c-format
 msgid ""
 "object interaction via an <emphasis>event notification facility</emphasis>,"
@@ -60,7 +56,6 @@
 "Facility und"
 
 #. Tag: para
-#: part1.xml:38
 #, fuzzy, no-c-format
 msgid ""
 "a better approach to binding <emphasis>interceptors</emphasis> to objects, "
@@ -73,7 +68,6 @@
 "geeigneter ist."
 
 #. Tag: para
-#: part1.xml:45
 #, no-c-format
 msgid ""
 "an <emphasis>SPI</emphasis> for developing portable extensions to the "
@@ -81,22 +75,21 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:51
 #, no-c-format
 msgid ""
 "The CDI services are a core aspect of the Java EE platform and include full "
 "support for Java EE modularity and the Java EE component architecture. But "
 "the specification does not limit the use of CDI to the Java EE environment. "
 "In the Java SE environment, the services might be provided by a standalone "
-"CDI implementation like Weld (see <xref linkend=\"weld-se\"/>), or even by a "
-"container that also implements the subset of EJB defined for embedded usage "
-"by the EJB 3.1 specification. CDI is especially useful in the context of web "
-"application development, but the problems it solves are general development "
-"concerns and it is therefore applicable to a wide variety of application."
+"CDI implementation like Weld (see <xref linkend=\"weld-se\" />), or even by "
+"a container that also implements the subset of EJB defined for embedded "
+"usage by the EJB 3.1 specification. CDI is especially useful in the context "
+"of web application development, but the problems it solves are general "
+"development concerns and it is therefore applicable to a wide variety of "
+"application."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:61
 #, no-c-format
 msgid ""
 "An object bound to a lifecycle context is called a bean. CDI includes built-"
@@ -105,19 +98,16 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:68
 #, no-c-format
 msgid "managed beans, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:71
 #, no-c-format
 msgid "EJB session beans."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:75
 #, no-c-format
 msgid ""
 "Both managed beans and EJB session beans may inject other beans. But some "
@@ -127,37 +117,31 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:83
 #, no-c-format
 msgid "message-driven beans,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:86
 #, no-c-format
 msgid "interceptors,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:89
 #, no-c-format
 msgid "servlets, servlet filters and servlet event listeners,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:92
 #, no-c-format
 msgid "JAX-WS service endpoints and handlers, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:95
 #, no-c-format
 msgid "JSP tag handlers and tag library event listeners."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:99
 #, fuzzy, no-c-format
 msgid ""
 "CDI relieves the user of an unfamiliar API of the need to answer the "
@@ -168,37 +152,31 @@
 "folgender Fragen:"
 
 #. Tag: para
-#: part1.xml:105
 #, fuzzy, no-c-format
 msgid "What is the lifecycle of this object?"
 msgstr "was ist der Lebenszyklus dieses Objekts?"
 
 #. Tag: para
-#: part1.xml:108
 #, fuzzy, no-c-format
 msgid "How many simultaneous clients can it have?"
 msgstr "wieviele simultane Clients kann es besitzen?"
 
 #. Tag: para
-#: part1.xml:111
 #, fuzzy, no-c-format
 msgid "Is it multithreaded?"
 msgstr "ist es multithreaded?"
 
 #. Tag: para
-#: part1.xml:114
 #, no-c-format
 msgid "How do I get access to it from a client?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:117
 #, fuzzy, no-c-format
 msgid "Do I need to explicitly destroy it?"
 msgstr "muss ich es explizit löschen?"
 
 #. Tag: para
-#: part1.xml:120
 #, fuzzy, no-c-format
 msgid ""
 "Where should I keep the reference to it when I'm not currently using it?"
@@ -207,7 +185,6 @@
 "verwende?"
 
 #. Tag: para
-#: part1.xml:125
 #, fuzzy, no-c-format
 msgid ""
 "How can I define an alternative implementation, so that the implementation "
@@ -217,13 +194,11 @@
 "dieses Objekts zum Zeitpunkt des Deployment variieren kann? "
 
 #. Tag: para
-#: part1.xml:131
 #, fuzzy, no-c-format
 msgid "How should I go about sharing this object between other objects?"
 msgstr "wie kann ich dieses Objekt mit anderen Objekten teilen?"
 
 #. Tag: para
-#: part1.xml:137
 #, no-c-format
 msgid ""
 "CDI is more than a framework. It's a whole, rich programming model. The "
@@ -232,7 +207,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:142
 #, fuzzy, no-c-format
 msgid ""
 "A bean specifies only the type and semantics of other beans it depends upon. "
@@ -251,7 +225,6 @@
 "auf irgendeinen Client hätte."
 
 #. Tag: para
-#: part1.xml:149
 #, fuzzy, no-c-format
 msgid ""
 "Events, interceptors and decorators enhance the loose-coupling inherent in "
@@ -261,7 +234,6 @@
 "Paarung</emphasis>, die diesem Modell innewohnt:"
 
 #. Tag: para
-#: part1.xml:155
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -271,7 +243,6 @@
 "von Ereignis-Consumern,"
 
 #. Tag: para
-#: part1.xml:159
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -281,7 +252,6 @@
 "Business-Logik und "
 
 #. Tag: para
-#: part1.xml:163
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> allow business concerns to be "
@@ -291,7 +261,6 @@
 "Business Problemen."
 
 #. Tag: para
-#: part1.xml:168
 #, fuzzy, no-c-format
 msgid ""
 "What's even more powerful (and comforting) is that CDI provides all these "
@@ -315,7 +284,6 @@
 "Consumer zu verbinden."
 
 #. Tag: para
-#: part1.xml:177
 #, no-c-format
 msgid ""
 "But CDI isn't a restrictive programming model. It doesn't tell you how you "
@@ -325,7 +293,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:183
 #, fuzzy, no-c-format
 msgid ""
 "CDI even provides a comprehensive SPI, allowing other kinds of object "
@@ -340,7 +307,6 @@
 "Beans interagieren können."
 
 #. Tag: para
-#: part1.xml:189
 #, fuzzy, no-c-format
 msgid ""
 "CDI was influenced by a number of existing Java frameworks, including Seam, "
@@ -357,7 +323,6 @@
 "zentrisch als Spring, mehr Web- und Enterprise-anwendungsfähig als Guice."
 
 #. Tag: para
-#: part1.xml:197
 #, no-c-format
 msgid ""
 "Finally, CDI is a <ulink url=\"http://jcp.org\">Java Community Process</"

Modified: doc/trunk/reference/de-DE/part2.po
===================================================================
--- doc/trunk/reference/de-DE/part2.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/part2.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: part2\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-28 07:35+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,7 +16,6 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: para
-#: part2.xml:5
 #, no-c-format
 msgid ""
 "Weld, the JSR-299 Reference Implementation (RI), is being developed as part "
@@ -28,7 +27,6 @@
 msgstr ""
 
 #. Tag: para
-#: part2.xml:12
 #, no-c-format
 msgid ""
 "Weld provides a complete SPI allowing Java EE containers such as JBoss AS "
@@ -38,7 +36,6 @@
 msgstr ""
 
 #. Tag: para
-#: part2.xml:18
 #, no-c-format
 msgid ""
 "Weld comes with an extensive library of examples, which are a great starting "

Modified: doc/trunk/reference/de-DE/part3.po
===================================================================
--- doc/trunk/reference/de-DE/part3.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/part3.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: part3\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-02-07 15:34+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,7 +16,6 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: para
-#: part3.xml:5
 #, no-c-format
 msgid ""
 "The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've "
@@ -24,19 +23,16 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:12
 #, no-c-format
 msgid "<emphasis>alternatives</emphasis> enable deployment time polymorphism,"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:17
 #, no-c-format
 msgid "<emphasis>producer methods</emphasis> enable runtime polymorphism, and"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:21
 #, no-c-format
 msgid ""
 "<emphasis>contextual lifecycle management</emphasis> decouples bean "
@@ -44,7 +40,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:27
 #, no-c-format
 msgid ""
 "These techniques serve to enable loose coupling of client and server. The "
@@ -54,7 +49,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:33
 #, no-c-format
 msgid ""
 "Loose coupling makes a system more <emphasis>dynamic</emphasis>. The system "
@@ -66,7 +60,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:40
 #, no-c-format
 msgid ""
 "CDI provides three extra important facilities that further the goal of loose "
@@ -74,7 +67,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:46
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -82,7 +74,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:51
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> may be used to decouple some business "
@@ -90,7 +81,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:56
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -98,7 +88,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:62
 #, fuzzy, no-c-format
 msgid ""
 "The second major theme of CDI is <emphasis>strong typing</emphasis>. The "
@@ -114,13 +103,12 @@
 "validiert werden können."
 
 #. Tag: para
-#: part3.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "You don't see string-based identifiers in CDI code, not because the "
-"framework is hiding them from you using clever defaulting rules&#8212;so-"
-"called \"configuration by convention\"&#8212;but because there are simply no "
-"strings there to begin with!"
+"framework is hiding them from you using clever defaulting rules—so-called "
+"\"configuration by convention\"—but because there are simply no strings "
+"there to begin with!"
 msgstr ""
 "Sie sehen keine String-basierten Bezeichner in Web Beans Code; dies ist "
 "nicht der Fall weil das Framework diese unter Verwendung irgendwelcher "
@@ -128,7 +116,6 @@
 "Konvention\" &#151; sondern weil einfach keine Strings existieren!"
 
 #. Tag: para
-#: part3.xml:74
 #, no-c-format
 msgid ""
 "The obvious benefit of this approach is that <emphasis>any</emphasis> IDE "
@@ -147,7 +134,6 @@
 "Gelegenheit haben, die semantische Ebene Ihres Code anzuheben."
 
 #. Tag: para
-#: part3.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "CDI encourages you develop annotations that model concepts, for example,"
@@ -156,61 +142,51 @@
 "formen, etwa "
 
 #. Tag: para
-#: part3.xml:87
 #, no-c-format
 msgid "<literal>@Asynchronous</literal>,"
 msgstr "<literal>@Asynchronous</literal>,"
 
 #. Tag: para
-#: part3.xml:90
 #, no-c-format
 msgid "<literal>@Mock</literal>,"
 msgstr "<literal>@Mock</literal>,"
 
 #. Tag: para
-#: part3.xml:93
 #, no-c-format
 msgid "<literal>@Secure</literal> or"
 msgstr "<literal>@Secure</literal> oder"
 
 #. Tag: para
-#: part3.xml:96
 #, no-c-format
 msgid "<literal>@Updated</literal>,"
 msgstr "<literal>@Updated</literal>,"
 
 #. Tag: para
-#: part3.xml:100
 #, no-c-format
 msgid "instead of using compound names like"
 msgstr "statt Namen wie Assoziationsbegriffe wie "
 
 #. Tag: para
-#: part3.xml:104
 #, no-c-format
 msgid "<literal>asyncPaymentProcessor</literal>,"
 msgstr "<literal>asyncPaymentProcessor</literal>,"
 
 #. Tag: para
-#: part3.xml:107
 #, no-c-format
 msgid "<literal>mockPaymentProcessor</literal>,"
 msgstr "<literal>mockPaymentProcessor</literal>,"
 
 #. Tag: para
-#: part3.xml:110
 #, no-c-format
 msgid "<literal>SecurityInterceptor</literal> or"
 msgstr "<literal>SecurityInterceptor</literal> oder"
 
 #. Tag: para
-#: part3.xml:113
 #, no-c-format
 msgid "<literal>DocumentUpdatedEvent</literal>."
 msgstr "<literal>DocumentUpdatedEvent</literal> zu verwenden."
 
 #. Tag: para
-#: part3.xml:117
 #, no-c-format
 msgid ""
 "The annotations are reusable. They help describe common qualities of "
@@ -225,7 +201,6 @@
 "leichter lesbar und einfacher zu verstehen."
 
 #. Tag: para
-#: part3.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "CDI <emphasis>stereotypes</emphasis> take this idea a step further. A "
@@ -242,7 +217,6 @@
 "Deployment-Typ usw. in einem einzelnen, wiederverwendbaren Paket."
 
 #. Tag: para
-#: part3.xml:138
 #, fuzzy, no-c-format
 msgid ""
 "We're now ready to meet some more advanced features of CDI. Bear in mind "

Modified: doc/trunk/reference/de-DE/part4.po
===================================================================
--- doc/trunk/reference/de-DE/part4.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/part4.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: part4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-28 06:47+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,7 +16,6 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: para
-#: part4.xml:5
 #, no-c-format
 msgid ""
 "The third theme of CDI is <emphasis>integration</emphasis>. We've already "
@@ -28,7 +27,6 @@
 msgstr ""
 
 #. Tag: para
-#: part4.xml:12
 #, fuzzy, no-c-format
 msgid ""
 "CDI is also designed to work in concert with technologies outside of the "
@@ -56,7 +54,6 @@
 "EE Umgebung."
 
 #. Tag: para
-#: part4.xml:23
 #, fuzzy, no-c-format
 msgid ""
 "We're about to see how to take full advantage of the Java EE platform in an "

Modified: doc/trunk/reference/de-DE/part5.po
===================================================================
--- doc/trunk/reference/de-DE/part5.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/part5.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,7 +15,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part5.xml:5
 #, no-c-format
 msgid ""
 "Weld is the reference implementation of JSR-299, and is used by JBoss AS and "
@@ -27,7 +26,6 @@
 msgstr ""
 
 #. Tag: para
-#: part5.xml:12
 #, no-c-format
 msgid ""
 "Some of the extensions in Weld are portable across JSR-299 implementations "
@@ -37,12 +35,11 @@
 msgstr ""
 
 #. Tag: para
-#: part5.xml:18
 #, no-c-format
 msgid ""
 "If you want to get started quickly using Weld (and, in turn, CDI) with JBoss "
 "AS, GlassFish or Tomcat and experiment with one of the examples, take a look "
-"at <xref linkend=\"gettingstarted\"/>. Otherwise read on for a exhaustive "
+"at <xref linkend=\"gettingstarted\" />. Otherwise read on for a exhaustive "
 "discussion of using Weld in all the environments and application servers it "
 "supports and the Weld extensions."
 msgstr ""

Modified: doc/trunk/reference/de-DE/producermethods.po
===================================================================
--- doc/trunk/reference/de-DE/producermethods.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/producermethods.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: producermethods\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-02-23 08:08+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,13 +16,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: producermethods.xml:5
 #, no-c-format
 msgid "Producer methods"
 msgstr "Producer-Methoden"
 
 #. Tag: para
-#: producermethods.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Producer methods let us overcome certain limitations that arise when a "
@@ -37,31 +35,26 @@
 "Beans sind. (In <xref linkend=\"xml\"/> lernen wir eine zweite Weise kennen.)"
 
 #. Tag: para
-#: producermethods.xml:14
 #, no-c-format
 msgid "According to the spec:"
 msgstr "Gemäß der Spezifikation:"
 
 #. Tag: para
-#: producermethods.xml:18
 #, no-c-format
 msgid "A producer method acts as a source of objects to be injected, where:"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:22
 #, no-c-format
 msgid "the objects to be injected are not required to be instances of beans,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:25
 #, no-c-format
 msgid "the concrete type of the objects to be injected may vary at runtime or"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:28
 #, no-c-format
 msgid ""
 "the objects require some custom initialization that is not performed by the "
@@ -69,25 +62,21 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:36
 #, fuzzy, no-c-format
 msgid "For example, producer methods let us:"
 msgstr "Geltungsbereich einer Producer-Methode"
 
 #. Tag: para
-#: producermethods.xml:40
 #, no-c-format
 msgid "expose a JPA entity as a bean,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:43
 #, no-c-format
 msgid "expose any JDK class as a bean,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:46
 #, no-c-format
 msgid ""
 "define multiple beans, with different scopes or initialization, for the same "
@@ -95,13 +84,11 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:51
 #, no-c-format
 msgid "vary the implementation of a bean type at runtime."
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:55
 #, no-c-format
 msgid ""
 "In particular, producer methods let us use runtime polymorphism with CDI. As "
@@ -110,55 +97,12 @@
 "is fixed. A producer method has no such limitation:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:61
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Preferences implements Serializable {\n"
-"   private PaymentStrategyType paymentStrategy;\n"
-"   ...\n"
-"   @Produces @Preferred \n"
-"   public PaymentStrategy getPaymentStrategy() {\n"
-"       switch (paymentStrategy) {\n"
-"           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
-"           case CHECK: return new CheckPaymentStrategy();\n"
-"           case PAYPAL: return new PayPalPaymentStrategy();\n"
-"           default: return null;\n"
-"       } \n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          ChequePaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:63
 #, no-c-format
 msgid "Consider an injection point:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:65
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"    ...\n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:67
 #, no-c-format
 msgid ""
 "This injection point has the same type and qualifier annotations as the "
@@ -168,13 +112,11 @@
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:74
 #, no-c-format
 msgid "Scope of a producer method"
 msgstr "Geltungsbereich einer Producer-Methode"
 
 #. Tag: para
-#: producermethods.xml:76
 #, fuzzy, no-c-format
 msgid ""
 "The scope of the producer method defaults to <literal>@Dependent</literal>, "
@@ -191,7 +133,6 @@
 "Objekts für jede Benutzer-Session vorhanden sein."
 
 #. Tag: para
-#: producermethods.xml:83
 #, no-c-format
 msgid ""
 "To change this behavior, we can add a <literal>@SessionScoped</literal> "
@@ -200,22 +141,7 @@
 "Um dieses Verhalten zu ändern, können wir der Methode eine "
 "<literal>@SessionScoped</literal>-Annotation hinzufügen."
 
-#. Tag: programlisting
-#: producermethods.xml:87
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"    ...\n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:89
 #, no-c-format
 msgid ""
 "Now, when the producer method is called, the returned "
@@ -227,7 +153,6 @@
 "Producer-Methode wird in drselben Session nicht mehr aufgerufen."
 
 #. Tag: para
-#: producermethods.xml:95
 #, no-c-format
 msgid ""
 "A producer method does <emphasis>not</emphasis> inherit the scope of the "
@@ -240,13 +165,11 @@
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:107
 #, no-c-format
 msgid "Injection into producer methods"
 msgstr "Einspeisung in Producer-Methoden"
 
 #. Tag: para
-#: producermethods.xml:109
 #, no-c-format
 msgid ""
 "There's one potential problem with the code above. The implementations of "
@@ -262,7 +185,6 @@
 "nutzen und besitzen keine Interzeptoren."
 
 #. Tag: para
-#: producermethods.xml:116
 #, fuzzy, no-c-format
 msgid ""
 "If this isn't what we want, we can use dependency injection into the "
@@ -272,36 +194,7 @@
 "Einspeisung in die Producer-Methode verwenden, um Web Bean Instanzen zu "
 "erhalten: "
 
-#. Tag: programlisting
-#: producermethods.xml:121
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          CheckPaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          ChequePaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-"
@@ -324,7 +217,6 @@
 "vorsichtig wenn Sie Web Bean Instanzen von Producer-Methoden wiedergeben!"
 
 #. Tag: para
-#: producermethods.xml:132
 #, fuzzy, no-c-format
 msgid ""
 "There's at least three ways we could go about fixing this bug. We could "
@@ -341,7 +233,6 @@
 "<literal>@RequestScoped</literal> zu ändern."
 
 #. Tag: para
-#: producermethods.xml:139
 #, fuzzy, no-c-format
 msgid ""
 "But a more common solution is to use the special <literal>@New</literal> "
@@ -351,51 +242,16 @@
 "Binding-Annotation zu verwenden."
 
 #. Tag: title
-#: producermethods.xml:144
 #, no-c-format
 msgid "Use of <literal>@New</literal> with producer methods"
 msgstr "Verwendung von <literal>@New</literal> mit Producer-Methoden"
 
 #. Tag: para
-#: producermethods.xml:146
 #, no-c-format
 msgid "Consider the following producer method:"
 msgstr "Sehen Sie sich folgende Producer-Methode an:"
 
-#. Tag: programlisting
-#: producermethods.xml:148
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New CheckPaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New ChequePaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:150
 #, no-c-format
 msgid ""
 "Then a new <emphasis>dependent</emphasis> instance of "
@@ -413,47 +269,25 @@
 "am Ende der Session."
 
 #. Tag: title
-#: producermethods.xml:160
 #, fuzzy, no-c-format
 msgid "Disposer methods"
 msgstr "Producer-Methoden"
 
 #. Tag: para
-#: producermethods.xml:162
 #, no-c-format
 msgid ""
 "Some producer methods return objects that require explicit destruction. For "
 "example, somebody needs to close this JDBC connection:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:167
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @RequestScoped Connection connect(User user) {\n"
-"   return createConnection(user.getId(), user.getPassword());\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:169
 #, no-c-format
 msgid ""
 "Destruction can be performed by a matching <emphasis>disposer method</"
 "emphasis>, defined by the same class as the producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:172
-#, no-c-format
-msgid ""
-"<![CDATA[void close(@Disposes Connection connection) {\n"
-"   connection.close();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:174
 #, no-c-format
 msgid ""
 "The disposer method must have at least one parameter, annotated "
@@ -466,7 +300,116 @@
 "method automatically."
 msgstr ""
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Preferences implements Serializable {\n"
+#~ "   private PaymentStrategyType paymentStrategy;\n"
+#~ "   ...\n"
+#~ "   @Produces @Preferred \n"
+#~ "   public PaymentStrategy getPaymentStrategy() {\n"
+#~ "       switch (paymentStrategy) {\n"
+#~ "           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
+#~ "           case CHECK: return new CheckPaymentStrategy();\n"
+#~ "           case PAYPAL: return new PayPalPaymentStrategy();\n"
+#~ "           default: return null;\n"
+#~ "       } \n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          ChequePaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "    ...\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "    ...\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          CheckPaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          ChequePaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          @New CheckPaymentStrategy cps,\n"
+#~ "                                          @New PayPalPaymentStrategy "
+#~ "ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          @New ChequePaymentStrategy "
+#~ "cps,\n"
+#~ "                                          @New PayPalPaymentStrategy "
+#~ "ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "<blockquote> <para>A Web Beans producer method acts as a source of "
 #~ "objects to be injected, where:</para> <itemizedlist> <listitem> <para>the "
 #~ "objects to be injected are not required to be instances of Web Beans,</"

Modified: doc/trunk/reference/de-DE/resources.po
===================================================================
--- doc/trunk/reference/de-DE/resources.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/resources.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: resources.xml:5
 #, no-c-format
 msgid "Java EE component environment resources"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:7
 #, no-c-format
 msgid ""
 "Java EE 5 already introduced some limited support for dependency injection, "
@@ -30,7 +28,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:13
 #, no-c-format
 msgid ""
 "Naturally, there is now a slight mismatch with the new style of dependency "
@@ -44,7 +41,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:22
 #, no-c-format
 msgid ""
 "Fields have a duality in that they can both be the target of Java EE "
@@ -57,13 +53,11 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:31
 #, no-c-format
 msgid "Defining a resource"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:33
 #, no-c-format
 msgid ""
 "The CDI specification uses the term <emphasis>resource</emphasis> to refer, "
@@ -72,7 +66,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:38
 #, no-c-format
 msgid ""
 "JDBC <literal>Datasource</literal>s, JMS <literal>Queue</literal>s, "
@@ -82,7 +75,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:43
 #, no-c-format
 msgid ""
 "JPA <literal>EntityManager</literal>s and <literal>EntityManagerFactory</"
@@ -90,19 +82,16 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:46
 #, no-c-format
 msgid "remote EJBs, and"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:49
 #, no-c-format
 msgid "web services"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:53
 #, no-c-format
 msgid ""
 "We declare a resource by annotating a producer field with a component "
@@ -111,61 +100,17 @@
 "<literal>@PersistenceUnit</literal> or <literal>@WebServiceRef</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:57
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @WebServiceRef(lookup=\"java:app/service/Catalog\")\n"
-"Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Resource(lookup=\"java:global/env/jdbc/CustomerDatasource"
-"\") \n"
-"@CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceContext(unitName=\"CustomerDatabase\")\n"
-"@CustomerDatabase EntityManager customerDatabasePersistenceContext;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:63
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceUnit(unitName=\"CustomerDatabase\") \n"
-"@CustomerDatabase EntityManagerFactory customerDatabasePersistenceUnit;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @EJB(ejbLink=\"../their.jar#PaymentService\") \n"
-"PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:67
 #, no-c-format
 msgid "The field may be static (but not final)."
 msgstr ""
 
 #. Tag: para
-#: resources.xml:69
 #, no-c-format
 msgid "A resource declaration really contains two pieces of information:"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:73
 #, no-c-format
 msgid ""
 "the JNDI name, EJB link, persistence unit name, or other metadata needed to "
@@ -173,7 +118,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:77
 #, no-c-format
 msgid ""
 "the type and qualifiers that we will use to inject the reference into our "
@@ -181,7 +125,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:82
 #, no-c-format
 msgid ""
 "It might feel strange to be declaring resources in Java code. Isn't this "
@@ -191,53 +134,16 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:90
 #, no-c-format
 msgid "Typesafe resource injection"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:92
 #, no-c-format
 msgid "These resources can now be injected in the usual way."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:96
-#, no-c-format
-msgid "<![CDATA[@Inject Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:97
-#, no-c-format
-msgid "<![CDATA[@Inject @CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:98
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManager "
-"customerDatabaseEntityManager;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManagerFactory "
-"customerDatabaseEntityManagerFactory;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:100
-#, no-c-format
-msgid "<![CDATA[@Inject PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:102
 #, no-c-format
 msgid ""
 "The bean type and qualifiers of the resource are determined by the producer "
@@ -245,7 +151,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:106
 #, no-c-format
 msgid ""
 "It might seem like a pain to have to write these extra producer field "
@@ -256,26 +161,12 @@
 "and more typesafe to write"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:113
-#, no-c-format
-msgid "@Inject @CustomerDatabase EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:115
 #, no-c-format
 msgid "instead of"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:117
-#, no-c-format
-msgid "@PersistenceContext(unitName=\"CustomerDatabase\") EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:119
 #, no-c-format
 msgid "all over the place?"
 msgstr ""

Modified: doc/trunk/reference/de-DE/ri-spi.po
===================================================================
--- doc/trunk/reference/de-DE/ri-spi.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/ri-spi.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: ri-spi\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-05 14:40+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,13 +16,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: ri-spi.xml:4
 #, fuzzy, no-c-format
 msgid "Integrating Weld into other environments"
 msgstr "Integration der Web Beans RI in andere Umgebungen"
 
 #. Tag: para
-#: ri-spi.xml:6
 #, no-c-format
 msgid ""
 "If you want to use Weld in another environment, you will need to provide "
@@ -31,13 +29,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:12
 #, fuzzy, no-c-format
 msgid "Enterprise Services"
 msgstr "Laden von Ressourcen"
 
 #. Tag: para
-#: ri-spi.xml:13
 #, no-c-format
 msgid ""
 "If you just want to use managed beans, and not take advantage of enterprise "
@@ -49,7 +45,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:21
 #, no-c-format
 msgid ""
 "All SPIs and APIs described have extensive JavaDoc, which spell out the "
@@ -57,13 +52,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:27
 #, fuzzy, no-c-format
 msgid "The Weld SPI"
 msgstr "Das Web Beans RI SPI"
 
 #. Tag: para
-#: ri-spi.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "The Weld SPI is located in the <literal>weld-spi</literal> module, and "
@@ -77,7 +70,6 @@
 "möchten, sind andere erforderlich."
 
 #. Tag: para
-#: ri-spi.xml:35
 #, no-c-format
 msgid ""
 "All interfaces in the SPI support the decorator pattern and provide a "
@@ -88,7 +80,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:41
 #, no-c-format
 msgid ""
 "Weld supports multiple environments. An environment is defined by an "
@@ -102,7 +93,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:50
 #, no-c-format
 msgid ""
 "Weld uses a generic-typed service registry to allow services to be "
@@ -111,18 +101,16 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:56
 #, no-c-format
 msgid "Deployment structure"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:58
 #, no-c-format
 msgid ""
 "An application is often comprised of a number of modules. For example, a "
 "Java EE deployment may contain a number of EJB modules (containing business "
-"logic) and WAR modules (containing the user interface). A container may "
+"logic) and war modules (containing the user interface). A container may "
 "enforce certain <emphasis>accessibility</emphasis> rules which limit the "
 "visibility of classes between modules. CDI allows these same rules to apply "
 "to bean and observer method resolution. As the accessibility rules vary "
@@ -132,13 +120,12 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:67
 #, no-c-format
 msgid ""
 "The CDI specification discusses <emphasis>Bean Deployment Archives</"
-"emphasis> (BDAs)&#8212;archives which are marked as containing beans which "
-"should be deployed to the CDI container, and made available for injection "
-"and resolution. Weld reuses this description of <emphasis>Bean Deployment "
+"emphasis> (BDAs)—archives which are marked as containing beans which should "
+"be deployed to the CDI container, and made available for injection and "
+"resolution. Weld reuses this description of <emphasis>Bean Deployment "
 "Archives</emphasis> in its deployment structure SPI. Each deployment exposes "
 "the BDAs which it contains; each BDA may also reference other which it can "
 "access. Together, the transitive closure of this graph forms the beans which "
@@ -146,7 +133,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:76
 #, no-c-format
 msgid ""
 "To describe the deployment structure to Weld, the container should provide "
@@ -160,7 +146,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:85
 #, no-c-format
 msgid ""
 "As programmatically described beans may result in additional BDAs being "
@@ -170,13 +155,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:92
 #, no-c-format
 msgid "Virtual BDAs"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:93
 #, no-c-format
 msgid ""
 "In a strict container, each BDA might have to explicitly specify which other "
@@ -187,7 +170,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:100
 #, no-c-format
 msgid ""
 "A container, might, for example, use a flat accessibility structure for the "
@@ -196,11 +178,10 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:106
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it's contents to be discovered by Weld&#8212;<literal>BeanDeploymentArchive."
+"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
 "getBeanClasses()</literal> must return all the classes in the BDA, "
 "<literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the "
 "deployment descriptors in the archive, and <literal>BeanDeploymentArchive."
@@ -209,7 +190,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:114
 #, no-c-format
 msgid ""
 "BDA X may also reference another BDA Y whose beans can be resolved by, and "
@@ -220,13 +200,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:122
 #, no-c-format
 msgid "Matching the classloader structure for the deployment"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:124
 #, no-c-format
 msgid ""
 "In practice, you can regard the deployment structure represented by "
@@ -237,7 +215,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:132
 #, no-c-format
 msgid ""
 "To specify the directly accessible BDAs, the container should provide an "
@@ -246,7 +223,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:138
 #, no-c-format
 msgid ""
 "Weld allows the container to describe a circular graph, and will convert a "
@@ -254,7 +230,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:144
 #, no-c-format
 msgid ""
 "Certain services are provided for the whole deployment, whilst some are "
@@ -264,13 +239,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:153
 #, no-c-format
 msgid "EJB descriptors"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:155
 #, no-c-format
 msgid ""
 "Weld delegates EJB 3 bean discovery to the container so that it doesn't "
@@ -279,7 +252,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:160
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>EjbDescriptor</literal> should return the relevant metadata as "
@@ -294,13 +266,11 @@
 "Instanz des EJB verwendeten jndi-Namens enthaltend)."
 
 #. Tag: title
-#: ri-spi.xml:169
 #, no-c-format
 msgid "EE resource injection and resolution services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:171
 #, no-c-format
 msgid ""
 "All the EE resource services are per-BDA services, and may be provided using "
@@ -309,37 +279,33 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:176
 #, no-c-format
 msgid ""
 "The integrator may choose to provide all EE resource injection services "
 "themselves, using another library or framework. In this case the integrator "
 "should use the <literal>EE</literal> environment, and implement the <xref "
-"linkend=\"injection.services\"/> SPI."
+"linkend=\"injection.services\" /> SPI."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:182
 #, no-c-format
 msgid ""
 "Alternatively, the integrator may choose to use CDI to provide EE resource "
 "injection. In this case, the <literal>EE_INJECT</literal> environment should "
 "be used, and the integrator should implement the <xref linkend=\"ejb."
-"services.resolution\"/>, <xref linkend=\"resource.services\"/> and <xref "
-"linkend=\"jpa.services\"/>."
+"services.resolution\" />, <xref linkend=\"resource.services\" /> and <xref "
+"linkend=\"jpa.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:189
 #, no-c-format
 msgid ""
 "CDI only provides annotation-based EE resource injection; if you wish to "
 "provide deployment descriptor (e.g. <literal>ejb-jar.xml</literal>) "
-"injection, you must use <xref linkend=\"injection.services\"/>."
+"injection, you must use <xref linkend=\"injection.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:195
 #, no-c-format
 msgid ""
 "If the container performs EE resource injection, the injected resources must "
@@ -348,7 +314,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:201
 #, no-c-format
 msgid ""
 "If you use a non-EE environment then you may implement any of the EE service "
@@ -357,49 +322,50 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:210
 #, no-c-format
 msgid "EJB services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:212
 #, no-c-format
 msgid "EJB services are split between two interfaces which are both per-BDA."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:216
 #, no-c-format
 msgid ""
 "<literal>EJBServices</literal> is used to resolve local EJBs used to back "
 "session beans, and must always be provided in an EE environment. "
 "<literal>EJBServices.resolveEjb(EjbDescriptor ejbDescriptor)</literal> "
-"returns a wrapper&#8212;<literal>SessionObjectReference</literal>&#8212;"
-"around the EJB reference. This wrapper allows Weld to request a reference "
-"that implements the given business interface, and, in the case of SFSBs, "
-"both request the removal of the EJB from the container and query whether the "
-"EJB has been previously removed."
+"returns a wrapper—<literal>SessionObjectReference</literal>—around the EJB "
+"reference. This wrapper allows Weld to request a reference that implements "
+"the given business interface, and, in the case of SFSBs, both request the "
+"removal of the EJB from the container and query whether the EJB has been "
+"previously removed."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:225
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>EJBResolutionServices.resolveEjb(InjectionPoint ij)</literal> "
 "allows the resolution of <literal>@EJB</literal> (for injection into managed "
 "beans). This service is not required if the implementation of <xref linkend="
-"\"injection.services\"/> takes care of <literal>@EJB</literal> injection."
+"\"injection.services\" /> takes care of <literal>@EJB</literal> injection."
 msgstr ""
+"Die Auflösung von <literal>@EJB</literal>, <literal>@PersistenceContext</"
+"literal> und <literal>@Resource</literal> wird an den Container delegiert. "
+"Sie müssen eine Implemntierung von <literal>org.jboss.webbeans.ejb.spi."
+"EjbResolver</literal> bereitstellen, die diese Operationen liefert. Web "
+"Beans gibt an den <literal>javax.inject.manager.InjectionPoint</literal> "
+"weiter für den die Auflösung ist sowie den für jede Auflösungsanfrage "
+"verwendeten <literal>NamingContext</literal>."
 
 #. Tag: title
-#: ri-spi.xml:234
 #, no-c-format
 msgid "JPA services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:236
 #, no-c-format
 msgid ""
 "Just as EJB resolution is delegated to the container, resolution of "
@@ -409,23 +375,27 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:242
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "To allow JPA integration, the <literal>JpaServices</literal> interface "
 "should be implemented. This service is not required if the implementation of "
-"<xref linkend=\"injection.services\"/> takes care of "
+"<xref linkend=\"injection.services\" /> takes care of "
 "<literal>@PersistenceContext</literal> injection."
 msgstr ""
+"Die Auflösung von <literal>@EJB</literal>, <literal>@PersistenceContext</"
+"literal> und <literal>@Resource</literal> wird an den Container delegiert. "
+"Sie müssen eine Implemntierung von <literal>org.jboss.webbeans.ejb.spi."
+"EjbResolver</literal> bereitstellen, die diese Operationen liefert. Web "
+"Beans gibt an den <literal>javax.inject.manager.InjectionPoint</literal> "
+"weiter für den die Auflösung ist sowie den für jede Auflösungsanfrage "
+"verwendeten <literal>NamingContext</literal>."
 
 #. Tag: title
-#: ri-spi.xml:251
 #, no-c-format
 msgid "Transaction Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:253
 #, no-c-format
 msgid ""
 "Weld delegates JTA activities to the container. The SPI provides a couple "
@@ -434,7 +404,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:258
 #, no-c-format
 msgid ""
 "Any <literal>javax.transaction.Synchronization</literal> implementation may "
@@ -444,7 +413,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:264
 #, no-c-format
 msgid ""
 "To make it easier to determine whether or not a transaction is currently "
@@ -454,20 +422,18 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:272
 #, fuzzy, no-c-format
 msgid "Resource Services"
 msgstr "Laden von Ressourcen"
 
 #. Tag: para
-#: ri-spi.xml:274
 #, fuzzy, no-c-format
 msgid ""
 "The resolution of <literal>@Resource</literal> (for injection into managed "
 "beans) is delegated to the container. You must provide an implementation of "
 "<literal>ResourceServices</literal> which provides these operations. This "
 "service is not required if the implementation of <xref linkend=\"injection."
-"services\"/> takes care of <literal>@Resource</literal> injection."
+"services\" /> takes care of <literal>@Resource</literal> injection."
 msgstr ""
 "Die Auflösung von <literal>@EJB</literal>, <literal>@PersistenceContext</"
 "literal> und <literal>@Resource</literal> wird an den Container delegiert. "
@@ -478,13 +444,11 @@
 "verwendeten <literal>NamingContext</literal>."
 
 #. Tag: title
-#: ri-spi.xml:283
 #, fuzzy, no-c-format
 msgid "Injection Services"
 msgstr "Laden von Ressourcen"
 
 #. Tag: para
-#: ri-spi.xml:285
 #, no-c-format
 msgid ""
 "An integrator may wish to use <literal>InjectionServices</literal> to "
@@ -495,7 +459,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:291
 #, no-c-format
 msgid ""
 "<literal>InjectionServices</literal> provides a very simple contract, the "
@@ -506,7 +469,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:298
 #, no-c-format
 msgid ""
 "The <literal>InjectionContext</literal> can be used to discover additional "
@@ -517,13 +479,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:307
 #, fuzzy, no-c-format
 msgid "Security Services"
 msgstr "Laden von Ressourcen"
 
 #. Tag: para
-#: ri-spi.xml:309
 #, no-c-format
 msgid ""
 "In order to obtain the <literal>Principal</literal> representing the current "
@@ -532,13 +492,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:317
 #, no-c-format
 msgid "Bean Validation Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:319
 #, no-c-format
 msgid ""
 "In order to obtain the default <literal>ValidatorFactory</literal> for the "
@@ -547,13 +505,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:327
 #, no-c-format
 msgid "Identifying the BDA being addressed"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:329
 #, no-c-format
 msgid ""
 "When a client makes a request to an application which uses Weld, the request "
@@ -564,43 +520,39 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:337
 #, no-c-format
 msgid ""
-"Most Servlet contains use a classloader-per-WAR, this may provide a good way "
+"Most Servlet contains use a classloader-per-war, this may provide a good way "
 "to identify the BDA in use for web requests."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:343
 #, no-c-format
 msgid ""
 "When Weld needs to identify the BDA, it will use one of these services, "
 "depending on what is servicing the request:"
 msgstr ""
 
-#. Tag: literal
-#: ri-spi.xml:350
+#. Tag: term
 #, no-c-format
-msgid "ServletServices.getBeanDeploymentArchive(ServletContext ctx)"
+msgid ""
+"<literal>ServletServices.getBeanDeploymentArchive(ServletContext ctx)</"
+"literal>"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:352
 #, no-c-format
 msgid ""
-"Identify the WAR in use. The <literal>ServletContext</literal> is provided "
+"Identify the war in use. The <literal>ServletContext</literal> is provided "
 "for additional context."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:362
 #, no-c-format
 msgid "The bean store"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:364
 #, fuzzy, no-c-format
 msgid ""
 "Weld uses a map like structure to store bean instances - <literal>org.jboss."
@@ -615,13 +567,11 @@
 "helpers.ConcurrentHashMapBeanStore</literal> hilfreich."
 
 #. Tag: title
-#: ri-spi.xml:372
 #, no-c-format
 msgid "The application context"
 msgstr "Der Applikationskontext"
 
 #. Tag: para
-#: ri-spi.xml:374
 #, fuzzy, no-c-format
 msgid ""
 "Weld expects the Application Server or other container to provide the "
@@ -637,13 +587,11 @@
 "helpers.ConcurrentHashMapBeanStore</literal> hilfreich."
 
 #. Tag: title
-#: ri-spi.xml:383
 #, fuzzy, no-c-format
 msgid "Initialization and shutdown"
 msgstr "Bootstrap und Shutdown"
 
 #. Tag: para
-#: ri-spi.xml:384
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>org.jboss.weld.bootstrap.api.Bootstrap</literal> interface "
@@ -660,7 +608,6 @@
 "anfragen."
 
 #. Tag: para
-#: ri-spi.xml:391
 #, fuzzy, no-c-format
 msgid ""
 "The bootstrap is split into phases, container initialization, bean "
@@ -676,7 +623,6 @@
 "unter Verwendung von XML definierte Beans hinzu; und validiert alle Beans."
 
 #. Tag: para
-#: ri-spi.xml:398
 #, fuzzy, no-c-format
 msgid ""
 "To initialize the container, you call <literal>Bootstrap.startInitialization"
@@ -694,7 +640,6 @@
 "Sie diese setzen, ehe Sie <literal>initialize()</literal> aufrufen."
 
 #. Tag: para
-#: ri-spi.xml:405
 #, fuzzy, no-c-format
 msgid ""
 "Having called <literal>startInitialization()</literal>, the "
@@ -706,7 +651,6 @@
 "literal>."
 
 #. Tag: para
-#: ri-spi.xml:410
 #, no-c-format
 msgid ""
 "To deploy the discovered beans, call <literal>Bootstrap.deployBeans()</"
@@ -714,7 +658,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:414
 #, no-c-format
 msgid ""
 "To validate the deployed beans, call <literal>Bootstrap.validateBeans()</"
@@ -722,7 +665,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:418
 #, no-c-format
 msgid ""
 "To place the container into a state where it can service requests, call "
@@ -730,7 +672,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:423
 #, fuzzy, no-c-format
 msgid ""
 "To shutdown the container you call <literal>Bootstrap.shutdown()</literal>. "
@@ -741,13 +682,11 @@
 "Bereinigungsvorgänge durchzuführen."
 
 #. Tag: title
-#: ri-spi.xml:431
 #, no-c-format
 msgid "Resource loading"
 msgstr "Laden von Ressourcen"
 
 #. Tag: para
-#: ri-spi.xml:433
 #, fuzzy, no-c-format
 msgid ""
 "Weld needs to load classes and resources from the classpath at various "
@@ -764,13 +703,11 @@
 "implementieren:"
 
 #. Tag: title
-#: ri-spi.xml:445
 #, no-c-format
 msgid "The contract with the container"
 msgstr "Der Vertrag mit dem Container"
 
 #. Tag: para
-#: ri-spi.xml:447
 #, fuzzy, no-c-format
 msgid ""
 "There are a number of requirements that Weld places on the container for "
@@ -781,13 +718,11 @@
 "von Implementierung von APIs fallen."
 
 #. Tag: term
-#: ri-spi.xml:454
 #, no-c-format
 msgid "Classloader isolation"
 msgstr "Klassenlader-Isolierung"
 
 #. Tag: para
-#: ri-spi.xml:458
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into an environment that supports deployment of "
@@ -800,13 +735,11 @@
 "Anwendung aktivieren."
 
 #. Tag: term
-#: ri-spi.xml:466
 #, no-c-format
 msgid "Servlet"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:470
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a Servlet environment you must register "
@@ -821,7 +754,6 @@
 "Applikation erfolgen."
 
 #. Tag: para
-#: ri-spi.xml:475
 #, no-c-format
 msgid ""
 "You must ensure that that <literal>WeldListener.contextInitialized()</"
@@ -830,13 +762,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:482
 #, no-c-format
-msgid "<term>JSF</term>"
+msgid "JSF"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:487
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -849,7 +779,6 @@
 "Applikation erfolgen."
 
 #. Tag: para
-#: ri-spi.xml:492
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -863,7 +792,6 @@
 "Applikation erfolgen."
 
 #. Tag: para
-#: ri-spi.xml:497
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -877,7 +805,6 @@
 "Applikation erfolgen."
 
 #. Tag: para
-#: ri-spi.xml:502
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -889,7 +816,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:509
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -899,7 +825,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:516 ri-spi.xml:562
 #, no-c-format
 msgid ""
 "There are a number of ways you can obtain the bean manager for the module. "
@@ -909,7 +834,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:523
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -925,19 +849,16 @@
 "Applikation erfolgen."
 
 #. Tag: para
-#: ri-spi.xml:531
 #, no-c-format
 msgid "Weld only supports JSF 1.2 and above."
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:538
 #, no-c-format
-msgid "<term>JSP</term>"
+msgid "JSP"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:543
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must register "
@@ -951,7 +872,6 @@
 "Applikation erfolgen."
 
 #. Tag: para
-#: ri-spi.xml:548
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -962,7 +882,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:555
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -972,20 +891,20 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:572
 #, no-c-format
 msgid "Session Bean Interceptor"
 msgstr "Session Bean Interzeptor"
 
 #. Tag: para
-#: ri-spi.xml:576
 #, fuzzy, no-c-format
 msgid ""
-"If you are integrating Weld into an EJB environment you must register "
-"<literal>org.jboss.weld.ejb.SessionBeanInterceptor</literal> as a EJB "
-"interceptor for all EJBs in the application, either automatically, or "
-"through user configuration, for each CDI application which uses enterprise "
-"beans."
+"If you are integrating Weld into an EJB environment you must register the "
+"<literal>aroundInvoke</literal> method of <literal>org.jboss.weld.ejb."
+"SessionBeanInterceptor</literal> as a EJB around-invoke interceptor for all "
+"EJBs in the application, either automatically, or through user "
+"configuration, for each CDI application which uses enterprise beans. If you "
+"are running in a EJB 3.1 environment, you should register this as an around-"
+"timeout interceptor as well."
 msgstr ""
 "Falls Sie Web Beans in eine EJB Umgebung integrieren, müssen Sie "
 "<literal>org.jboss.webbeans.ejb.SessionBeanInterceptor</literal> als einen "
@@ -994,7 +913,6 @@
 "Enterprise Beans benutzende Web Beans Applikation erfolgen."
 
 #. Tag: para
-#: ri-spi.xml:583
 #, no-c-format
 msgid ""
 "You must register the <literal>SessionBeanInterceptor</literal> as the inner "
@@ -1002,13 +920,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:591
 #, fuzzy, no-c-format
 msgid "The <literal>weld-core.jar</literal>"
 msgstr "Die <literal>webbeans-ri.jar</literal>"
 
 #. Tag: para
-#: ri-spi.xml:595
 #, no-c-format
 msgid ""
 "Weld can reside on an isolated classloader, or on a shared classloader. If "
@@ -1020,7 +936,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:601
 #, no-c-format
 msgid ""
 "You can provide your own implementation of <literal>Singleton</literal> and "
@@ -1029,7 +944,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:606
 #, no-c-format
 msgid ""
 "Weld also provides an implementation of Thread Context Classloader per "
@@ -1037,13 +951,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:613
 #, no-c-format
 msgid "Binding the manager in JNDI"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:617
 #, no-c-format
 msgid ""
 "You should bind the bean manager for the bean deployment archive into JNDI "
@@ -1054,13 +966,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:627
 #, no-c-format
 msgid "Performing CDI injection on Java EE component classes"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:631
 #, no-c-format
 msgid ""
 "The CDI specification requires the container to provide injection into non-"
@@ -1072,7 +982,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:639
 #, no-c-format
 msgid ""
 "The CDI specification also requires that a <literal>ProcessInjectionTarget</"
@@ -1083,7 +992,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:646
 #, no-c-format
 msgid ""
 "To help the integrator, Weld provides <literal>WeldManager."
@@ -1091,36 +999,7 @@
 "<literal>InjectionTarget</literal> to use."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:651
-#, no-c-format
-msgid ""
-"<![CDATA[// Fire ProcessInjectionTarget, returning the InjectionTarget\n"
-"// to use\n"
-"InjectionTarget it = weldBeanManager.fireProcessInjectionTarget(clazz);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = beanManager.createCreationalContext(null);\n"
-"\n"
-"// Produce the instance, performing any constructor injection required\n"
-"Object instance = it.produce();\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
-
 #. Tag: para
-#: ri-spi.xml:652
 #, no-c-format
 msgid ""
 "The container may intersperse other operations between these calls. Further, "
@@ -1129,7 +1008,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:656
 #, no-c-format
 msgid ""
 "When performing injections on EJBs you must use the Weld-defined SPI, "
@@ -1138,42 +1016,6 @@
 "EJB."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:661
-#, no-c-format
-msgid ""
-"<![CDATA[// Obtain the EjbDescriptor for the EJB\n"
-"// You may choose to use this utility method to get the descriptor\n"
-"EjbDescriptor<?> ejbDescriptor = beanManager.getEjbDescriptor(ejbName);\n"
-"\n"
-"// Get an the Bean object\n"
-"Bean<?> bean = beanManager.getBean(ejbDescriptor);\n"
-"\n"
-"// Create the injection target\n"
-"InjectionTarget it = deploymentBeanManager.createInjectionTarget"
-"(ejbDescriptor);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = deploymentBeanManager.createCreationalContext"
-"(bean);\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// You may choose to have CDI call the post construct and pre destroy\n"
-"// lifecycle callbacks\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
-
 #, fuzzy
 #~ msgid ""
 #~ "Currently Web Beans only runs in JBoss AS 5; integrating the RI into "

Modified: doc/trunk/reference/de-DE/scopescontexts.po
===================================================================
--- doc/trunk/reference/de-DE/scopescontexts.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/scopescontexts.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: scopescontexts\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-05 17:54+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,13 +16,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: scopescontexts.xml:5
 #, no-c-format
 msgid "Scopes and contexts"
 msgstr "Geltungsbereiche und Kontexte"
 
 #. Tag: para
-#: scopescontexts.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "So far, we've seen a few examples of <emphasis>scope type annotations</"
@@ -37,7 +35,6 @@
 "beziehen. Gemäß der Web Beans Spezifikation bestimmt ein Geltungsbereich:"
 
 #. Tag: para
-#: scopescontexts.xml:16
 #, fuzzy, no-c-format
 msgid "When a new instance of any bean with that scope is created"
 msgstr ""
@@ -45,7 +42,6 @@
 "erstellt wird"
 
 #. Tag: para
-#: scopescontexts.xml:19
 #, fuzzy, no-c-format
 msgid "When an existing instance of any bean with that scope is destroyed"
 msgstr ""
@@ -53,7 +49,6 @@
 "Geltungsbereich gelöscht wird"
 
 #. Tag: para
-#: scopescontexts.xml:22
 #, fuzzy, no-c-format
 msgid ""
 "Which injected references refer to any instance of a bean with that scope"
@@ -62,7 +57,6 @@
 "mit diesem Geltungsbereich verweisen"
 
 #. Tag: para
-#: scopescontexts.xml:27
 #, fuzzy, no-c-format
 msgid ""
 "For example, if we have a session-scoped bean, <literal>CurrentUser</"
@@ -80,7 +74,6 @@
 "und automatisch gelöscht, wenn die Session endet."
 
 #. Tag: para
-#: scopescontexts.xml:35
 #, no-c-format
 msgid ""
 "JPA entities aren't a great fit for this model. Entities have their whole "
@@ -93,13 +86,11 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:45
 #, no-c-format
 msgid "Scope types"
 msgstr "Typen von Geltungsbereichen"
 
 #. Tag: para
-#: scopescontexts.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "CDI features an <emphasis>extensible context model</emphasis>. It's possible "
@@ -109,22 +100,7 @@
 "ist möglich, neue Geltungsbereiche zu definieren, indem man eine neue "
 "Annotation für einen Geltungsbereich-Typ erstellt:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ScopeType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"public @interface ClusterScoped {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"@ScopeType\n"
-"public @interface ClusterScoped {}]]>"
-
 #. Tag: para
-#: scopescontexts.xml:54
 #, fuzzy, no-c-format
 msgid ""
 "Of course, that's the easy part of the job. For this scope type to be "
@@ -141,7 +117,6 @@
 "technisches Unterfangen, das nur für Framework-Entwicklung vorgesehen ist."
 
 #. Tag: para
-#: scopescontexts.xml:61
 #, fuzzy, no-c-format
 msgid ""
 "We can apply a scope type annotation to a bean implementation class to "
@@ -151,18 +126,7 @@
 "Implementierungsklasse anwenden, um den Geltungsbereich des Web Beans "
 "festzulegen:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-msgstr ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:67
 #, fuzzy, no-c-format
 msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr ""
@@ -170,49 +134,41 @@
 "Beans."
 
 #. Tag: title
-#: scopescontexts.xml:72
 #, no-c-format
 msgid "Built-in scopes"
 msgstr "Eingebaute Geltungsbereiche"
 
 #. Tag: para
-#: scopescontexts.xml:74
 #, fuzzy, no-c-format
 msgid "CDI defines four built-in scopes:"
 msgstr "Web Beans definiert vier eingebaute Geltungsbereiche:"
 
-#. Tag: literal
-#: scopescontexts.xml:78
-#, no-c-format
-msgid "@RequestScoped"
-msgstr "@RequestScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@RequestScoped</literal>"
+msgstr "Die <literal>@New</literal>-Annotation"
 
-#. Tag: literal
-#: scopescontexts.xml:81
-#, no-c-format
-msgid "@SessionScoped"
-msgstr "@SessionScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@SessionScoped</literal>"
+msgstr "Die <literal>@New</literal>-Annotation"
 
-#. Tag: literal
-#: scopescontexts.xml:84
-#, no-c-format
-msgid "@ApplicationScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@ApplicationScoped</literal>"
 msgstr "@ApplicationScoped"
 
-#. Tag: literal
-#: scopescontexts.xml:87
-#, no-c-format
-msgid "@ConversationScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@ConversationScoped</literal>"
 msgstr "@ConversationScoped"
 
 #. Tag: para
-#: scopescontexts.xml:91
 #, fuzzy, no-c-format
 msgid "For a web application that uses CDI:"
 msgstr "Für eine Web Beans verwendende Webanwendung:"
 
 #. Tag: para
-#: scopescontexts.xml:95
 #, no-c-format
 msgid ""
 "any servlet request has access to active request, session and application "
@@ -222,14 +178,12 @@
 "Geltungsbereiche der Anwendung und zusätzlich "
 
 #. Tag: para
-#: scopescontexts.xml:100
 #, no-c-format
 msgid "any JSF request has access to an active conversation scope."
 msgstr ""
 "hat jede JSF-Anfrage Zugriff auf einen aktiven Konversations-Geltungsbereich."
 
 #. Tag: para
-#: scopescontexts.xml:105
 #, no-c-format
 msgid ""
 "A CDI extension can implement support for the conversation scope in other "
@@ -237,49 +191,41 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:108
 #, no-c-format
 msgid "The request and application scopes are also active:"
 msgstr "Die Geltungsbereiche von Anfrage und Applikation sind ebenfalls aktiv:"
 
 #. Tag: para
-#: scopescontexts.xml:112
 #, no-c-format
 msgid "during invocations of EJB remote methods,"
 msgstr "während Aufrufen von EJB Remote-Methoden,"
 
 #. Tag: para
-#: scopescontexts.xml:115
 #, fuzzy, no-c-format
 msgid "during invocations of EJB asynchronous methods,"
 msgstr "während Aufrufen von EJB Remote-Methoden,"
 
 #. Tag: para
-#: scopescontexts.xml:118
 #, no-c-format
 msgid "during EJB timeouts,"
 msgstr "während EJB-Timeouts,"
 
 #. Tag: para
-#: scopescontexts.xml:121
 #, fuzzy, no-c-format
 msgid "during message delivery to a message-driven bean,"
 msgstr "während Message Delivery an ein message-betriebenes Bean und "
 
 #. Tag: para
-#: scopescontexts.xml:124
 #, fuzzy, no-c-format
 msgid "during message delivery to a <literal>MessageListener</literal>, and"
 msgstr "während Message Delivery an ein message-betriebenes Bean und "
 
 #. Tag: para
-#: scopescontexts.xml:127
 #, no-c-format
 msgid "during web service invocations."
 msgstr "während Aufrufen von Webdiensten."
 
 #. Tag: para
-#: scopescontexts.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "If the application tries to invoke a bean with a scope that does not have an "
@@ -291,7 +237,6 @@
 "literal> vom Web Bean Manager gemeldet."
 
 #. Tag: para
-#: scopescontexts.xml:136
 #, no-c-format
 msgid ""
 "Managed beans with scope <literal>@SessionScoped</literal> or "
@@ -300,7 +245,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:141
 #, no-c-format
 msgid ""
 "Three of the four built-in scopes should be extremely familiar to every Java "
@@ -312,13 +256,11 @@
 "Einer der Geltungsbereiche jedoch ist neu."
 
 #. Tag: title
-#: scopescontexts.xml:149
 #, no-c-format
 msgid "The conversation scope"
 msgstr "Der Geltungsbereich der Konversation"
 
 #. Tag: para
-#: scopescontexts.xml:151
 #, fuzzy, no-c-format
 msgid ""
 "The conversation scope is a bit like the traditional session scope in that "
@@ -333,13 +275,11 @@
 "Geltungsbereich der Konversation jedoch:"
 
 #. Tag: para
-#: scopescontexts.xml:159
 #, no-c-format
 msgid "is demarcated explicitly by the application, and"
 msgstr "ist explizit durch die Applikation demarkiert und "
 
 #. Tag: para
-#: scopescontexts.xml:162
 #, no-c-format
 msgid ""
 "holds state associated with a particular web browser tab in a JSF "
@@ -348,13 +288,12 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:169
 #, fuzzy, no-c-format
 msgid ""
-"A conversation represents a task&#8212;a unit of work from the point of view "
-"of the user. The conversation context holds state associated with what the "
-"user is currently working on. If the user is doing multiple things at the "
-"same time, there are multiple conversations."
+"A conversation represents a task—a unit of work from the point of view of "
+"the user. The conversation context holds state associated with what the user "
+"is currently working on. If the user is doing multiple things at the same "
+"time, there are multiple conversations."
 msgstr ""
 "Eine Konversation repräsentiert aus Perspektive des Benutzers eine Aufgabe, "
 "eine Arbeitseinheit. Der Konversationskontext enthält den Status dessen, "
@@ -362,7 +301,6 @@
 "mehreren Dingen, so existieren mehrere Konversationen."
 
 #. Tag: para
-#: scopescontexts.xml:175
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context is active during any JSF request. Most "
@@ -377,13 +315,11 @@
 "fortgepflanzt werden."
 
 #. Tag: title
-#: scopescontexts.xml:182
 #, no-c-format
 msgid "Conversation demarcation"
 msgstr "Konversationsdemarkierung"
 
 #. Tag: para
-#: scopescontexts.xml:184
 #, fuzzy, no-c-format
 msgid ""
 "CDI provides a built-in bean for controlling the lifecycle of conversations "
@@ -393,14 +329,7 @@
 "Lebenszyklus von Konversationen in einer JSF-Applikation. Dieses Web Bean "
 "kann durch Einspeisung erhalten werden:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:189
-#, fuzzy, no-c-format
-msgid "@Inject Conversation conversation;"
-msgstr "@Current Conversation Konversation;"
-
 #. Tag: para
-#: scopescontexts.xml:191
 #, no-c-format
 msgid ""
 "To promote the conversation associated with the current request to a long-"
@@ -416,7 +345,6 @@
 "terminieren, rufen Sie <literal>end()</literal> auf."
 
 #. Tag: para
-#: scopescontexts.xml:197
 #, fuzzy, no-c-format
 msgid ""
 "In the following example, a conversation-scoped bean controls the "
@@ -425,72 +353,7 @@
 "IIm folgenden Beispiel steuert ein konversationsbegrenztes Web Bean die "
 "Konversation, mit der es assoziiert ist:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:201
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"   private Order order;\n"
-"   private @Inject Conversation conversation;\n"
-"   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
-"   \n"
-"   @Produces public Order getOrder() {\n"
-"      return order;\n"
-"   }\n"
-"\n"
-"   public Order createOrder() {\n"
-"      order = new Order();\n"
-"      conversation.begin();\n"
-"      return order;\n"
-"   }\n"
-"   \n"
-"   public void addLineItem(Product product, int quantity) {\n"
-"      order.add(new LineItem(product, quantity));\n"
-"   }\n"
-"\n"
-"   public void saveOrder(Order order) {\n"
-"      em.persist(order);\n"
-"      conversation.end();\n"
-"   }\n"
-"   \n"
-"   @Remove\n"
-"   public void destroy() {}\n"
-"}]]>"
-msgstr ""
-"@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"\n"
-"    private Order order;\n"
-"    private @Current Conversation conversation;\n"
-"    private @PersistenceContext(type=EXTENDED) EntityManager em;\n"
-"    \n"
-"    @Produces public Order getOrder() {\n"
-"        return order;\n"
-"    }\n"
-"\n"
-"    public Order createOrder() {\n"
-"        order = new Order();\n"
-"        conversation.begin();\n"
-"        return order;\n"
-"    }\n"
-"    \n"
-"    public void addLineItem(Product product, int quantity) {\n"
-"        order.add( new LineItem(product, quantity) );\n"
-"    }\n"
-"\n"
-"    public void saveOrder(Order order) {\n"
-"        em.persist(order);\n"
-"        conversation.end();\n"
-"    }\n"
-"    \n"
-"    @Remove\n"
-"    public void destroy() {}\n"
-"    \n"
-"}"
-
 #. Tag: para
-#: scopescontexts.xml:203
 #, fuzzy, no-c-format
 msgid ""
 "This bean is able to control its own lifecycle through use of the "
@@ -503,13 +366,11 @@
 "Objekt abhängt."
 
 #. Tag: title
-#: scopescontexts.xml:211
 #, no-c-format
 msgid "Conversation propagation"
 msgstr "Konversationsfortpflanzung (Conversation Propagation)"
 
 #. Tag: para
-#: scopescontexts.xml:213
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context automatically propagates with any JSF faces request "
@@ -521,7 +382,6 @@
 "automatisch fortgepflanzt, zum Beispiel Navigation via einem Link."
 
 #. Tag: para
-#: scopescontexts.xml:218
 #, fuzzy, no-c-format
 msgid ""
 "We can force the conversation to propagate with a non-faces request by "
@@ -540,38 +400,16 @@
 "<literal>conversation</literal> besitzt."
 
 #. Tag: para
-#: scopescontexts.xml:225
 #, no-c-format
 msgid "Therefore, the following link propagates the conversation:"
 msgstr "Daher pflanzt das folgende Link die Konversation fort:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:229
-#, no-c-format
-msgid ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-msgstr ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-
 #. Tag: para
-#: scopescontexts.xml:231
 #, no-c-format
 msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:235
-#, no-c-format
-msgid ""
-"<![CDATA[<h:link outcome=\"/addProduct.xhtml value=\"Add Product\">\n"
-"   <f:param name=\"cid\" value=\"#{conversation.id}\"/>\n"
-"</h:link>]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:238
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context propagates across redirects, making it very easy to "
@@ -587,21 +425,19 @@
 "Manager automatisch einen Anfragenparameter hinzu, um die URL umzuleiten."
 
 #. Tag: title
-#: scopescontexts.xml:248
 #, no-c-format
 msgid "Conversation timeout"
 msgstr "Konversations-Timeout"
 
 #. Tag: para
-#: scopescontexts.xml:250
 #, fuzzy, no-c-format
 msgid ""
 "The container is permitted to destroy a conversation and all state held in "
 "its context at any time in order to conserve resources. A CDI implementation "
-"will normally do this on the basis of some kind of timeout&#8212;though this "
-"is not required by the specification. The timeout is the period of "
-"inactivity before the conversation is destroyed (as opposed to the amount of "
-"time the conversation is active)."
+"will normally do this on the basis of some kind of timeout—though this is "
+"not required by the specification. The timeout is the period of inactivity "
+"before the conversation is destroyed (as opposed to the amount of time the "
+"conversation is active)."
 msgstr ""
 "Dem Web Bean Manager ist gestattet, eine Konversation und alle Stati "
 "innerhalb seines Kontexts zu jedem Zeitpunkt zu löschen, um Ressourcen zu "
@@ -611,7 +447,6 @@
 "Zeitraum von Inaktivität, ehe die Konversation gelöscht wird."
 
 #. Tag: para
-#: scopescontexts.xml:257
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Conversation</literal> object provides a method to set the "
@@ -622,20 +457,12 @@
 "Timeout eingestellt werden kann. Dies ist ein Tipp an den Web Bean Manager, "
 "der die Einstellung ignorieren kann."
 
-#. Tag: programlisting
-#: scopescontexts.xml:262
-#, no-c-format
-msgid "conversation.setTimeout(timeoutInMillis);"
-msgstr "conversation.setTimeout(timeoutInMillis);"
-
 #. Tag: title
-#: scopescontexts.xml:269
 #, fuzzy, no-c-format
 msgid "The singleton pseudo-scope"
 msgstr "Der abhängige Pseudo-Geltungsbereich (\"Pseudo-Scope\")"
 
 #. Tag: para
-#: scopescontexts.xml:271
 #, fuzzy, no-c-format
 msgid ""
 "In addition to the four built-in scopes, CDI also supports two "
@@ -649,7 +476,6 @@
 "einen Typ von Geltungsbereich deklariert."
 
 #. Tag: para
-#: scopescontexts.xml:277
 #, no-c-format
 msgid ""
 "Unlike the other scopes, which belong to the package <literal>javax."
@@ -658,7 +484,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:283
 #, no-c-format
 msgid ""
 "You can guess what \"singleton\" means here. It means a bean that is "
@@ -673,7 +498,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:292
 #, no-c-format
 msgid ""
 "Now, if the singleton instance is a simple, immutable, serializable object "
@@ -684,7 +508,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:298
 #, no-c-format
 msgid ""
 "There are several ways to ensure that the singleton bean remains a singleton "
@@ -692,7 +515,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:302
 #, no-c-format
 msgid ""
 "have the singleton bean implement <literal>writeResolve()</literal> and "
@@ -701,7 +523,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:308
 #, no-c-format
 msgid ""
 "make sure the client keeps only a transient reference to the singleton bean, "
@@ -709,7 +530,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:313
 #, no-c-format
 msgid ""
 "give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
@@ -717,7 +537,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:320
 #, no-c-format
 msgid ""
 "A fourth, better solution is to instead use <literal>@ApplicationScoped</"
@@ -726,13 +545,11 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:326
 #, no-c-format
 msgid "The dependent pseudo-scope"
 msgstr "Der abhängige Pseudo-Geltungsbereich (\"Pseudo-Scope\")"
 
 #. Tag: para
-#: scopescontexts.xml:328
 #, fuzzy, no-c-format
 msgid ""
 "Finally, CDI features the so-called <emphasis>dependent pseudo-scope</"
@@ -745,7 +562,6 @@
 "einen Typ von Geltungsbereich deklariert."
 
 #. Tag: para
-#: scopescontexts.xml:333
 #, fuzzy, no-c-format
 msgid ""
 "For example, this bean has the scope type <literal>@Dependent</literal>:"
@@ -753,14 +569,7 @@
 "Zum Beispiel besitzt dieses Web Bean den Geltungsbereich-Typ "
 "<literal>@Dependent</literal>:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:337
-#, no-c-format
-msgid "<![CDATA[public class Calculator { ... }]]>"
-msgstr "<![CDATA[public class Calculator { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:339
 #, no-c-format
 msgid ""
 "An instance of a dependent bean is never shared between different clients or "
@@ -771,7 +580,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:345
 #, no-c-format
 msgid ""
 "If a Unified EL expression refers to a dependent bean by EL name, an "
@@ -780,7 +588,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:351
 #, no-c-format
 msgid ""
 "If you need to access a bean directly by EL name in a JSF page, you probably "
@@ -795,7 +602,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:361
 #, no-c-format
 msgid ""
 "Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
@@ -803,7 +609,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:366
 #, fuzzy, no-c-format
 msgid ""
 "CDI makes it easy to obtain a dependent instance of a bean, even if the bean "
@@ -815,27 +620,18 @@
 "deklariert sind."
 
 #. Tag: title
-#: scopescontexts.xml:374
 #, fuzzy, no-c-format
 msgid "The <literal>@New</literal> qualifier"
 msgstr "Die <literal>@New</literal>-Annotation"
 
 #. Tag: para
-#: scopescontexts.xml:376
 #, no-c-format
 msgid ""
 "The built-in qualifier <literal>@New</literal> allows us to obtain a "
 "dependent object of a specified class."
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:380
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
-msgstr "<![CDATA[@New Calculator calculator;]]>"
-
 #. Tag: para
-#: scopescontexts.xml:382
 #, no-c-format
 msgid ""
 "The class must be a valid managed bean or session bean, but need not be an "
@@ -843,7 +639,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:384
 #, fuzzy, no-c-format
 msgid ""
 "This works even if <literal>Calculator</literal> is <emphasis>already</"
@@ -853,18 +648,7 @@
 "emphasis> mit einem anderen Typ von Geltungsbereich definiert ist, zum "
 "Beispiel:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-msgstr ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:391
 #, no-c-format
 msgid ""
 "So the following injected attributes each get a different instance of "
@@ -873,24 +657,7 @@
 "Die folgenden eingespeisten Attribute erhalten also jeweils eine "
 "unterschiedliche Instanz von <literal>Calculator</literal>:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:395
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class PaymentCalc {\n"
-"   @Inject Calculator calculator;\n"
-"   @Inject @New Calculator newCalculator;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class PaymentCalc {\n"
-"\n"
-"    @Current Calculator calculator;\n"
-"    @New Calculator newCalculator;\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: scopescontexts.xml:397
 #, no-c-format
 msgid ""
 "The <literal>calculator</literal> field has a conversation-scoped instance "
@@ -905,7 +672,6 @@
 "den besitzenden <literal>PaymentCalc</literal> gebunden ist."
 
 #. Tag: para
-#: scopescontexts.xml:403
 #, no-c-format
 msgid ""
 "This feature is particularly useful with producer methods, as we'll see in "
@@ -914,7 +680,136 @@
 "Dieses Feature ist insbesondere im Zusammenhang mit Producer-Methoden von "
 "Nutzen, wie wir im folgenden Kapitel noch sehen werden."
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@ScopeType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD})\n"
+#~ "public @interface ClusterScoped {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD})\n"
+#~ "@ScopeType\n"
+#~ "public @interface ClusterScoped {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ClusterScoped\n"
+#~ "public class SecondLevelCache { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ClusterScoped\n"
+#~ "public class SecondLevelCache { ... }]]>"
+
+#~ msgid "@RequestScoped"
+#~ msgstr "@RequestScoped"
+
+#~ msgid "@SessionScoped"
+#~ msgstr "@SessionScoped"
+
+#, fuzzy
+#~ msgid "@Inject Conversation conversation;"
+#~ msgstr "@Current Conversation Konversation;"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ConversationScoped @Stateful\n"
+#~ "public class OrderBuilder {\n"
+#~ "   private Order order;\n"
+#~ "   private @Inject Conversation conversation;\n"
+#~ "   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
+#~ "   \n"
+#~ "   @Produces public Order getOrder() {\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public Order createOrder() {\n"
+#~ "      order = new Order();\n"
+#~ "      conversation.begin();\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void addLineItem(Product product, int quantity) {\n"
+#~ "      order.add(new LineItem(product, quantity));\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public void saveOrder(Order order) {\n"
+#~ "      em.persist(order);\n"
+#~ "      conversation.end();\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Remove\n"
+#~ "   public void destroy() {}\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@ConversationScoped @Stateful\n"
+#~ "public class OrderBuilder {\n"
+#~ "\n"
+#~ "    private Order order;\n"
+#~ "    private @Current Conversation conversation;\n"
+#~ "    private @PersistenceContext(type=EXTENDED) EntityManager em;\n"
+#~ "    \n"
+#~ "    @Produces public Order getOrder() {\n"
+#~ "        return order;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "    public Order createOrder() {\n"
+#~ "        order = new Order();\n"
+#~ "        conversation.begin();\n"
+#~ "        return order;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void addLineItem(Product product, int quantity) {\n"
+#~ "        order.add( new LineItem(product, quantity) );\n"
+#~ "    }\n"
+#~ "\n"
+#~ "    public void saveOrder(Order order) {\n"
+#~ "        em.persist(order);\n"
+#~ "        conversation.end();\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    @Remove\n"
+#~ "    public void destroy() {}\n"
+#~ "    \n"
+#~ "}"
+
+#~ msgid ""
+#~ "<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</"
+#~ "a>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</"
+#~ "a>]]>"
+
+#~ msgid "conversation.setTimeout(timeoutInMillis);"
+#~ msgstr "conversation.setTimeout(timeoutInMillis);"
+
+#~ msgid "<![CDATA[public class Calculator { ... }]]>"
+#~ msgstr "<![CDATA[public class Calculator { ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
+#~ msgstr "<![CDATA[@New Calculator calculator;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ConversationScoped\n"
+#~ "public class Calculator { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ConversationScoped\n"
+#~ "public class Calculator { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class PaymentCalc {\n"
+#~ "   @Inject Calculator calculator;\n"
+#~ "   @Inject @New Calculator newCalculator;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class PaymentCalc {\n"
+#~ "\n"
+#~ "    @Current Calculator calculator;\n"
+#~ "    @New Calculator newCalculator;\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "holds state associated with a particular web browser tab in a JSF "
 #~ "application."
 #~ msgstr ""

Modified: doc/trunk/reference/de-DE/specialization.po
===================================================================
--- doc/trunk/reference/de-DE/specialization.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/specialization.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: specialization\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-06 15:52+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,13 +16,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: specialization.xml:5
 #, no-c-format
 msgid "Specialization, inheritance and alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:7
 #, no-c-format
 msgid ""
 "When you first start developing with CDI, you'll likely be dealing only with "
@@ -37,7 +35,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:16
 #, no-c-format
 msgid ""
 "The CDI specification recognizes two distinct scenarios in which one bean "
@@ -45,7 +42,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:23
 #, no-c-format
 msgid ""
 "The second bean <emphasis>specializes</emphasis> the first bean in certain "
@@ -54,7 +50,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:29
 #, no-c-format
 msgid ""
 "The second bean is simply reusing the Java implementation, and otherwise "
@@ -63,7 +58,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:37
 #, no-c-format
 msgid ""
 "The second case is the default assumed by CDI. It's possible to have two "
@@ -73,7 +67,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:43
 #, no-c-format
 msgid ""
 "The first case is the exception, and also requires more care. In any given "
@@ -85,13 +78,11 @@
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:51
 #, no-c-format
 msgid "Using alternative stereotypes"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:53
 #, fuzzy, no-c-format
 msgid ""
 "CDI lets you <emphasis>override</emphasis> the implementation of a bean type "
@@ -105,23 +96,7 @@
 "folgende Enterprise Web Bean zum Beispiel liefert eine Implementierung der "
 "API <literal>PaymentProcessor</literal> in Production:"
 
-#. Tag: programlisting
-#: specialization.xml:59
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DefaultPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless\n"
-"public class CreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:61
 #, fuzzy, no-c-format
 msgid ""
 "But in our staging environment, we don't really want to submit payments to "
@@ -131,46 +106,12 @@
 "Aber in unserer Staging-Umgebung setzen wir diese Implementierung von "
 "<literal>PaymentProcessor</literal> mit einem anderen Web Bean außer Kraft:"
 
-#. Tag: programlisting
-#: specialization.xml:66
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless\n"
-"public class CreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:68
 #, no-c-format
-msgid "<para>or</para>"
+msgid "or"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:70
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      extends DefaultPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@Stateless @Staging @Specializes\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        extends CreditCardPaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:72
 #, no-c-format
 msgid ""
 "We've already seen how we can enable this alternative by listing its class "
@@ -178,7 +119,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:77
 #, no-c-format
 msgid ""
 "But suppose we have many alternatives in the staging environment. It would "
@@ -188,67 +128,21 @@
 "this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:84
-#, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Staging {}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:86
 #, no-c-format
 msgid ""
 "Then we replace the <literal>@Alternative</literal> annotation on our bean "
 "with <literal>@Staging</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:90
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Staging\n"
-"public class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless @Staging\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:92
 #, no-c-format
 msgid ""
 "Finally, we activate the <literal>@Staging</literal> stereotype in the "
 "<literal>beans.xml</literal> descriptor:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:96
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <stereotype>org.mycompany.myapp.Staging</stereotype>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:98
 #, no-c-format
 msgid ""
 "Now, no matter how many staging beans we have, they will all be enabled at "
@@ -256,13 +150,11 @@
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:105
 #, no-c-format
 msgid "A minor problem with alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:107
 #, no-c-format
 msgid ""
 "When we enable an alternative, does that mean the default implementation is "
@@ -271,15 +163,7 @@
 "not, you could still inject the default implementation."
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:113
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @LargeTransaction PaymentProcessor paymentProcessor;]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:115
 #, no-c-format
 msgid ""
 "So we haven't completely replaced the default implementation in this "
@@ -292,7 +176,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "CDI provides a special feature, called <emphasis>specialization</emphasis>, "
@@ -307,13 +190,11 @@
 "Sicherheit, die es bietet bald schätzen."
 
 #. Tag: title
-#: specialization.xml:132
 #, no-c-format
 msgid "Using specialization"
 msgstr "Verwendung von Spezialisierung"
 
 #. Tag: para
-#: specialization.xml:134
 #, no-c-format
 msgid ""
 "When the goal is to replace one bean implementation with a second, to help "
@@ -321,13 +202,11 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:141
 #, no-c-format
 msgid "directly extend the bean class of the second bean, or"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:146
 #, no-c-format
 msgid ""
 "directly override the producer method, in the case that the second bean is a "
@@ -335,7 +214,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:152
 #, fuzzy, no-c-format
 msgid ""
 "explicitly declare that it <emphasis>specializes</emphasis> the second bean:"
@@ -343,24 +221,7 @@
 "Wir sprechen davon, dass das Web Bean mit höherer Priorität seine "
 "Superklasse <emphasis>spezialisiert</emphasis>."
 
-#. Tag: programlisting
-#: specialization.xml:154
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Specializes\n"
-"public class MockCreditCardPaymentProcessor \n"
-"      extends CreditCardPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@Stateless @Staging @Specializes\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        extends CreditCardPaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:156
 #, no-c-format
 msgid ""
 "When an enabled bean specializes another bean, the other bean is never "
@@ -369,7 +230,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:161
 #, no-c-format
 msgid ""
 "So why does specialization work, and what does it have to do with "
@@ -377,7 +237,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:165
 #, no-c-format
 msgid ""
 "Since we're informing the container that our alternative bean is meant to "
@@ -389,7 +248,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:172
 #, no-c-format
 msgid ""
 "Furthermore, if the default implementation declares a bean EL name using "
@@ -397,6 +255,75 @@
 "alternative bean."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DefaultPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      extends DefaultPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Stateless @Staging @Specializes\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        extends CreditCardPaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Staging\n"
+#~ "public class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless @Staging\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative @Specializes\n"
+#~ "public class MockCreditCardPaymentProcessor \n"
+#~ "      extends CreditCardPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Stateless @Staging @Specializes\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        extends CreditCardPaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
 #~ msgid "Specialization"
 #~ msgstr "Specialization (Spezialisierung)"
 

Modified: doc/trunk/reference/de-DE/stereotypes.po
===================================================================
--- doc/trunk/reference/de-DE/stereotypes.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/stereotypes.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: stereotypes\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-06 16:50+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,19 +16,16 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: stereotypes.xml:5
 #, no-c-format
 msgid "Stereotypes"
 msgstr "Stereotypen"
 
 #. Tag: para
-#: stereotypes.xml:7
 #, no-c-format
 msgid "The CDI specification defines a stereotype as follows:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:11
 #, fuzzy, no-c-format
 msgid ""
 "In many systems, use of architectural patterns produces a set of recurring "
@@ -43,31 +40,26 @@
 "zentralen Stelle."
 
 #. Tag: para
-#: stereotypes.xml:17
 #, no-c-format
 msgid "A stereotype encapsulates any combination of:"
 msgstr "Ein Stereotyp beinhaltet eine beliebige Kombination von:"
 
 #. Tag: para
-#: stereotypes.xml:21
 #, fuzzy, no-c-format
 msgid "a default scope, and"
 msgstr "einem standardmäßigen Geltungsbereich-Typ,"
 
 #. Tag: para
-#: stereotypes.xml:24
 #, fuzzy, no-c-format
 msgid "a set of interceptor bindings."
 msgstr "einem Satz von Interzeptor Binding Annotationen."
 
 #. Tag: para
-#: stereotypes.xml:28
 #, no-c-format
 msgid "A stereotype may also specify that:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:34
 #, fuzzy, no-c-format
 msgid "all beans with the stereotype have defaulted bean EL names, or that"
 msgstr ""
@@ -75,13 +67,11 @@
 "standardmäßige Web Bean Namen besitzen."
 
 #. Tag: para
-#: stereotypes.xml:37
 #, no-c-format
 msgid "all beans with the stereotype are alternatives."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:41
 #, no-c-format
 msgid ""
 "A bean may declare zero, one or multiple stereotypes. Stereotype annotations "
@@ -89,7 +79,6 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype is an annotation, annotated <literal>@Stereotype</literal>, "
@@ -99,40 +88,13 @@
 "Bei einem Stereotyp handelt es sich um einen Java Annotationstyp. Dieses "
 "Stereotyp identifiziert Action-Klassen in einem MVC-Framework:"
 
-#. Tag: programlisting
-#: stereotypes.xml:53
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"...\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:55
 #, fuzzy, no-c-format
 msgid "We use the stereotype by applying the annotation to a bean."
 msgstr ""
 "Wir verwenden das Stereotyp durch Anwendung der Annotation an einem Web Bean."
 
-#. Tag: programlisting
-#: stereotypes.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-
 #. Tag: para
-#: stereotypes.xml:61
 #, no-c-format
 msgid ""
 "Of course, we need to apply some other annotations to our stereotype or else "
@@ -140,13 +102,11 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:66
 #, fuzzy, no-c-format
 msgid "Default scope for a stereotype"
 msgstr "Standardmäßiger Geltungsbereich und Deployment-Typ für ein Stereotyp"
 
 #. Tag: para
-#: stereotypes.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype may specify a default scope for beans annotated with the "
@@ -155,41 +115,14 @@
 "Ein Stereotyp kann auch festlegen, dass alle Web Beans mit dem Stereotyp "
 "standardmäßige Web Bean Namen besitzen."
 
-#. Tag: programlisting
-#: stereotypes.xml:72
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:74
 #, fuzzy, no-c-format
 msgid "A particular action may still override this default if necessary:"
 msgstr ""
 "Natürlich kann eine bestimmte Action diese Standards falls nötig immer noch "
 "außer Kraft setzen:"
 
-#. Tag: programlisting
-#: stereotypes.xml:78
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Dependent @Action \n"
-"public class DependentScopedLoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Dependent @Mock @Action \n"
-"public class MockLoginAction { ... }]]>"
-
 #. Tag: para
-#: stereotypes.xml:80
 #, no-c-format
 msgid ""
 "Naturally, overriding a single default isn't much use. But remember, "
@@ -197,13 +130,11 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:88
 #, no-c-format
 msgid "Interceptor bindings for stereotypes"
 msgstr "Interzeptor-Bindings für Stereotypen"
 
 #. Tag: para
-#: stereotypes.xml:90
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype may specify a set of interceptor bindings to be inherited by "
@@ -212,29 +143,7 @@
 "Ein Stereotyp kann einen Satz von Interzeptor-Bindings festlegen, der an "
 "alle Web Beans mit diesem Stereotyp vererbt werden soll."
 
-#. Tag: programlisting
-#: stereotypes.xml:94
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@WebTier\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "This helps us get technical concerns, like transactions and security, even "
@@ -244,13 +153,11 @@
 "technischer Probleme und Business Code!"
 
 #. Tag: title
-#: stereotypes.xml:103
 #, no-c-format
 msgid "Name defaulting with stereotypes"
 msgstr "Namensstandardisierung und Stereotype"
 
 #. Tag: para
-#: stereotypes.xml:105
 #, fuzzy, no-c-format
 msgid ""
 "We can specify that all beans with a certain stereotype have a defaulted EL "
@@ -264,31 +171,7 @@
 "wir tun müssen ist eine leere <literal>@Named</literal>-Annotation "
 "hinzuzufügen:"
 
-#. Tag: programlisting
-#: stereotypes.xml:110
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@WebTier\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:112
 #, fuzzy, no-c-format
 msgid ""
 "Now, the <literal>LoginAction</literal> bean will have the defaulted name "
@@ -298,13 +181,11 @@
 "literal>."
 
 #. Tag: title
-#: stereotypes.xml:119
 #, fuzzy, no-c-format
 msgid "Alternative stereotypes"
 msgstr "Standard-Stereotypen"
 
 #. Tag: para
-#: stereotypes.xml:121
 #, no-c-format
 msgid ""
 "A stereotype can indicate that all beans to which it is applied are "
@@ -312,47 +193,19 @@
 "emphasis> lets us classify beans by deployment scenario."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:126
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Mock {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:128
 #, no-c-format
 msgid ""
 "We can apply an alternative stereotype to a whole set of beans, and activate "
 "them all with one line of code in <literal>beans.xml</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:133
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Mock\n"
-"public class MockLoginAction extends LoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-
 #. Tag: title
-#: stereotypes.xml:141
 #, fuzzy, no-c-format
 msgid "Stereotype stacking"
 msgstr "Stereotypen"
 
 #. Tag: para
-#: stereotypes.xml:143
 #, no-c-format
 msgid ""
 "This may blow your mind a bit, but stereotypes may declare other "
@@ -363,39 +216,18 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:150
 #, no-c-format
 msgid ""
 "Here's an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:155
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Auditable\n"
-"@Action\n"
-"@Stereotype\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface AuditableAction {}]]>"
-msgstr ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {} ]]>"
-
 #. Tag: title
-#: stereotypes.xml:160
 #, fuzzy, no-c-format
 msgid "Built-in stereotypes"
 msgstr "Standard-Stereotypen"
 
 #. Tag: para
-#: stereotypes.xml:162
 #, fuzzy, no-c-format
 msgid ""
 "We've already met two standard stereotypes defined by the CDI specification: "
@@ -406,33 +238,13 @@
 "<literal>@Decorator</literal>."
 
 #. Tag: para
-#: stereotypes.xml:167
 #, no-c-format
 msgid ""
 "CDI defines one further standard stereotype, <literal>@Model</literal>, "
 "which is expected to be used frequently in web applications:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:172
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {}]]>"
-msgstr ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {} ]]>"
-
 #. Tag: para
-#: stereotypes.xml:174
 #, fuzzy, no-c-format
 msgid ""
 "Instead of using JSF managed beans, just annotate a bean <literal>@Model</"
@@ -442,6 +254,140 @@
 "gemanagte Beans zu verwenden, annotieren Sie ein Web Bean einfach "
 "<literal>@Model</literal>, und verwenden Sie es direkt in Ihrer JSF-Seite."
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "...\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Dependent @Action \n"
+#~ "public class DependentScopedLoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Dependent @Mock @Action \n"
+#~ "public class MockLoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@WebTier\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Named\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Named\n"
+#~ "@WebTier\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Mock {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Mock\n"
+#~ "public class MockLoginAction extends LoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Auditable\n"
+#~ "@Action\n"
+#~ "@Stereotype\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface AuditableAction {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {} ]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {} ]]>"
+
 #~ msgid "According to the Web Beans specification:"
 #~ msgstr "Gemäß der Web Beans Spezifikation:"
 

Modified: doc/trunk/reference/de-DE/viewlayers.po
===================================================================
--- doc/trunk/reference/de-DE/viewlayers.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/viewlayers.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-04-19 20:36+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,19 +15,16 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: viewlayers.xml:5
 #, no-c-format
 msgid "Alternative view layers"
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:8
 #, no-c-format
 msgid "Wicket CDI integration"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:10
 #, no-c-format
 msgid ""
 "Weld provides integration between the Apache Wicket web framework and CDI. "
@@ -37,7 +34,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:16
 #, no-c-format
 msgid ""
 "This section describes some of the utilities provided by the Wicket "
@@ -45,13 +41,11 @@
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:22
 #, no-c-format
 msgid "The <literal>WebApplication</literal> class"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:24
 #, no-c-format
 msgid ""
 "Each wicket application must have a <literal>WebApplication</literal> "
@@ -61,7 +55,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:31
 #, no-c-format
 msgid ""
 "If you would prefer not to subclass <literal>WeldApplication</literal>, you "
@@ -71,31 +64,16 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:38
 #, no-c-format
 msgid "For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: viewlayers.xml:41
-#, no-c-format
-msgid ""
-"<![CDATA[public class SampleApplication extends WeldApplication {\n"
-"   @Override\n"
-"   public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: viewlayers.xml:45
 #, no-c-format
 msgid "Conversations with Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:46
 #, no-c-format
 msgid ""
 "Wicket can also take advantage of the conversation scope from CDI, provided "
@@ -103,7 +81,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:52
 #, no-c-format
 msgid ""
 "Setting up the conversation context at the beginning of a Wicket request, "
@@ -111,7 +88,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:58
 #, no-c-format
 msgid ""
 "Storing the id of any long-running conversation in Wicket's metadata when "
@@ -119,7 +95,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:64
 #, no-c-format
 msgid ""
 "Activating the correct long-running conversation based upon which page is "
@@ -127,7 +102,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:69
 #, no-c-format
 msgid ""
 "Propagating the conversation context for any long-running conversation to "
@@ -135,13 +109,11 @@
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:76
 #, no-c-format
 msgid "Starting and stopping conversations in Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:77
 #, no-c-format
 msgid ""
 "As in JSF applications, a conversation <emphasis>always</emphasis> exists "
@@ -153,27 +125,12 @@
 "</literal> methods:"
 msgstr ""
 
-#. Tag: programlisting
-#: viewlayers.xml:86
-#, no-c-format
-msgid ""
-"<![CDATA[private @Inject Conversation conversation;\n"
-"...\n"
-"// begin a conversation\n"
-"conversation.begin();\n"
-"...\n"
-"// end a conversation\n"
-"conversation.end();]]>"
-msgstr ""
-
 #. Tag: title
-#: viewlayers.xml:91
 #, no-c-format
 msgid "Long running conversation propagation in Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:92
 #, no-c-format
 msgid ""
 "When a conversation is marked as long-running, the id of that conversation "

Modified: doc/trunk/reference/de-DE/weldexamples.po
===================================================================
--- doc/trunk/reference/de-DE/weldexamples.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/weldexamples.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: weldexamples.xml:5
 #, no-c-format
 msgid "Diving into the Weld examples"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:7
 #, no-c-format
 msgid ""
 "It's time to pull the covers back and dive into the internals of Weld "
@@ -29,13 +27,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:13
 #, no-c-format
 msgid "The numberguess example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:15
 #, no-c-format
 msgid ""
 "In the numberguess application you get 10 attempts to guess a number between "
@@ -44,16 +40,14 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:20
 #, no-c-format
 msgid ""
 "The numberguess example is comprised of a number of beans, configuration "
-"files and Facelets (JSF) views, packaged as a WAR module. Let's start by "
+"files and Facelets (JSF) views, packaged as a war module. Let's start by "
 "examining the configuration files."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:25
 #, no-c-format
 msgid ""
 "All the configuration files for this example are located in <literal>WEB-INF/"
@@ -64,21 +58,7 @@
 "to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:33
-#, no-c-format
-msgid ""
-"<![CDATA[<faces-config version=\"2.0\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd\">\n"
-"</faces-config>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:35
 #, no-c-format
 msgid ""
 "There's also an empty <literal>beans.xml</literal> file, which tells the "
@@ -87,212 +67,120 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:40
 #, no-c-format
 msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:42
+#. Tag: para
 #, no-c-format
+msgid "Enable and initialize the JSF servlet"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"faces.servlet\" coords=\"10\"/> "
-"<area id=\"faces.servlet.mapping\" coords=\"16\"/> <area id=\"faces.default."
-"suffix\" coords=\"21\"/> <area id=\"session.timeout\" coords=\"26\"/> </"
-"areaspec> <programlisting role=\"XML\"><![CDATA[<web-app version=\"2.5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n"
-"   \n"
-"   <display-name>weld-jsf-numberguess-war</display-name>\n"
-"   <description>Weld JSF numberguess example (WAR)</description>\n"
-"\n"
-"   <servlet>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>\n"
-"      <load-on-startup>1</load-on-startup>\n"
-"   </servlet>\n"
-"\n"
-"   <servlet-mapping>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <url-pattern>*.jsf</url-pattern>\n"
-"   </servlet-mapping>\n"
-"   \n"
-"   <context-param>\n"
-"      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>\n"
-"      <param-value>.xhtml</param-value>\n"
-"   </context-param>\n"
-"\n"
-"   <session-config>\n"
-"      <session-timeout>10</session-timeout>\n"
-"   </session-config>\n"
-"\n"
-"</web-app>]]></programlisting> <calloutlist> <callout arearefs=\"faces."
-"servlet\"> <para> Enable and initialize the JSF servlet </para> </callout> "
-"<callout arearefs=\"faces.servlet.mapping\"> <para> Configure requests for "
-"URLs ending in <literal>.jsf</literal> to be handled by JSF </para> </"
-"callout> <callout arearefs=\"faces.default.suffix\"> <para> Tell JSF that we "
-"will be giving our JSF views (Facelets templates) an extension of <literal>."
-"xhtml</literal> </para> </callout> <callout arearefs=\"session.timeout\"> "
-"<para> Configure a session timeout of 10 minutes </para> </callout> </"
-"calloutlist> </programlistingco> <note> <para> This demo uses JSF 2 as the "
-"view framework, but you can use Weld with any servlet-based web framework, "
-"such as JSF 1.2 or Wicket. </para> </note> <para> Let's take a look at the "
-"main JSF view, <literal>src/main/webapp/home.xhtml</literal>. </para> "
-"<programlistingco> <areaspec> <area id=\"template\" coords=\"8\"/> <area id="
-"\"statusMessages\" coords=\"12\"/> <area id=\"instructions\" coords=\"20\"/> "
-"<area id=\"guess\" coords=\"27\"/> <area id=\"validator\" coords=\"29\"/> "
-"<area id=\"submit\" coords=\"30\"/> </areaspec> <programlisting role=\"XML"
-"\"><![CDATA[<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN"
-"\"\n"
-"   \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
-"<html xmlns=\"http://www.w3.org/1999/xhtml\"\n"
-"   xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n"
-"   xmlns:h=\"http://java.sun.com/jsf/html\"\n"
-"   xmlns:f=\"http://java.sun.com/jsf/core\">\n"
-"\n"
-"   <ui:composition template=\"/template.xhtml\">\n"
-"      <ui:define name=\"content\">\n"
-"         <h1>Guess a number...</h1>\n"
-"         <h:form id=\"numberGuess\">\n"
-"            <div style=\"color: red\">\n"
-"               <h:messages id=\"messages\" globalOnly=\"false\"/>\n"
-"               <h:outputText id=\"Higher\" value=\"Higher!\"\n"
-"                  rendered=\"#{game.number gt game.guess and game.guess ne 0}"
-"\"/>\n"
-"               <h:outputText id=\"Lower\" value=\"Lower!\"\n"
-"                  rendered=\"#{game.number lt game.guess and game.guess ne 0}"
-"\"/>\n"
-"            </div>\n"
-"    \n"
-"            <div>\n"
-"               I'm thinking of a number between #{game.smallest} and #{game."
-"biggest}.\n"
-"               You have #{game.remainingGuesses} guesses remaining.\n"
-"            </div>\n"
-"       \n"
-"            <div>\n"
-"               Your guess: \n"
-"               <h:inputText id=\"inputGuess\" value=\"#{game.guess}\"\n"
-"                  size=\"3\" required=\"true\" disabled=\"#{game.number eq "
-"game.guess}\"\n"
-"                  validator=\"#{game.validateNumberRange}\"/>\n"
-"               <h:commandButton id=\"guessButton\" value=\"Guess\" \n"
-"                  action=\"#{game.check}\" disabled=\"#{game.number eq game."
-"guess}\"/>\n"
-"            </div>\n"
-"            <div>\n"
-"              <h:commandButton id=\"restartButton\" value=\"Reset\" action="
-"\"#{game.reset}\" immediate=\"true\"/>\n"
-"            </div>\n"
-"         </h:form>\n"
-"      </ui:define>\n"
-"   </ui:composition>\n"
-"</html>]]></programlisting> <calloutlist> <callout arearefs=\"template\"> "
-"<para> Facelets is the built-in templating language for JSF. Here we are "
-"wrapping our page in a template which defines the layout. </para> </callout> "
-"<callout arearefs=\"statusMessages\"> <para> There are a number of messages "
-"which can be sent to the user, \"Higher!\", \"Lower!\" and \"Correct!\" </"
-"para> </callout> <callout arearefs=\"instructions\"> <para> As the user "
-"guesses, the range of numbers they can guess gets smaller - this sentence "
-"changes to make sure they know the number range of a valid guess. </para> </"
-"callout> <callout arearefs=\"guess\"> <para> This input field is bound to a "
-"bean property using a value expression. </para> </callout> <callout arearefs="
-"\"validator\"> <para> A validator binding is used to make sure the user "
-"doesn't accidentally input a number outside of the range in which they can "
-"guess - if the validator wasn't here, the user might use up a guess on an "
-"out of bounds number. </para> </callout> <callout arearefs=\"submit\"> "
-"<para> And, of course, there must be a way for the user to send their guess "
-"to the server. Here we bind to an action method on the bean. </para> </"
-"callout> </calloutlist> </programlistingco>"
+"Configure requests for URLs ending in <literal>.jsf</literal> to be handled "
+"by JSF"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:142
 #, no-c-format
 msgid ""
-"The example exists of 4 classes, the first two of which are qualifiers. "
-"First, there is the <literal>@Random</literal> qualifier, used for injecting "
-"a random number:"
+"Tell JSF that we will be giving our JSF views (Facelets templates) an "
+"extension of <literal>.xhtml</literal>"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:147
+#. Tag: para
 #, no-c-format
+msgid "Configure a session timeout of 10 minutes"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Random {}]]>"
+"This demo uses JSF 2 as the view framework, but you can use Weld with any "
+"servlet-based web framework, such as JSF 1.2 or Wicket."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:149
 #, no-c-format
 msgid ""
-"There is also the <literal>@MaxNumber</literal> qualifier, used for "
-"injecting the maximum number that can be injected:"
+"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
+"literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:154
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface MaxNumber {}\n"
-"]]>"
+"Facelets is the built-in templating language for JSF. Here we are wrapping "
+"our page in a template which defines the layout."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:156
 #, no-c-format
 msgid ""
-"The application-scoped <literal>Generator</literal> class is responsible for "
-"creating the random number, via a producer method. It also exposes the "
-"maximum possible number via a producer method:"
+"There are a number of messages which can be sent to the user, \"Higher!\", "
+"\"Lower!\" and \"Correct!\""
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:161
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class Generator implements Serializable {\n"
-"\n"
-"   private java.util.Random random = new java.util.Random(System."
-"currentTimeMillis());\n"
-"   \n"
-"   private int maxNumber = 100;\n"
-"   \n"
-"   java.util.Random getRandom() {\n"
-"      return random;\n"
-"   }\n"
-"   \n"
-"   @Produces @Random int next() { \n"
-"      return getRandom().nextInt(maxNumber); \n"
-"   }\n"
-"   \n"
-"   @Produces @MaxNumber int getMaxNumber() {\n"
-"      return maxNumber;\n"
-"   }\n"
-"\n"
-"}]]>"
+"As the user guesses, the range of numbers they can guess gets smaller - this "
+"sentence changes to make sure they know the number range of a valid guess."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:163
 #, no-c-format
+msgid "This input field is bound to a bean property using a value expression."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
+"A validator binding is used to make sure the user doesn't accidentally input "
+"a number outside of the range in which they can guess - if the validator "
+"wasn't here, the user might use up a guess on an out of bounds number."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"And, of course, there must be a way for the user to send their guess to the "
+"server. Here we bind to an action method on the bean."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The example exists of 4 classes, the first two of which are qualifiers. "
+"First, there is the <literal>@Random</literal> qualifier, used for injecting "
+"a random number:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"There is also the <literal>@MaxNumber</literal> qualifier, used for "
+"injecting the maximum number that can be injected:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The application-scoped <literal>Generator</literal> class is responsible for "
+"creating the random number, via a producer method. It also exposes the "
+"maximum possible number via a producer method:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The <literal>Generator</literal> is application scoped, so we don't get a "
 "different random each time."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:168
 #, no-c-format
 msgid ""
 "The package declaration and imports have been excluded from these listings. "
@@ -300,7 +188,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:174
 #, no-c-format
 msgid ""
 "The final bean in the application is the session-scoped <literal>Game</"
@@ -313,7 +200,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:182
 #, no-c-format
 msgid ""
 "You'll notice that we've also added the <literal>@Named</literal> annotation "
@@ -321,123 +207,32 @@
 "bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:187
-#, no-c-format
-msgid ""
-"<![CDATA[@Named\n"
-"@SessionScoped\n"
-"public class Game implements Serializable {\n"
-"\n"
-"   private int number;\n"
-"   private int guess;\n"
-"   private int smallest;\n"
-"   private int biggest;\n"
-"   private int remainingGuesses;\n"
-"\n"
-"   @Inject @MaxNumber private int maxNumber;\n"
-"   @Inject @Random Instance<Integer> randomNumber;\n"
-"   \n"
-"   public Game() {}\n"
-"   \n"
-"   public void check() {\n"
-"      if (guess > number) {\n"
-"         biggest = guess - 1;\n"
-"      }\n"
-"      else if (guess < number) {\n"
-"         smallest = guess + 1;\n"
-"      }\n"
-"      else if (guess == number) {\n"
-"         FacesContext.getCurrentInstance().addMessage(null, new FacesMessage"
-"(\"Correct!\"));\n"
-"      }\n"
-"      remainingGuesses--;\n"
-"   }\n"
-"   \n"
-"   @PostConstruct\n"
-"   public void reset() {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = randomNumber.get();\n"
-"   }\n"
-"   \n"
-"   public void validateNumberRange(FacesContext context,  UIComponent "
-"toValidate, Object value) {\n"
-"      if (remainingGuesses <= 0) {\n"
-"         FacesMessage message = new FacesMessage(\"No guesses left!\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"         return;\n"
-"      }\n"
-"      int input = (Integer) value;\n"
-"\n"
-"      if (input < smallest || input > biggest) {\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"\n"
-"         FacesMessage message = new FacesMessage(\"Invalid guess\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"      }\n"
-"   }\n"
-"\n"
-"   public int getNumber() {\n"
-"      return number;\n"
-"   }\n"
-"   \n"
-"   public int getGuess() {\n"
-"      return guess;\n"
-"   }\n"
-"   \n"
-"   public void setGuess(int guess) {\n"
-"      this.guess = guess;\n"
-"   }\n"
-"   \n"
-"   public int getSmallest() {\n"
-"      return smallest;\n"
-"   }\n"
-"   \n"
-"   public int getBiggest() {\n"
-"      return biggest;\n"
-"   }\n"
-"   \n"
-"   public int getRemainingGuesses() {\n"
-"      return remainingGuesses;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: weldexamples.xml:190
 #, no-c-format
 msgid "The numberguess example in Apache Tomcat or Jetty"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:192
 #, no-c-format
 msgid ""
 "A couple of modifications must be made to the numberguess artifact in order "
 "to deploy it to Tomcat or Jetty. First, Weld must be deployed as a Web "
 "Application library under <literal>WEB-INF/lib</literal> since the servlet "
 "container does not provide the CDI services. For your convenience we provide "
-"a single JAR suitable for running Weld in any servlet container (including "
+"a single jar suitable for running Weld in any servlet container (including "
 "Jetty), <literal>weld-servlet.jar</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:200
 #, no-c-format
 msgid ""
-"You must also include the JARs for JSF, EL, and the common annotations "
+"You must also include the jars for JSF, EL, and the common annotations "
 "(<literal>jsr250-api.jar</literal>), all of which are provided by the Java "
 "EE platform (a Java EE application server). Are you starting to appreciate "
 "why a Java EE platform is worth using?"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:207
 #, no-c-format
 msgid ""
 "Second, we need to explicitly specify the servlet listener in <literal>web."
@@ -445,18 +240,7 @@
 "The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:213
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:215
 #, no-c-format
 msgid ""
 "When Weld boots, it places the <literal>javax.enterprise.inject.spi."
@@ -467,13 +251,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:226
 #, no-c-format
 msgid "The numberguess example for Apache Wicket"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:227
 #, no-c-format
 msgid ""
 "Weld includes a number of portable extensions for JSR-299, including an "
@@ -483,7 +265,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:234
 #, no-c-format
 msgid ""
 "You may want to review the Wicket documentation at <ulink url=\"http://"
@@ -492,7 +273,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:241
 #, no-c-format
 msgid ""
 "Wicket is another environment that relies on the Weld servlet extension. The "
@@ -503,7 +283,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:249
 #, no-c-format
 msgid ""
 "We'll also be using the Eclipse IDE in these examples. Instructions are "
@@ -513,13 +292,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:257
 #, no-c-format
 msgid "Creating the Eclipse project"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:259
 #, no-c-format
 msgid ""
 "To use the Wicket example in Eclipse, you have one of two choices. You can "
@@ -531,17 +308,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:267
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -> Import... -> Maven Projects</"
-"emphasis>. Then, browse to the location of the Wicket numberguess example. "
-"You should see that Eclipse recognizes the existence of a Maven project."
+"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
+"Projects</emphasis>. Then, browse to the location of the Wicket numberguess "
+"example. You should see that Eclipse recognizes the existence of a Maven "
+"project."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:279
 #, no-c-format
 msgid ""
 "This will create a project in your workspace called <literal>weld-wicket-"
@@ -549,7 +325,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:283
 #, no-c-format
 msgid ""
 "You'll notice after importing, the project has a build error. That's because "
@@ -557,21 +332,24 @@
 "<emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> "
 "tab in the window that appears. In the form field labeled \"Active Maven "
 "Profiles (comma separated):\", type <literal>jetty</literal>. That will "
-"enable some extra dependencies that allow the project to compile. You're now "
-"ready to develop!"
+"enable some extra dependencies that allow the project to compile. "
+"Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven "
+"compile plugin when processing resources (recommended)\". That solves an "
+"incompatiblity between the m2eclipse plugin and the Maven enforcer plugin "
+"that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:292
 #, no-c-format
 msgid ""
-"You are also advised to uncheck the box \"Skip Maven compiler when "
-"processing resources\" in the Maven properties screen because of conflicts "
-"with the Maven enforcer plugin."
+"Be sure to uncheck the box \"Skip Maven compile plugin when processing "
+"resources (recommended)\" in the Maven properties screen or else the example "
+"might not run in Eclipse because beans.xml will be missing from the "
+"classpath! See the <ulink url=\"https://issues.sonatype.org/browse/"
+"MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:298
 #, no-c-format
 msgid ""
 "If you are not using the m2eclipse plugin, you have to follow different "
@@ -580,38 +358,26 @@
 "activated, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:304
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/wicket/numberguess\n"
-"mvn -Pjetty eclipse:eclipse]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:306
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -> Import... -> General -> "
-"Existing Projects into Workspace</emphasis>, select the root directory of "
-"the numberguess example, and click Finish. This will create a project in "
+"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
+"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
+"of the numberguess example, and click Finish. This will create a project in "
 "your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:318
 #, no-c-format
 msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:325
 #, no-c-format
 msgid "Running the example from Eclipse"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:327
 #, no-c-format
 msgid ""
 "This project follows the <literal>wicket-quickstart</literal> approach of "
@@ -626,13 +392,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:338
 #, no-c-format
 msgid "Running the example from the command line in JBoss AS or Tomcat"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:340
 #, no-c-format
 msgid ""
 "This example can also be deployed from the command line in a (similar to the "
@@ -642,26 +406,12 @@
 "run:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:346
-#, no-c-format
-msgid "<![CDATA[$> ant deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:348
 #, no-c-format
 msgid "to deploy the example to JBoss AS, and:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:350
-#, no-c-format
-msgid "<![CDATA[$> ant tomcat.deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:352
 #, no-c-format
 msgid ""
 "to deploy the example to Tomcat. You can then access application at <ulink "
@@ -670,33 +420,23 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:357
 #, no-c-format
 msgid ""
 "Alternatively, you can run the application in place on an embedded Jetty "
 "container using the following Maven command:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:362
-#, no-c-format
-msgid "<![CDATA[$> mvn jetty:run -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:364
 #, no-c-format
 msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:371
 #, no-c-format
 msgid "Understanding the code"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:373
 #, no-c-format
 msgid ""
 "The code in the wicket numberguess example is very similar to the JSF-based "
@@ -710,7 +450,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:382
 #, no-c-format
 msgid ""
 "The integration of Weld with Wicket takes advantage of the same qualifier "
@@ -720,13 +459,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:388
 #, no-c-format
 msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:394
 #, no-c-format
 msgid ""
 "Each wicket application must have a <literal>WeldApplication</literal> "
@@ -734,19 +471,7 @@
 "<literal>NumberGuessApplication</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:398
-#, no-c-format
-msgid ""
-"<![CDATA[public class NumberGuessApplication extends WeldApplication {\n"
-"   @Override public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:399
 #, no-c-format
 msgid ""
 "This class specifies which page Wicket should treat as our home page, in our "
@@ -754,7 +479,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:405
 #, no-c-format
 msgid ""
 "In <literal>HomePage</literal>, we see typical Wicket code to set up page "
@@ -762,52 +486,14 @@
 "literal> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:410
-#, no-c-format
-msgid "<![CDATA[@Inject Game game;]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:412
 #, no-c-format
 msgid ""
 "The <literal>Game</literal> bean is can then be used, for example, by the "
 "code for submitting a guess:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:417
-#, no-c-format
-msgid ""
-"<![CDATA[final Component guessButton = new AjaxButton(\"GuessButton\") {\n"
-"   protected void onSubmit(AjaxRequestTarget target, Form form) {\n"
-"      if (game.check()) {\n"
-"         info(\"Correct!\");\n"
-"         setVisible(false);\n"
-"         prompt.setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == 0) {\n"
-"         info(\"Sorry, the answer was \" + game.getNumber());\n"
-"         setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getNumber() > game.getGuess()) {\n"
-"         info(\"Higher!\");\n"
-"      }\n"
-"      else if (game.getNumber() < game.getGuess()) {\n"
-"         info(\"Lower\");\n"
-"      }\n"
-"      target.addComponent(form);\n"
-"   } \n"
-"};      ]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:420
 #, no-c-format
 msgid ""
 "All injections may be serialized; actual storage of the bean is managed by "
@@ -816,7 +502,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:425
 #, no-c-format
 msgid ""
 "Wicket components allow injection, but they <emphasis>cannot</emphasis> use "
@@ -826,7 +511,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:433
 #, no-c-format
 msgid ""
 "The example uses AJAX for processing of button events, and dynamically hides "
@@ -835,7 +519,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:440
 #, no-c-format
 msgid ""
 "In order to activate Wicket for this webapp, the Wicket filter is added to "
@@ -843,29 +526,7 @@
 "<literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:445
-#, no-c-format
-msgid ""
-"<![CDATA[<filter>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-"
-"class>\n"
-"   <init-param>\n"
-"      <param-name>applicationClassName</param-name>\n"
-"      <param-value>org.jboss.weld.examples.wicket.NumberGuessApplication</"
-"param-value>\n"
-"   </init-param>\n"
-"</filter>\n"
-"\n"
-"<filter-mapping>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <url-pattern>/*</url-pattern>\n"
-"</filter-mapping>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:447
 #, no-c-format
 msgid ""
 "The servlet listener is still required, as in the Tomcat example, to "
@@ -876,26 +537,12 @@
 "descriptor to be appended to the <literal>web.xml</literal> configuration."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:455
-#, no-c-format
-msgid ""
-"<![CDATA[<web-app version=\"2.4\" ...>\n"
-"   <listener>\n"
-"      <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"   </listener>\n"
-"</web-app>]]>"
-msgstr ""
-
 #. Tag: title
-#: weldexamples.xml:464
 #, no-c-format
 msgid "The numberguess example for Java SE with Swing"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:466
 #, no-c-format
 msgid ""
 "This example shows how to use the Weld SE extension to in a Java SE based "
@@ -905,19 +552,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:473
 #, no-c-format
 msgid "To run the example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:479
 #, no-c-format
 msgid "Ensure that Maven 2 (version 2.0.10+) is installed and in your PATH"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:484
 #, no-c-format
 msgid ""
 "Ensure that the <literal>JAVA_HOME</literal> environment variable is "
@@ -925,7 +569,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:490
 #, no-c-format
 msgid ""
 "Open a command line or terminal window in the <literal>examples/se/"
@@ -933,19 +576,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:496
 #, no-c-format
 msgid "Execute the following command"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:499
-#, no-c-format
-msgid "mvn -Drun"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:503
 #, no-c-format
 msgid ""
 "Let's have a look at the significant code and configuration files that make "
@@ -953,7 +588,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:508
 #, no-c-format
 msgid ""
 "As usual, there is an empty <literal>beans.xml</literal> file in the root "
@@ -962,7 +596,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:514
 #, no-c-format
 msgid ""
 "The game's main logic is located in <literal>Game.java</literal>. Here is "
@@ -970,293 +603,170 @@
 "the web application version:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:518
+#. Tag: para
 #, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"scope\" coords=\"1\"/> <area id="
-"\"name\" coords=\"2\"/> <area id=\"messages1\" coords=\"26\"/> <area id="
-"\"validation\" coords=\"41\"/> <area id=\"reset\" coords=\"73\"/> </"
-"areaspec> <programlisting role=\"JAVA\"><![CDATA[@ApplicationScoped\n"
-"public class Game\n"
-"{\n"
-"\n"
-"   public static final int MAX_NUM_GUESSES = 10;\n"
-"\n"
-"   private Integer number;\n"
-"   private int guess = 0;\n"
-"   private int smallest = 0;\n"
-"\n"
-"   @Inject\n"
-"   @MaxNumber\n"
-"   private int maxNumber;\n"
-"\n"
-"   private int biggest;\n"
-"   private int remainingGuesses = MAX_NUM_GUESSES;\n"
-"   private boolean validNumberRange = true;\n"
-"\n"
-"   @Inject\n"
-"   Generator rndGenerator;\n"
-"\n"
-"   public Game()\n"
-"   {\n"
-"   }\n"
-"\n"
-"   ...\n"
-"\n"
-"   public boolean isValidNumberRange()\n"
-"   {\n"
-"      return validNumberRange;\n"
-"   }\n"
-"\n"
-"   public boolean isGameWon()\n"
-"   {\n"
-"      return guess == number;\n"
-"   }\n"
-"\n"
-"   public boolean isGameLost()\n"
-"   {\n"
-"      return guess != number && remainingGuesses <= 0;\n"
-"   }\n"
-"\n"
-"   public boolean check()\n"
-"   {\n"
-"      boolean result = false;\n"
-"\n"
-"      if (checkNewNumberRangeIsValid())\n"
-"      {\n"
-"         if (guess > number)\n"
-"         {\n"
-"            biggest = guess - 1;\n"
-"         }\n"
-"\n"
-"         if (guess < number)\n"
-"         {\n"
-"            smallest = guess + 1;\n"
-"         }\n"
-"\n"
-"         if (guess == number)\n"
-"         {\n"
-"            result = true;\n"
-"         }\n"
-"\n"
-"         remainingGuesses--;\n"
-"      }\n"
-"\n"
-"      return result;\n"
-"   }\n"
-"\n"
-"   private boolean checkNewNumberRangeIsValid()\n"
-"   {\n"
-"      return validNumberRange = ((guess >= smallest) && (guess <= "
-"biggest));\n"
-"   }\n"
-"\n"
-"   @PostConstruct\n"
-"   public void reset()\n"
-"   {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = rndGenerator.next();\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"scope\"> <para> The "
-"bean is application scoped rather than session scoped, since an instance of "
-"a Swing application typically represents a single 'session'. </para> </"
-"callout> <callout arearefs=\"name\"> <para> Notice that the bean is not "
-"named, since it doesn't need to be accessed via EL. </para> </callout> "
-"<callout arearefs=\"messages1\"> <para> In Java SE there is no JSF "
-"<literal>FacesContext</literal> to which messages can be added. Instead the "
-"<literal>Game</literal> class provides additional information about the "
-"state of the current game including: </para> <itemizedlist> <listitem> "
-"<para> If the game has been won or lost </para> </listitem> <listitem> "
-"<para> If the most recent guess was invalid </para> </listitem> </"
-"itemizedlist> <para> This allows the Swing UI to query the state of the "
-"game, which it does indirectly via a class called <literal>MessageGenerator</"
-"literal>, in order to determine the appropriate messages to display to the "
-"user during the game. </para> </callout> <callout arearefs=\"validation\"> "
-"<para> Since there is no dedicated validation phase, validation of user "
-"input is performed during the <literal>check()</literal> method. </para> </"
-"callout> <callout arearefs=\"reset\"> <para> The <literal>reset()</literal> "
-"method makes a call to the injected <literal>rndGenerator</literal> in order "
-"to get the random number at the start of each game. Note that it can't use "
-"<literal>Instance.get()</literal> like the JSF example does because there "
-"will not be any active contexts like there are during a JSF request. </para> "
-"</callout> </calloutlist> </programlistingco> <para> The "
-"<literal>MessageGenerator</literal> class depends on the current instance of "
-"<literal>Game</literal> and queries its state in order to determine the "
-"appropriate messages to provide as the prompt for the user's next guess and "
-"the response to the previous guess. The code for <literal>MessageGenerator</"
-"literal> is as follows: </para> <programlistingco> <areaspec> <area id=\"game"
-"\" coords=\"3\"/> <area id=\"challenge\" coords=\"6\"/> <area id=\"result\" "
-"coords=\"17\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA[public "
-"class MessageGenerator\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   public String getChallengeMessage()\n"
-"   {\n"
-"      StringBuilder challengeMsg = new StringBuilder(\"I'm thinking of a "
-"number between \");\n"
-"      challengeMsg.append(game.getSmallest());\n"
-"      challengeMsg.append(\" and \");\n"
-"      challengeMsg.append(game.getBiggest());\n"
-"      challengeMsg.append(\". Can you guess what it is?\");\n"
-"\n"
-"      return challengeMsg.toString();\n"
-"   }\n"
-"\n"
-"   public String getResultMessage()\n"
-"   {\n"
-"      if (game.isGameWon())\n"
-"      {\n"
-"         return \"You guessed it! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (game.isGameLost())\n"
-"      {\n"
-"         return \"You are fail! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (!game.isValidNumberRange())\n"
-"      {\n"
-"         return \"Invalid number range!\";\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == Game.MAX_NUM_GUESSES)\n"
-"      {\n"
-"         return \"What is your first guess?\";\n"
-"      }\n"
-"      else\n"
-"      {\n"
-"         String direction = null;\n"
-"\n"
-"         if (game.getGuess() < game.getNumber())\n"
-"         {\n"
-"            direction = \"Higher\";\n"
-"         }\n"
-"         else\n"
-"         {\n"
-"            direction = \"Lower\";\n"
-"         }\n"
-"\n"
-"         return direction + \"! You have \" + game.getRemainingGuesses() + "
-"\" guesses left.\";\n"
-"      }\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"game\"> <para> The "
-"instance of <literal>Game</literal> for the application is injected here. </"
-"para> </callout> <callout arearefs=\"challenge\"> <para> The <literal>Game</"
-"literal>'s state is interrogated to determine the appropriate challenge "
-"message ... </para> </callout> <callout arearefs=\"result\"> <para> ... and "
-"again to determine whether to congratulate, console or encourage the user to "
-"continue. </para> </callout> </calloutlist> </programlistingco> <para> "
+"The bean is application scoped rather than session scoped, since an instance "
+"of a Swing application typically represents a single 'session'."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Notice that the bean is not named, since it doesn't need to be accessed via "
+"EL."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"In Java SE there is no JSF <literal>FacesContext</literal> to which messages "
+"can be added. Instead the <literal>Game</literal> class provides additional "
+"information about the state of the current game including:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the game has been won or lost"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the most recent guess was invalid"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This allows the Swing UI to query the state of the game, which it does "
+"indirectly via a class called <literal>MessageGenerator</literal>, in order "
+"to determine the appropriate messages to display to the user during the game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Since there is no dedicated validation phase, validation of user input is "
+"performed during the <literal>check()</literal> method."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>reset()</literal> method makes a call to the injected "
+"<literal>rndGenerator</literal> in order to get the random number at the "
+"start of each game. Note that it can't use <literal>Instance.get()</literal> "
+"like the JSF example does because there will not be any active contexts like "
+"there are during a JSF request."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>MessageGenerator</literal> class depends on the current "
+"instance of <literal>Game</literal> and queries its state in order to "
+"determine the appropriate messages to provide as the prompt for the user's "
+"next guess and the response to the previous guess. The code for "
+"<literal>MessageGenerator</literal> is as follows:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The instance of <literal>Game</literal> for the application is injected here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>Game</literal>'s state is interrogated to determine the "
+"appropriate challenge message ..."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"... and again to determine whether to congratulate, console or encourage the "
+"user to continue."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "Finally we come to the <literal>NumberGuessFrame</literal> class which "
-"provides the Swing front end to our guessing game. </para> "
-"<programlistingco> <areaspec> <area id=\"gameIn\" coords=\"3\"/> <area id="
-"\"messagesIn\" coords=\"6\"/> <area id=\"start\" coords=\"9\"/> <area id="
-"\"init\" coords=\"21\"/> <area id=\"guess1\" coords=\"38\"/> <area id="
-"\"replay\" coords=\"48\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA"
-"[public class NumberGuessFrame extends javax.swing.JFrame\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   @Inject\n"
-"   private MessageGenerator msgGenerator;\n"
-"\n"
-"   public void start(@Observes ContainerInitialized event)\n"
-"   {\n"
-"      java.awt.EventQueue.invokeLater(new Runnable()\n"
-"      {\n"
-"         public void run()\n"
-"         {\n"
-"            initComponents();\n"
-"            setVisible(true);\n"
-"         }\n"
-"      });\n"
-"   }\n"
-"\n"
-"   private void initComponents()\n"
-"   {\n"
-"\n"
-"      buttonPanel = new javax.swing.JPanel();\n"
-"      mainMsgPanel = new javax.swing.JPanel();\n"
-"      mainLabel = new javax.swing.JLabel();\n"
-"      messageLabel = new javax.swing.JLabel();\n"
-"      guessText = new javax.swing.JTextField();\n"
-"      ...\n"
-"      mainLabel.setText(msgGenerator.getChallengeMessage());\n"
-"      mainMsgPanel.add(mainLabel);\n"
-"\n"
-"      messageLabel.setText(msgGenerator.getResultMessage());\n"
-"      mainMsgPanel.add(messageLabel);\n"
-"      ...\n"
-"   }\n"
-"\n"
-"   private void guessButtonActionPerformed( java.awt.event.ActionEvent "
-"evt )\n"
-"   {\n"
-"      int guess =  Integer.parseInt(guessText.getText());\n"
-"      game.setGuess( guess );\n"
-"      game.check();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void replayBtnActionPerformed(java.awt.event.ActionEvent evt)\n"
-"   {\n"
-"      game.reset();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void refreshUI() {\n"
-"      mainLabel.setText( msgGenerator.getChallengeMessage() );\n"
-"      messageLabel.setText( msgGenerator.getResultMessage() );\n"
-"      guessText.setText( \"\" );\n"
-"      guessesLeftBar.setValue( game.getRemainingGuesses() );\n"
-"      guessText.requestFocus();\n"
-"   }\n"
-"\n"
-"   // swing components\n"
-"   private javax.swing.JPanel borderPanel;\n"
-"   ...\n"
-"   private javax.swing.JButton replayBtn;\n"
-"\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"gameIn\"> <para> The "
-"injected instance of the game (logic and state). </para> </callout> <callout "
-"arearefs=\"messagesIn\"> <para> The injected message generator for UI "
-"messages. </para> </callout> <callout arearefs=\"start\"> <para> This "
-"application is started in the prescribed Weld SE way, by observing the "
-"<literal>ContainerInitialized</literal> event. </para> </callout> <callout "
-"arearefs=\"init\"> <para> This method initializes all of the Swing "
-"components. Note the use of the <literal>msgGenerator</literal> here. </"
-"para> </callout> <callout arearefs=\"guess1\"> <para> "
+"provides the Swing front end to our guessing game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected instance of the game (logic and state)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected message generator for UI messages."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This application is started in the prescribed Weld SE way, by observing the "
+"<literal>ContainerInitialized</literal> event."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This method initializes all of the Swing components. Note the use of the "
+"<literal>msgGenerator</literal> here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
-"button is clicked, and it does the following: </para> <itemizedlist> "
-"<listitem> <para> Gets the guess entered by the user and sets it as the "
-"current guess in the <literal>Game</literal> </para> </listitem> <listitem> "
-"<para> Calls <literal>game.check()</literal> to validate and perform one "
-"'turn' of the game </para> </listitem> <listitem> <para> Calls "
-"<literal>refreshUI</literal>. If there were validation errors with the "
+"button is clicked, and it does the following:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Gets the guess entered by the user and sets it as the current guess in the "
+"<literal>Game</literal>"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
+"the game"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>refreshUI</literal>. If there were validation errors with the "
 "input, this will have been captured during <literal>game.check()</literal> "
 "and as such will be reflected in the messages returned by "
 "<literal>MessageGenerator</literal> and subsequently presented to the user. "
 "If there are no validation errors then the user will be told to guess again "
 "(higher or lower) or that the game has ended either in a win (correct guess) "
-"or a loss (ran out of guesses). </para> </listitem> </itemizedlist> </"
-"callout> <callout arearefs=\"replay\"> <para> "
+"or a loss (ran out of guesses)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>replayBtnActionPerformed</literal> simply calls <literal>game.reset"
-"()</literal> to start a new game and refreshes the messages in the UI. </"
-"para> </callout> </calloutlist> </programlistingco>"
+"()</literal> to start a new game and refreshes the messages in the UI."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:716
 #, no-c-format
 msgid "The translator example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:718
 #, no-c-format
 msgid ""
 "The translator example will take any sentences you enter, and translate them "
@@ -1265,52 +775,29 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:723
 #, no-c-format
 msgid ""
-"The translator example is built as an EAR and contains EJBs. As a result, "
+"The translator example is built as an ear and contains EJBs. As a result, "
 "it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:729
 #, no-c-format
 msgid ""
-"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a WAR, which "
+"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a war, which "
 "will make this structure much simpler! Still, there are other advantages of "
-"using an EAR."
+"using an ear."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:735
 #, no-c-format
 msgid ""
-"First, let's take a look at the EAR aggregator, which is located in the "
+"First, let's take a look at the ear aggregator, which is located in the "
 "example's <literal>ear</literal> directory. Maven automatically generates "
 "the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:740
-#, no-c-format
-msgid ""
-"<![CDATA[<plugin>\n"
-"   <groupId>org.apache.maven.plugins</groupId>\n"
-"   <artifactId>maven-ear-plugin</artifactId>\n"
-"   <configuration>\n"
-"      <modules>\n"
-"         <webModule>\n"
-"            <groupId>org.jboss.weld.examples.jsf.translator</groupId>\n"
-"            <artifactId>weld-jsf-translator-war</artifactId>\n"
-"            <contextRoot>/weld-translator</contextRoot>\n"
-"         </webModule>\n"
-"      </modules>\n"
-"   </configuration>\n"
-"</plugin>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:742
 #, no-c-format
 msgid ""
 "This configuration overrides the web context path, resulting in this "
@@ -1319,44 +806,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:748
 #, no-c-format
 msgid ""
 "If you weren't using Maven to generate these files, you would need "
 "<literal>META-INF/application.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:753
-#, no-c-format
-msgid ""
-"<![CDATA[<application version=\"5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/application_5.xsd\">\n"
-"\n"
-"  <display-name>weld-jsf-translator-ear</display-name>\n"
-"  <description>The Weld JSF translator example (EAR)</description>\n"
-"  \n"
-"  <module>\n"
-"    <web>\n"
-"      <web-uri>weld-translator.war</web-uri>\n"
-"      <context-root>/weld-translator</context-root>\n"
-"    </web>\n"
-"  </module>\n"
-"  <module>\n"
-"    <ejb>weld-translator.jar</ejb>\n"
-"  </module>\n"
-"</application>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:756
 #, no-c-format
 msgid ""
-"Next, lets look at the WAR, which is located in the example's <literal>war</"
+"Next, lets look at the war, which is located in the example's <literal>war</"
 "literal> directory. Just as in the numberguess example, we have a "
 "<literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</"
 "literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/"
@@ -1364,7 +823,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:762
 #, no-c-format
 msgid ""
 "More interesting is the JSF view used to translate text. Just as in the "
@@ -1372,41 +830,7 @@
 "here for brevity):"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:767
-#, no-c-format
-msgid ""
-"<![CDATA[<h:form id=\"translator\">\n"
-"\n"
-"   <table>\n"
-"      <tr align=\"center\" style=\"font-weight: bold\">\n"
-"         <td>\n"
-"            Your text\n"
-"         </td>\n"
-"         <td>\n"
-"            Translation\n"
-"         </td>\n"
-"      </tr>\n"
-"      <tr>\n"
-"         <td>\n"
-"            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
-"required=\"true\" rows=\"5\" cols=\"80\"/>\n"
-"         </td>\n"
-"         <td>\n"
-"            <h:outputText value=\"#{translator.translatedText}\"/>\n"
-"         </td>\n"
-"      </tr>\n"
-"   </table>\n"
-"   <div>\n"
-"      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
-"{translator.translate}\"/>\n"
-"   </div>\n"
-"   \n"
-"</h:form>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:769
 #, no-c-format
 msgid ""
 "The user can enter some text in the left-hand textarea, and hit the "
@@ -1414,7 +838,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:774
 #, no-c-format
 msgid ""
 "Finally, let's look at the EJB module, which is located in the example's "
@@ -1424,7 +847,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:780
 #, no-c-format
 msgid ""
 "We've saved the most interesting bit to last, the code! The project has two "
@@ -1436,7 +858,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:787
 #, no-c-format
 msgid ""
 "Both <literal>SentenceParser</literal> and <literal>TextTranslator</literal> "
@@ -1444,33 +865,7 @@
 "injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:792
-#, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator implements Serializable { \n"
-"\n"
-"   private SentenceParser sentenceParser; \n"
-"\n"
-"   @EJB private Translator translator; \n"
-"   \n"
-"   @Inject public TextTranslator(SentenceParser sentenceParser) { \n"
-"      this.sentenceParser = sentenceParser; \n"
-"   }\n"
-"   \n"
-"   public String translate(String text) { \n"
-"      StringBuilder sb = new StringBuilder(); \n"
-"      for (String sentence: sentenceParser.parse(text)) { \n"
-"         sb.append(translator.translate(sentence)).append(\". \"); \n"
-"      } \n"
-"      return sb.toString().trim(); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:794
 #, no-c-format
 msgid ""
 "<literal>TextTranslator</literal> uses the simple bean (really just a plain "
@@ -1481,22 +876,7 @@
 "convincing enough to anyone who doesn't understand Latin!"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:802
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator { \n"
-"\n"
-"   public String translate(String sentence) { \n"
-"      return \"Lorem ipsum dolor sit amet\"; \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:804
 #, no-c-format
 msgid ""
 "Finally, there is UI orientated controller. This is a request scoped, named, "
@@ -1505,44 +885,7 @@
 "and setters for all the fields on the page."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:810
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"@RequestScoped\n"
-"@Named(\"translator\")\n"
-"public class TranslatorControllerBean implements TranslatorController {\n"
-"\n"
-"   @Inject private TextTranslator translator;\n"
-"   \n"
-"   private String inputText;\n"
-"   \n"
-"   private String translatedText;\n"
-"   \n"
-"   public void translate() {\n"
-"      translatedText = translator.translate(inputText);\n"
-"   }\n"
-"   \n"
-"   public String getText() {\n"
-"      return inputText;\n"
-"   }\n"
-"   \n"
-"   public void setText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"   \n"
-"   public String getTranslatedText() {\n"
-"      return translatedText;\n"
-"   }\n"
-"   \n"
-"   @Remove public void remove() {}\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:814
 #, no-c-format
 msgid ""
 "That concludes our short tour of the Weld starter examples. For more "

Modified: doc/trunk/reference/de-DE/xml.po
===================================================================
--- doc/trunk/reference/de-DE/xml.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/de-DE/xml.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-06 17:56+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -16,13 +16,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: xml.xml:5
 #, fuzzy, no-c-format
 msgid "Defining beans using XML"
 msgstr "Definition von Web Beans unter Verwendung von XML"
 
 #. Tag: para
-#: xml.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "So far, we've seen plenty of examples of beans declared using annotations. "
@@ -34,7 +32,6 @@
 "keine Annotationen zur Definition des Web Beans verwendet werden können:"
 
 #. Tag: para
-#: xml.xml:14
 #, no-c-format
 msgid "when the implementation class comes from some preexisting library, or"
 msgstr ""
@@ -42,7 +39,6 @@
 "stammt oder "
 
 #. Tag: para
-#: xml.xml:19
 #, fuzzy, no-c-format
 msgid "when there should be multiple beans with the same implementation class."
 msgstr ""
@@ -50,7 +46,6 @@
 "sollten."
 
 #. Tag: para
-#: xml.xml:25
 #, no-c-format
 msgid ""
 "One way to address these problems is to write a producer method. Weld offers "
@@ -60,7 +55,6 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:31
 #, fuzzy, no-c-format
 msgid ""
 "Many frameworks use XML to provide metadata relating to Java classes. "
@@ -78,7 +72,6 @@
 "Namens als Name des XML-Elements."
 
 #. Tag: para
-#: xml.xml:38
 #, no-c-format
 msgid ""
 "The advantage of this approach is that you can write an XML schema that "
@@ -95,13 +88,11 @@
 "Generierungsschritt notwendig wäre."
 
 #. Tag: title
-#: xml.xml:46
 #, fuzzy, no-c-format
 msgid "Declaring beans"
 msgstr "Deklaration von Web Bean Klassen"
 
 #. Tag: para
-#: xml.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "For each Java package, Weld defines a corresponding XML namespace. The "
@@ -116,7 +107,6 @@
 "mydomain.myapp</literal>."
 
 #. Tag: para
-#: xml.xml:54
 #, no-c-format
 msgid ""
 "Java types belonging to a package are referred to using an XML element in "
@@ -133,7 +123,6 @@
 "des Elements festgelegt."
 
 #. Tag: para
-#: xml.xml:61
 #, no-c-format
 msgid ""
 "For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
@@ -142,24 +131,7 @@
 "Zum Beispiel bezieht sich das Element <literal>&lt;util:Date/&gt;</literal> "
 "im folgenden XML-Fragment auf die Klasse <literal>java.util.Date</literal>:"
 
-#. Tag: programlisting
-#: xml.xml:66
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:util=\"urn:java:java.util\">\n"
-"   <util:Date/>\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
-"          xmlns:util=\"urn:java:java.util\">\n"
-"\n"
-"    <util:Date/>\n"
-"\n"
-"</WebBeans>]]>"
-
 #. Tag: para
-#: xml.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "And this is all the code we need to declare that <literal>Date</literal> is "
@@ -171,20 +143,12 @@
 "von <literal>Date</literal> kann jetzt in ein beliebiges anderes Web Bean "
 "eingespeist werden:"
 
-#. Tag: programlisting
-#: xml.xml:73
-#, fuzzy, no-c-format
-msgid "<![CDATA[private @Inject Date date;]]>"
-msgstr "<![CDATA[@Current Date date]]>"
-
 #. Tag: title
-#: xml.xml:78
 #, fuzzy, no-c-format
 msgid "Declaring bean metadata"
 msgstr "Deklaration von Web Bean Metadaten"
 
 #. Tag: para
-#: xml.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "We can declare the scope, deployment type and interceptor binding types "
@@ -194,68 +158,14 @@
 "deklarieren, indem wir direkte untergeordnete Elemente der Web Bean "
 "Dellaration verwenden:"
 
-#. Tag: programlisting
-#: xml.xml:85
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"   <SessionScoped/>\n"
-"   <myfwk:Transactional requiresNew=\"true\"/>\n"
-"   <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
-msgstr ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"    <SessionScoped/>\n"
-"    <myfwk:Transactional requiresNew=\"true\"/>\n"
-"    <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
-
 #. Tag: para
-#: xml.xml:87
 #, fuzzy, no-c-format
 msgid "We use exactly the same approach to specify names and qualifiers:"
 msgstr ""
 "Wir verwenden exakt dieselbe Vorgehensweise, um Namen und Binding-Typ "
 "festzulegen:"
 
-#. Tag: programlisting
-#: xml.xml:89
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<util:Date>\n"
-"   <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <SessionScoped/>\n"
-"   <myapp:Login/>\n"
-"   <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:SystemStart/>\n"
-"   <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
-msgstr ""
-"<![CDATA[<util:Date>\n"
-"    <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"    <SessionScoped/>\n"
-"    <myapp:Login/>\n"
-"    <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"    <ApplicationScoped/>\n"
-"    <myapp:SystemStart/>\n"
-"    <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
-
 #. Tag: para
-#: xml.xml:91
 #, fuzzy, no-c-format
 msgid ""
 "Where <literal>@Login</literal> and <literal>@SystemStart</literal> are "
@@ -264,40 +174,12 @@
 "Wobei <literal>@Login</literal> und <literal>@SystemStart</literal> Binding "
 "Annotationstypen sind."
 
-#. Tag: programlisting
-#: xml.xml:95
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[private @Inject Date currentTime;\n"
-"private @Login Date loginTime;\n"
-"private @SystemStart Date systemStartTime;]]>"
-msgstr ""
-"<![CDATA[@Current Date currentTime;\n"
-"@Login Date loginTime;\n"
-"@SystemStart Date systemStartTime;]]>"
-
 #. Tag: para
-#: xml.xml:97
 #, fuzzy, no-c-format
 msgid "As usual, a bean may support multiple qualifier types:"
 msgstr "Wie gewöhnlich kann ein Web Bean mehrere Binding-Typen unterstützen:"
 
-#. Tag: programlisting
-#: xml.xml:99
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"   <myapp:PayByCheque/>\n"
-"   <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
-msgstr ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"    <myapp:PayByCheque/>\n"
-"    <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
-
 #. Tag: para
-#: xml.xml:101
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors and decorators are beans as well, so they may be declared just "
@@ -306,74 +188,29 @@
 "Interzeptoren und Dekoratoren sind nur einfache Web Beans und können daher "
 "wie jedes andere einfache Web Bean deklariert werden:"
 
-#. Tag: programlisting
-#: xml.xml:105
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"   <Interceptor/>\n"
-"   <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
-msgstr ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"    <Interceptor/>\n"
-"    <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
-
 #. Tag: title
-#: xml.xml:110
 #, fuzzy, no-c-format
 msgid "Declaring bean members"
 msgstr "Deklaration von Web Bean Mitgliedern"
 
 #. Tag: para
-#: xml.xml:112
 #, no-c-format
 msgid "TODO!"
 msgstr "TODO!"
 
 #. Tag: title
-#: xml.xml:119
 #, fuzzy, no-c-format
 msgid "Declaring inline beans"
 msgstr "Deklaration von inline Web Beans"
 
 #. Tag: para
-#: xml.xml:121
 #, fuzzy, no-c-format
 msgid "Weld lets us define a bean at an injection point. For example:"
 msgstr ""
 "Web Beans lassen uns ein Web Bean an einem Einspeisungspunkt definieren. Zum "
 "Beispiel:"
 
-#. Tag: programlisting
-#: xml.xml:123
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:System>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:admin>\n"
-"      <myapp:Name>\n"
-"         <myapp:firstname>Gavin</myapp:firstname>\n"
-"         <myapp:lastname>King</myapp:lastname>\n"
-"         <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"      </myapp:Name>\n"
-"   </myapp:admin>\n"
-"</myapp:System>]]>"
-msgstr ""
-"<![CDATA[<myapp:System>\n"
-"    <ApplicationScoped/>\n"
-"    <myapp:admin>\n"
-"        <myapp:Name>\n"
-"            <myapp:firstname>Gavin</myapp:firstname>\n"
-"            <myapp:lastname>King</myapp:lastname>\n"
-"            <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"        </myapp:Name>\n"
-"    </myapp:admin>\n"
-"</myapp:System>]]>"
-
 #. Tag: para
-#: xml.xml:125
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
@@ -389,7 +226,6 @@
 "an dem spezifischen Einspeisungspunkt einspeisbar, an dem es deklariert wird."
 
 #. Tag: para
-#: xml.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "This simple but powerful feature allows the Weld XML format to be used to "
@@ -401,13 +237,11 @@
 "ist noch keine volndige datenbindende Lösung, aber ganz nah dran!"
 
 #. Tag: title
-#: xml.xml:139
 #, no-c-format
 msgid "Using a schema"
 msgstr "Verwendung eines Schemas"
 
 #. Tag: para
-#: xml.xml:141
 #, fuzzy, no-c-format
 msgid ""
 "If we want our XML document format to be authored by people who aren't Java "
@@ -420,39 +254,7 @@
 "hinsichtlich des Schreibens oder der Verwendung des Schemas spezifisch für "
 "Web Beans ist."
 
-#. Tag: programlisting
-#: xml.xml:147
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/beans-"
-"1.0.xsd\n"
-"   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"   <myapp:System>\n"
-"      ...\n"
-"   </myapp:System>\n"
-"\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
-"          xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"          xsi:schemaLocation=\"urn:java:javax.webbeans http://java.sun.com/"
-"jee/web-beans-1.0.xsd\n"
-"                              urn:java:com.mydomain.myapp http://mydomain."
-"com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"    <myapp:System>\n"
-"        ...\n"
-"    </myapp:System>\n"
-"\n"
-"</WebBeans>]]>"
-
 #. Tag: para
-#: xml.xml:149
 #, fuzzy, no-c-format
 msgid ""
 "Writing an XML schema is quite tedious. Therefore, the Weld project will "
@@ -463,6 +265,159 @@
 "Beans RI Projekt ein Tool, das automatisch das XML-Schema aus kompiliertem "
 "Java-Code generiert."
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:util=\"urn:java:java.util\">\n"
+#~ "   <util:Date/>\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
+#~ "          xmlns:util=\"urn:java:java.util\">\n"
+#~ "\n"
+#~ "    <util:Date/>\n"
+#~ "\n"
+#~ "</WebBeans>]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[private @Inject Date date;]]>"
+#~ msgstr "<![CDATA[@Current Date date]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "   <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "    <SessionScoped/>\n"
+#~ "    <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "    <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "   <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myapp:Login/>\n"
+#~ "   <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:SystemStart/>\n"
+#~ "   <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "    <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "    <SessionScoped/>\n"
+#~ "    <myapp:Login/>\n"
+#~ "    <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "    <ApplicationScoped/>\n"
+#~ "    <myapp:SystemStart/>\n"
+#~ "    <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[private @Inject Date currentTime;\n"
+#~ "private @Login Date loginTime;\n"
+#~ "private @SystemStart Date systemStartTime;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Current Date currentTime;\n"
+#~ "@Login Date loginTime;\n"
+#~ "@SystemStart Date systemStartTime;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "   <myapp:PayByCheque/>\n"
+#~ "   <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "    <myapp:PayByCheque/>\n"
+#~ "    <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "   <Interceptor/>\n"
+#~ "   <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "    <Interceptor/>\n"
+#~ "    <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:admin>\n"
+#~ "      <myapp:Name>\n"
+#~ "         <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "         <myapp:lastname>King</myapp:lastname>\n"
+#~ "         <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "      </myapp:Name>\n"
+#~ "   </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "    <ApplicationScoped/>\n"
+#~ "    <myapp:admin>\n"
+#~ "        <myapp:Name>\n"
+#~ "            <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "            <myapp:lastname>King</myapp:lastname>\n"
+#~ "            <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "        </myapp:Name>\n"
+#~ "    </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/"
+#~ "beans-1.0.xsd\n"
+#~ "   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "   <myapp:System>\n"
+#~ "      ...\n"
+#~ "   </myapp:System>\n"
+#~ "\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
+#~ "          xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "          xsi:schemaLocation=\"urn:java:javax.webbeans http://java.sun."
+#~ "com/jee/web-beans-1.0.xsd\n"
+#~ "                              urn:java:com.mydomain.myapp http://mydomain."
+#~ "com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "    <myapp:System>\n"
+#~ "        ...\n"
+#~ "    </myapp:System>\n"
+#~ "\n"
+#~ "</WebBeans>]]>"
+
 #~ msgid "In either of these cases, Web Beans gives us two options:"
 #~ msgstr "In jedem dieser Fälle bieten uns Web Beans zwei Optionen:"
 

Modified: doc/trunk/reference/es-ES/Author_Group.po
===================================================================
--- doc/trunk/reference/es-ES/Author_Group.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/Author_Group.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Author_Group\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-14 09:26+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -16,109 +16,128 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#. Tag: author
-#: Author_Group.xml:5
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Gavin</firstname> <surname>King</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+msgid "Gavin"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:8
 #, no-c-format
 msgid "JSR-299: Contexts and Dependency Injection Lead"
 msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:14
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+msgid "Pete"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:17
 #, no-c-format
 msgid "Weld (JSR-299 RI) Lead"
 msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:24
-#, fuzzy, no-c-format
-msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Dan"
+msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:31
-#, fuzzy, no-c-format
-msgid "<firstname>David</firstname> <surname>Allen</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "David"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:35
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
-msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+msgid "Nicola"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:38 Author_Group.xml:67
 #, no-c-format
 msgid "Italian Translation"
 msgstr "Traducción en italiano"
 
-#. Tag: othercredit
-#: Author_Group.xml:40
-#, fuzzy, no-c-format
-msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Gladys"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:43
 #, fuzzy, no-c-format
 msgid "Spanish Translation"
 msgstr "Traducción en italiano"
 
-#. Tag: othercredit
-#: Author_Group.xml:48
-#, fuzzy, no-c-format
-msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Eun-Ju"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:51
 #, fuzzy, no-c-format
 msgid "Korean Translation"
 msgstr "Traducción en italiano"
 
-#. Tag: othercredit
-#: Author_Group.xml:56
-#, fuzzy, no-c-format
-msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Terry"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:59
 #, fuzzy, no-c-format
 msgid "Traditional Chinese Translation"
 msgstr "Traducción en italiano"
 
-#. Tag: othercredit
-#: Author_Group.xml:64
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
-msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+msgid "Francesco"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:69
-#, fuzzy, no-c-format
-msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Sean"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:72
 #, fuzzy, no-c-format
 msgid "Simplified Chinese Translation"
 msgstr "Traducción en italiano"
 
+#~ msgid "<firstname>Gavin</firstname> <surname>King</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#~ msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
 #, fuzzy
+#~ msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>David</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#~ msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+#~ msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
+#~ msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+#~ msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
+#, fuzzy
 #~ msgid ""
 #~ "<jobtitle>JSR-299 specification lead</jobtitle> <orgname>Red Hat "
 #~ "Middleware LLC</orgname>"

Modified: doc/trunk/reference/es-ES/Book_Info.po
===================================================================
--- doc/trunk/reference/es-ES/Book_Info.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/Book_Info.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Book_Info\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-08 10:39+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: Book_Info.xml:4
 #, no-c-format
 msgid "Weld - JSR-299 Reference Implementation"
 msgstr ""
 
 #. Tag: subtitle
-#: Book_Info.xml:5
 #, fuzzy, no-c-format
 msgid ""
 "JSR-299: The new Java standard for dependency injection and contextual "

Modified: doc/trunk/reference/es-ES/beans.po
===================================================================
--- doc/trunk/reference/es-ES/beans.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/beans.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: beans.xml:4
 #, no-c-format
 msgid "More about beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:6
 #, no-c-format
 msgid ""
 "A bean is usually an application class that contains business logic. It may "
@@ -32,7 +30,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:13
 #, no-c-format
 msgid ""
 "Let's back up a second. What does it really mean to be <emphasis>contextual</"
@@ -45,7 +42,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:21
 #, no-c-format
 msgid ""
 "However, like a stateless or singleton model, but <emphasis>unlike</"
@@ -55,19 +51,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:29
 #, no-c-format
 msgid "the lifecycle of each instance of the bean and"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:32
 #, no-c-format
 msgid "which clients share a reference to a particular instance of the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:36
 #, no-c-format
 msgid ""
 "For a given thread in a CDI application, there may be an <emphasis>active "
@@ -78,7 +71,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:43
 #, no-c-format
 msgid ""
 "Clients (for example, other beans) executing in the same context will see "
@@ -87,7 +79,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:49
 #, no-c-format
 msgid ""
 "One great advantage of the contextual model is that it allows stateful beans "
@@ -99,46 +90,39 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:58
 #, no-c-format
 msgid "they interact via well-defined public APIs"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:61
 #, no-c-format
 msgid "their lifecycles are completely decoupled"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:65
 #, no-c-format
 msgid ""
 "We can replace one bean with another different bean that implements the same "
 "interface and has a different lifecycle (a different scope) without "
 "affecting the other bean implementation. In fact, CDI defines a simple "
 "facility for overriding bean implementations at deployment time, as we will "
-"see in <xref linkend=\"alternatives\"/>."
+"see in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:71
 #, no-c-format
 msgid ""
 "Note that not all clients of a bean are beans themselves. Other objects such "
-"as servlets or message-driven beans&#8212;which are by nature not "
-"injectable, contextual objects&#8212;may also obtain references to beans by "
-"injection."
+"as servlets or message-driven beans—which are by nature not injectable, "
+"contextual objects—may also obtain references to beans by injection."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:78
 #, no-c-format
 msgid "The anatomy of a bean"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:80
 #, no-c-format
 msgid ""
 "Enough hand-waving. More formally, the anatomy of a bean, according to the "
@@ -146,67 +130,56 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:84
 #, no-c-format
 msgid "A bean comprises the following attributes:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:87
 #, no-c-format
 msgid "A (nonempty) set of bean types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:88
 #, no-c-format
 msgid "A (nonempty) set of qualifiers"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:89
 #, no-c-format
 msgid "A scope"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:90
 #, no-c-format
 msgid "Optionally, a bean EL name"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:91
 #, no-c-format
 msgid "A set of interceptor bindings"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:92
 #, no-c-format
 msgid "A bean implementation"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:95
 #, no-c-format
 msgid "Furthermore, a bean may or may not be an alternative."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:99
 #, no-c-format
 msgid "Let's see what all this new terminology means."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:102
 #, no-c-format
 msgid "Bean types, qualifiers and dependency injection"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:104
 #, no-c-format
 msgid ""
 "Beans usually acquire references to other beans via dependency injection. "
@@ -215,19 +188,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:110
 #, no-c-format
 msgid "a bean type, together with"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:111
 #, no-c-format
 msgid "a set of qualifiers."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:114
 #, no-c-format
 msgid ""
 "A bean type is a user-defined class or interface; a type that is client-"
@@ -237,19 +207,7 @@
 "types:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:120
-#, no-c-format
-msgid ""
-"<![CDATA[public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:122
 #, no-c-format
 msgid ""
 "The bean types are <literal>BookShop</literal>, <literal>Business</literal> "
@@ -259,7 +217,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:128
 #, no-c-format
 msgid ""
 "Meanwhile, this session bean has only the local interfaces "
@@ -268,29 +225,17 @@
 "<literal>BookShopBean</literal> is not a client-visible type."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"public class BookShopBean \n"
-"      extends Business \n"
-"      implements BookShop, Auditable {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:137
 #, no-c-format
 msgid ""
-"Most bean types you can probably figure out. One gotcha is primitive types. "
-"All primitive types are assumed to be identical to their corresponding "
-"wrapper types in <literal>java.lang</literal>."
+"The bean types of a session bean include local interfaces and the bean class "
+"local view (if any). EJB remote interfaces are not considered bean types of "
+"a session bean. You can't inject an EJB using its remote interface unless "
+"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
+"linkend=\"resources\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:143
 #, no-c-format
 msgid ""
 "Bean types may be restricted to an explicit set by annotating the bean with "
@@ -300,20 +245,7 @@
 "<literal>java.lang.Object</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:149
-#, no-c-format
-msgid ""
-"<![CDATA[@Typed(Shop.class)\n"
-"public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:151
 #, no-c-format
 msgid ""
 "Sometimes, a bean type alone does not provide enough information for the "
@@ -328,7 +260,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:160
 #, no-c-format
 msgid ""
 "A qualifier is a user-defined annotation that is itself annotated "
@@ -337,18 +268,7 @@
 "string-based names. Here's an example of a qualifier annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:166
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface CreditCard {}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:168
 #, no-c-format
 msgid ""
 "You may not be used to seeing the definition of an annotation. In fact, this "
@@ -358,7 +278,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:175
 #, no-c-format
 msgid ""
 "Pay attention to the names of the built-in annotations in CDI and EJB. "
@@ -368,7 +287,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:182
 #, no-c-format
 msgid ""
 "Now that we have defined a qualifier annotation, we can use it to "
@@ -377,14 +295,7 @@
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:188
-#, no-c-format
-msgid "<![CDATA[@Inject @CreditCard PaymentProcessor paymentProcessor]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:191
 #, no-c-format
 msgid ""
 "If an injection point does not explicitly specify a qualifier, it has the "
@@ -392,7 +303,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:197
 #, no-c-format
 msgid ""
 "For each injection point, the container searches for a bean which satisfies "
@@ -402,7 +312,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:203
 #, no-c-format
 msgid ""
 "How do we specify that qualifiers of a bean? By annotating the bean class, "
@@ -411,17 +320,7 @@
 "Therefore, it satisfies our qualified injection point:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:209
-#, no-c-format
-msgid ""
-"<![CDATA[@CreditCard\n"
-"public class CreditCardPaymentProcessor \n"
-"    implements PaymentProcessor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:212
 #, no-c-format
 msgid ""
 "If a bean does not explicitly specify a qualifier, it has the default "
@@ -429,23 +328,20 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:225
 #, no-c-format
 msgid ""
 "That's not quite the end of the story. CDI also defines a simple "
 "<emphasis>resolution rule</emphasis> that helps the container decide what to "
 "do if there is more than one bean that satisfies a particular contract. "
-"We'll get into the details in <xref linkend=\"injection\"/>."
+"We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:245
 #, no-c-format
 msgid "Scope"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:248
 #, no-c-format
 msgid ""
 "The <emphasis>scope</emphasis> of a bean defines the lifecycle and "
@@ -456,23 +352,13 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:255
 #, no-c-format
 msgid ""
 "For example, any web application may have <emphasis>session scoped</"
 "emphasis> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:259
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:261
 #, no-c-format
 msgid ""
 "An instance of a session-scoped bean is bound to a user session and is "
@@ -480,7 +366,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:265
 #, no-c-format
 msgid ""
 "Keep in mind that once a bean is bound to a context, it remains in that "
@@ -491,7 +376,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:273
 #, no-c-format
 msgid ""
 "If a scope is not explicitly specified, then the bean belongs to a special "
@@ -501,19 +385,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:279
 #, no-c-format
-msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\"/>."
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:284
 #, no-c-format
 msgid "EL name"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:286
 #, no-c-format
 msgid ""
 "If you want to reference a bean in non-Java code that supports Unified EL "
@@ -522,38 +403,18 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:291
 #, no-c-format
 msgid ""
 "The EL name is specified using the <literal>@Named</literal> annotation, as "
 "shown here:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:295
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named(\"cart\")\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:297
 #, no-c-format
 msgid "Now we can easily use the bean in any JSF or JSP page:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:299
-#, no-c-format
-msgid ""
-"<![CDATA[<h:dataTable value=\"#{cart.lineItems}\" var=\"item\">\n"
-"   ...\n"
-"</h:dataTable>]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:302
 #, no-c-format
 msgid ""
 "The <literal>@Named</literal> annotation is not what makes the class a bean. "
@@ -563,23 +424,13 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:309
 #, no-c-format
 msgid ""
 "We can let CDI choose a name for us by leaving off the value of the "
 "<literal>@Named</literal> annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:313
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:315
 #, no-c-format
 msgid ""
 "The name defaults to the unqualified class name, decapitalized; in this "
@@ -587,13 +438,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:325
 #, no-c-format
 msgid "Alternatives"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:327
 #, no-c-format
 msgid ""
 "We've already seen how qualifiers let us choose between multiple "
@@ -605,42 +454,30 @@
 "literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:335
-#, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class MockPaymentProcessor extends PaymentProcessorImpl { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:337
 #, no-c-format
 msgid ""
 "We normally annotate a bean <literal>@Alternative</literal> only when there "
 "is some other implementation of an interface it implements (or of any of its "
 "bean types). We can choose between alternatives at deployment time by "
 "<emphasis>selecting</emphasis> an alternative in the CDI deployment "
-"descriptor <literal>META-INF/beans.xml</literal> of the JAR or Java EE "
+"descriptor <literal>META-INF/beans.xml</literal> of the jar or Java EE "
 "module that uses it. Different modules can specify that they use different "
 "alternatives."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:345
 #, no-c-format
 msgid ""
-"We cover alternatives in more detail in <xref linkend=\"alternatives\"/>."
+"We cover alternatives in more detail in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:352
 #, no-c-format
 msgid "Interceptor binding types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:354
 #, no-c-format
 msgid ""
 "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, "
@@ -651,7 +488,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:361
 #, no-c-format
 msgid ""
 "The way that interceptors were defined in Java EE 5 was counter-intuitive. "
@@ -668,7 +504,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:372
 #, no-c-format
 msgid ""
 "CDI provides a new approach to binding interceptors to beans that introduces "
@@ -678,7 +513,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:378
 #, no-c-format
 msgid ""
 "An interceptor binding type is a user-defined annotation that is itself "
@@ -687,51 +521,21 @@
 "two classes."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:383
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Inherited\n"
-"@Target( { TYPE, METHOD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:385
 #, no-c-format
 msgid ""
 "The interceptor that implements transaction management declares this "
 "annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[public @Transactional @Interceptor\n"
-"class TransactionInterceptor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:391
 #, no-c-format
 msgid ""
 "We can apply the interceptor to a bean by annotating the bean class with the "
 "same interceptor binding type:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:395
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Transactional\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:397
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
@@ -740,32 +544,28 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:402
 #, no-c-format
 msgid ""
 "Interceptors are deployment-specific. (We don't need a "
 "<literal>TransactionInterceptor</literal> in our unit tests!) By default, an "
 "interceptor is disabled. We can enable an interceptor using the CDI "
-"deployment descriptor <literal>META-INF/beans.xml</literal> of the JAR or "
+"deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or "
 "Java EE module. This is also where we specify the interceptor ordering."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:409
 #, no-c-format
 msgid ""
 "We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
-"\"interceptors\"/> and <xref linkend=\"decorators\"/>."
+"\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:419
 #, no-c-format
 msgid "What kinds of classes are beans?"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:421
 #, no-c-format
 msgid ""
 "We've already seen two types of beans: JavaBeans and EJB session beans. Is "
@@ -774,13 +574,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:428
 #, no-c-format
 msgid "Managed beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:430
 #, no-c-format
 msgid ""
 "A managed bean is a Java class. The basic lifecycle and semantics of a "
@@ -792,19 +590,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:441
 #, no-c-format
 msgid "It is not a non-static inner class."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:444
 #, no-c-format
 msgid "It is a concrete class, or is annotated <literal>@Decorator</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:447
 #, no-c-format
 msgid ""
 "It is not annotated with an EJB component-defining annotation or declared as "
@@ -812,7 +607,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:453
 #, no-c-format
 msgid ""
 "It does not implement <literal>javax.enterprise.inject.spi.Extension</"
@@ -820,34 +614,41 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:456
 #, no-c-format
-msgid "It has an appropriate constructor&#8212;either:"
+msgid "It has an appropriate constructor—either:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:461
 #, no-c-format
 msgid "the class has a constructor with no parameters, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:464
 #, no-c-format
 msgid "the class declares a constructor annotated <literal>@Inject</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:472
 #, no-c-format
 msgid ""
+"According to this definition, JPA entities are technically managed beans. "
+"However, entities have their own special lifecycle, state and identity model "
+"and are usually instantiated by JPA or using <literal>new</literal>. "
+"Therefore we don't recommend directly injecting an entity class. We "
+"especially recommend against assigning a scope other than "
+"<literal>@Dependent</literal> to an entity class, since JPA is not able to "
+"persist injected CDI proxies."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The unrestricted set of bean types for a managed bean contains the bean "
 "class, every superclass and all interfaces it implements directly or "
 "indirectly."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:475
 #, no-c-format
 msgid ""
 "If a managed bean has a public field, it must have the default scope "
@@ -855,7 +656,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:477
 #, no-c-format
 msgid ""
 "Managed beans support the <literal>@PostConstruct</literal> and "
@@ -863,7 +663,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:480
 #, no-c-format
 msgid ""
 "Session beans are also, technically, managed beans. However, since they have "
@@ -873,13 +672,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:489
 #, no-c-format
 msgid "Session beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:491
 #, no-c-format
 msgid ""
 "Session beans belong to the EJB specification. They have a special "
@@ -892,7 +689,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:500
 #, no-c-format
 msgid ""
 "Message-driven and entity beans are by nature non-contextual objects and may "
@@ -904,7 +700,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:508
 #, no-c-format
 msgid ""
 "The unrestricted set of bean types for a session bean contains all local "
@@ -916,7 +711,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:516
 #, no-c-format
 msgid ""
 "There's no reason to explicitly declare the scope of a stateless session "
@@ -927,20 +721,18 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:520
 #, no-c-format
 msgid ""
 "Stateful session beans may define a <emphasis>remove method</emphasis>, "
 "annotated <literal>@Remove</literal>, that is used by the application to "
 "indicate that an instance should be destroyed. However, for a contextual "
-"instance of the bean&#8212;an instance under the control of CDI&#8212;this "
-"method may only be called by the application if the bean has scope "
-"<literal>@Dependent</literal>. For beans with other scopes, the application "
-"must let the container destroy the bean."
+"instance of the bean—an instance under the control of CDI—this method may "
+"only be called by the application if the bean has scope <literal>@Dependent</"
+"literal>. For beans with other scopes, the application must let the "
+"container destroy the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:528
 #, no-c-format
 msgid ""
 "So, when should we use a session bean instead of a plain managed bean? "
@@ -948,19 +740,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:535
 #, no-c-format
 msgid "method-level transaction management and security,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:538
 #, no-c-format
 msgid "concurrency management,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:541
 #, no-c-format
 msgid ""
 "instance-level passivation for stateful session beans and instance-pooling "
@@ -968,19 +757,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:545
 #, no-c-format
 msgid "remote or web service invocation, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:548
 #, no-c-format
 msgid "timers and asynchronous methods,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:552
 #, no-c-format
 msgid ""
 "When we don't need any of these things, an ordinary managed bean will serve "
@@ -988,7 +774,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:554
 #, no-c-format
 msgid ""
 "Many beans (including any <literal>@SessionScoped</literal> or "
@@ -998,7 +783,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:560
 #, no-c-format
 msgid ""
 "Beans which hold references to heavy-weight resources, or hold a lot of "
@@ -1008,7 +792,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:566
 #, no-c-format
 msgid ""
 "Finally, it's usually obvious when method-level transaction management, "
@@ -1017,7 +800,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:571
 #, no-c-format
 msgid ""
 "The point we're trying to make is: use a session bean when you need the "
@@ -1030,7 +812,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:579
 #, no-c-format
 msgid ""
 "On the other hand, don't be scared to use session beans just because you've "
@@ -1043,13 +824,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:590
 #, no-c-format
 msgid "Producer methods"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:592
 #, no-c-format
 msgid ""
 "Not everything that needs to be injected can be boiled down to a bean class "
@@ -1061,7 +840,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:600
 #, no-c-format
 msgid ""
 "A <emphasis>producer method</emphasis> is a method that acts as a source of "
@@ -1072,64 +850,31 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:607
 #, no-c-format
 msgid ""
 "A producer method is declared by annotating a method of a bean class with "
 "the <literal>@Produces</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:612
-#, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class RandomNumberGenerator {\n"
-"   \n"
-"   private Random random = new Random(System.currentTimeMillis());\n"
-"       \n"
-"   @Produces @Named @Random int getRandomNumber() {\n"
-"      return random.nextInt(100);\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:614
 #, no-c-format
 msgid ""
 "We can't write a bean class that is itself a random number. But we can "
 "certainly write a method that returns a random number. By making the method "
-"a producer method, we allow the return value of the method&#8212;in this "
-"case an <literal>Integer</literal>&#8212;to be injected. We can even specify "
-"a qualifier&#8212;in this case <literal>@Random</literal>, a scope&#8212;"
-"which in this case defaults to <literal>@Dependent</literal>, and an EL "
-"name&#8212;which in this case defaults to <literal>randomNumber</literal> "
-"according to the JavaBeans property name convention. Now we can get a random "
-"number anywhere:"
+"a producer method, we allow the return value of the method—in this case an "
+"<literal>Integer</literal>—to be injected. We can even specify a qualifier—"
+"in this case <literal>@Random</literal>, a scope—which in this case defaults "
+"to <literal>@Dependent</literal>, and an EL name—which in this case defaults "
+"to <literal>randomNumber</literal> according to the JavaBeans property name "
+"convention. Now we can get a random number anywhere:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:623
-#, no-c-format
-msgid "<![CDATA[@Inject @Random int randomNumber;]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:625
 #, no-c-format
 msgid "Even in a Unified EL expression:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:629
-#, no-c-format
-msgid "<![CDATA[<p>Your raffle number is #{randomNumber}.</p>]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:631
 #, no-c-format
 msgid ""
 "A producer method must be a non-abstract method of a managed bean class or "
@@ -1139,13 +884,11 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:637
 #, no-c-format
 msgid "The bean types of a producer method depend upon the method return type:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:643
 #, no-c-format
 msgid ""
 "If the return type is an interface, the unrestricted set of bean types "
@@ -1154,7 +897,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:649
 #, no-c-format
 msgid ""
 "If a return type is primitive or is a Java array type, the unrestricted set "
@@ -1163,7 +905,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:655
 #, no-c-format
 msgid ""
 "If the return type is a class, the unrestricted set of bean types contains "
@@ -1172,59 +913,43 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:662
 #, no-c-format
 msgid ""
-"If the producer method has method parameters, the container will look for a "
-"bean that satisfies the type and qualifiers of each parameter and pass it to "
-"the method automatically&#8212;another form of dependency injection."
+"Producer methods and fields may have a primitive bean type. For the purpose "
+"of resolving dependencies, primitive types are considered to be identical to "
+"their corresponding wrapper types in <literal>java.lang</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:668
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Produces Set<Roles> getRoles(User user) {\n"
-"   return user.getRoles();\n"
-"}]]>"
+"If the producer method has method parameters, the container will look for a "
+"bean that satisfies the type and qualifiers of each parameter and pass it to "
+"the method automatically—another form of dependency injection."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:670
 #, no-c-format
 msgid ""
 "We'll talk much more about producer methods in <xref linkend="
-"\"producermethods\"/>."
+"\"producermethods\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:675
 #, no-c-format
 msgid "Producer fields"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:677
 #, no-c-format
 msgid ""
 "A <emphasis>producer field</emphasis> is a simpler alternative to a producer "
 "method. A producer field is declared by annotating a field of a bean class "
-"with the <literal>@Produces</literal> annotation&#8212;the same annotation "
-"used for producer methods."
+"with the <literal>@Produces</literal> annotation—the same annotation used "
+"for producer methods."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:683
-#, no-c-format
-msgid ""
-"<![CDATA[public class Shop {\n"
-"   @Produces PaymentProcessor paymentProcessor = ....;\n"
-"   @Produces @Catalog List<Product> products = ....;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:685
 #, no-c-format
 msgid ""
 "The rules for determining the bean types of a producer field parallel the "
@@ -1232,415 +957,12 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:689
 #, no-c-format
 msgid ""
 "A producer field is really just a shortcut that lets us avoid writing a "
 "useless getter method. However, in addition to convenience, producer fields "
 "serve a specific purpose as an adaptor for Java EE component environment "
 "injection, but to learn more about that, you'll have to wait until <xref "
-"linkend=\"resources\"/>. Because we can't wait to get to work on some "
+"linkend=\"resources\" />. Because we can't wait to get to work on some "
 "examples."
 msgstr ""
-
-#. Tag: title
-#: beans.xml:701
-#, no-c-format
-msgid "The (minimal) bean descriptor"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:703
-#, no-c-format
-msgid ""
-"First, it's important to understand that the XML bean descriptor in CDI "
-"(beans.xml) is not there to define beans in XML, like in other popular bean "
-"containers. Rather, you use this file to enable CDI services for the current "
-"bean archive that is difficult to define consistently in Java or which you "
-"don't want to define in Java (e.g., to accomodate testing)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:710
-#, no-c-format
-msgid ""
-"For example, the XML is used to enable interceptors (which are disabled by "
-"default) and define interceptor ordering. So the bean descriptor "
-"<emphasis>complements</emphasis> the metadata that is provided in the Java "
-"language syntax. (You may still want to define beans in XML for other "
-"reasons, but that is the concern of an extension)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:717
-#, no-c-format
-msgid ""
-"Let's first ask why the beans.xml is required, then look at what services it "
-"is used used to enable."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:722
-#, no-c-format
-msgid "Why is beans.xml required?"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:724
-#, no-c-format
-msgid ""
-"You may be wondering, if beans are not described using XML, why do we need "
-"beans.xml at all, particularly if you don't have anything that you would "
-"need the bean descriptor to enable (alternatives, interceptors or "
-"decorators)?"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:730
-#, no-c-format
-msgid "There are two things about CDI that we need to keep in mind:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:736
-#, no-c-format
-msgid ""
-"CDI does not require any special declaration for a Java class to be injected "
-"- that's right, no annotation or XML declaration at all!"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:742
-#, no-c-format
-msgid ""
-"CDI does not define any special kind of module - CDI beans can be deployed "
-"in a library JAR, EJB JAR, WAR, RAR, or JVM classpath directory."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:749
-#, no-c-format
-msgid ""
-"The CDI specification calls the process of identifying beans in modules "
-"<emphasis>bean discovery</emphasis>."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:753
-#, no-c-format
-msgid ""
-"So there are potentially a lot of classes in the classpath which might be "
-"beans! We don't want to force the container to scan every one of those "
-"classes at startup and build its internal metamodel for each of them. This "
-"really could make bean discovery very slow."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:759
-#, no-c-format
-msgid ""
-"But there's another reason we need to give the user some control over which "
-"classes are available for injection. We don't want every class in the "
-"classpath to potentially match an injection point, including classes that "
-"were never intended to be injected into things. This would force the "
-"developer to have to use qualifiers much more often to disambiguate "
-"injection points."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:766
-#, no-c-format
-msgid "So we have two choices. We could have the developer:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:772
-#, no-c-format
-msgid "explicitly exclude modules which do not contain beans, or"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:775
-#, no-c-format
-msgid "explicitly declare modules which do contain beans."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:779
-#, no-c-format
-msgid ""
-"It should be clear that the second option is a much better way to go. Thus, "
-"CDI has the notion of a bean archive. A bean archive is just a module that "
-"has a file named beans.xml in the META-INF directory. The container looks "
-"for beans in bean archives. It ignores other modules."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:785
-#, no-c-format
-msgid ""
-"Now, you might be wondering if we've got the granularity wrong here. Why "
-"should module be the right criteria to use for including/excluding a class. "
-"Why not consider:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:792
-#, no-c-format
-msgid "a class-level annotation,"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:795
-#, no-c-format
-msgid "the package,"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:798
-#, no-c-format
-msgid "some type it implements or extends, or"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:801
-#, no-c-format
-msgid "some naming convention."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:805
-#, no-c-format
-msgid ""
-"We've got the first option covered. Annotate a bean <literal>@Alternative</"
-"literal>, or with an alternative stereotype, and it will be considered "
-"disabled by CDI, as long as you don't explicitly enable it in beans.xml. "
-"That's not quite the same thing as excluding the class from scanning "
-"altogether, but it's close. (One difference is that a portable extension "
-"with still get a <literal>ProcessAnnotatedType</literal> event for that "
-"class)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:813
-#, no-c-format
-msgid ""
-"A future version of CDI might allow you to declare excluded packages in "
-"beans.xml. Excluding a bean by type or naming convention isn't really that "
-"appealing. In the world of CDI, we use stereotypes for identifying "
-"architectural roles. We don't use marker interfaces or naming conventions. "
-"Names really shouldn't affect functionality as it is too fragile."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:820
-#, no-c-format
-msgid "Enough theory, what elements are available in beans.xml?"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:826
-#, no-c-format
-msgid "Bean descriptor schema"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:828
-#, no-c-format
-msgid ""
-"If you don't need to activate any interceptors, decorators or alternatives "
-"(you just have plain beans that you need to use in an archive), the beans."
-"xml file can be <emphasis>empty</emphasis>. If you do have one of these "
-"requirements, then you need to start popularing the descriptor."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:834
-#, no-c-format
-msgid ""
-"The root element of a beans.xml file is <literal>beans</literal>, with the "
-"following <ulink url=\"http://anonsvn.jboss.org/repos/weld/api/trunk/cdi/src/"
-"main/resources/beans.xsd\">schema</ulink>:"
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:839
-#, no-c-format
-msgid ""
-"<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<beans xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee \n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"</beans>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:841
-#, no-c-format
-msgid ""
-"The <literal>beans</literal> element can have one or more of each of the "
-"following children:"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:847
-#, no-c-format
-msgid "interceptors"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:850
-#, no-c-format
-msgid "decorators"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:853
-#, no-c-format
-msgid "alternatives"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:857
-#, no-c-format
-msgid "Let's look at each element in detail."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:862
-#, no-c-format
-msgid "&lt;interceptors&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:864
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled interceptors bound via interceptor "
-"bindings. An interceptor must be explicitly enabled by listing the fully "
-"qualified class name in a child &lt;class&gt; element of &lt;"
-"interceptors&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:870
-#, no-c-format
-msgid ""
-"There may be zero or more interceptor class elements. The order of the class "
-"declarations determines the interceptor ordering. Interceptors which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an interceptor "
-"class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:877
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.intercept.SecurityInterceptor</class>\n"
-"   <class>com.acme.intercept.TransactionInterceptor</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:883
-#, no-c-format
-msgid "&lt;decorators&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:885
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled decorators. A decorator must be "
-"explicitly enabled by listing the fully qualified class name in a child &lt;"
-"class&gt; element of &lt;decorators&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:891
-#, no-c-format
-msgid ""
-"There may be zero or more decorator class elements. The order of the class "
-"declarations determines the decorator ordering. Decorators which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an decorator class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:898
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.decorate.BigAccountDecorator</class>\n"
-"   <class>com.acme.decorate.SpecialGiftDecorator</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:903
-#, no-c-format
-msgid "&lt;alternatives&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:905
-#, no-c-format
-msgid ""
-"An alternative is a bean that must be explicitly declared in the beans.xml "
-"file if it should be available for lookup, injection or EL resolution. By "
-"default, a bean archive has no active alternatives. An alternative must be "
-"explicitly declared using the fully qualified bean class name or stereotype "
-"class name in either a child &lt;class&gt; or &lt;stereotype&gt; element of "
-"&lt;alternatives&gt;, respectively."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:913
-#, no-c-format
-msgid ""
-"An alternative is selected for the bean archive if either: the alternative "
-"is a managed bean or session bean and the bean class of the bean is listed, "
-"or the alternative is a producer method, field or resource, and the bean "
-"class that declares the method or field is listed, or any "
-"<literal>@Alternative</literal> stereotype of the alternative is listed."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:920
-#, no-c-format
-msgid ""
-"There may be zero or more alternative bean class elements. The same class "
-"may not be listed twice. And of course, the class must exist and it must be "
-"an alternative bean class."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:925
-#, no-c-format
-msgid ""
-"There may also be zero or more <literal>@Alternative</literal> stereotype "
-"elements. The same stereotype may not be listed twice. And of course, the "
-"stereotype class must exist and it must be an stereotype annotation."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:931
-#, no-c-format
-msgid ""
-"<![CDATA[<stereotypes>\n"
-"   <class>com.acme.business.MockPaymentProcessor</class>\n"
-"   <stereotype>com.acme.stereotype.Mock</stereotype>\n"
-"</stereotypes>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:935
-#, no-c-format
-msgid ""
-"And that's it! A very simple schema, used only to activate and order CDI "
-"services."
-msgstr ""

Modified: doc/trunk/reference/es-ES/decorators.po
===================================================================
--- doc/trunk/reference/es-ES/decorators.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/decorators.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: decorators\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-19 11:35+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: decorators.xml:5
 #, no-c-format
 msgid "Decorators"
 msgstr "Decoradores"
 
 #. Tag: para
-#: decorators.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors are a powerful way to capture and separate concerns which are "
@@ -44,7 +42,6 @@
 "distinguir cuestiones relacionadas con negocios."
 
 #. Tag: para
-#: decorators.xml:15
 #, fuzzy, no-c-format
 msgid ""
 "The reverse is true of <emphasis>decorators</emphasis>. A decorator "
@@ -66,31 +63,11 @@
 "tipos dispares."
 
 #. Tag: para
-#: decorators.xml:24
 #, no-c-format
 msgid "Suppose we have an interface that represents accounts:"
 msgstr "Supongamos que tenemos una interfaz que representa cuentas:"
 
-#. Tag: programlisting
-#: decorators.xml:26
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface Account {\n"
-"   public BigDecimal getBalance();\n"
-"   public User getOwner();\n"
-"   public void withdraw(BigDecimal amount);\n"
-"   public void deposit(BigDecimal amount);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface Account {\n"
-"    public BigDecimal getBalance();\n"
-"    public User getOwner();\n"
-"    public void withdraw(BigDecimal amount);\n"
-"    public void deposit(BigDecimal amount);\n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:28
 #, fuzzy, no-c-format
 msgid ""
 "Several different beans in our system implement the <literal>Account</"
@@ -105,7 +82,6 @@
 "decorador."
 
 #. Tag: para
-#: decorators.xml:34
 #, fuzzy, no-c-format
 msgid ""
 "A decorator is a bean (possibly even an abstract class) that implements the "
@@ -114,74 +90,14 @@
 "Un decorador es un Web Bean sencillo que implementa el tipo que decora y es "
 "anotado <literal>@Decorator</literal>."
 
-#. Tag: programlisting
-#: decorators.xml:39
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[<Decorators>\n"
-"    <myapp:LargeTransactionDecorator/>\n"
-"</Decorators>]]>"
-
 #. Tag: para
-#: decorators.xml:41
 #, no-c-format
 msgid ""
 "The decorator implements the methods of the decorated type that it wants to "
 "intercept."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:45
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      ...\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator \n"
-"        implements Account {\n"
-"    \n"
-"    @Decorates Account account;\n"
-"    \n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    public void withdraw(BigDecimal amount) {\n"
-"        account.withdraw(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedWithdrawl(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"    public void deposit(BigDecimal amount);\n"
-"        account.deposit(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedDeposit(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "Unlike other beans, a decorator may be an abstract class. Therefore, if "
@@ -194,7 +110,6 @@
 "método."
 
 #. Tag: para
-#: decorators.xml:52
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors for a method are called before decorators that apply to the "
@@ -204,13 +119,11 @@
 "aplican a ese método."
 
 #. Tag: title
-#: decorators.xml:57
 #, fuzzy, no-c-format
 msgid "Delegate object"
 msgstr "Atributos de delegado"
 
 #. Tag: para
-#: decorators.xml:59
 #, no-c-format
 msgid ""
 "Decorators have a special injection point, called the <emphasis>delegate "
@@ -220,39 +133,23 @@
 "method parameter or injected field."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:67
 #, fuzzy, no-c-format
 msgid "A decorator is bound to any bean which:"
 msgstr "Un decorador está vinculado a cualquier Web Bean que:"
 
 #. Tag: para
-#: decorators.xml:71
 #, fuzzy, no-c-format
 msgid "has the type of the delegate injection point as a bean type, and"
 msgstr "tenga el tipo de atributo de delegado como un tipo API, y"
 
 #. Tag: para
-#: decorators.xml:74
 #, fuzzy, no-c-format
 msgid "has all qualifiers that are declared at the delegate injection point."
 msgstr ""
 "tenga todos los tipos de vinculación declarados por el atributo de delegado."
 
 #. Tag: para
-#: decorators.xml:78
 #, fuzzy, no-c-format
 msgid ""
 "This delegate injection point specifies that the decorator is bound to all "
@@ -261,14 +158,7 @@
 "Este atributo de delegado especifica que el decorador está vinculado a los "
 "Web Beans que implementan <literal>Cuenta</literal>:"
 
-#. Tag: programlisting
-#: decorators.xml:83
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
-msgstr "<![CDATA[@Decorates Account account;]]>"
-
 #. Tag: para
-#: decorators.xml:85
 #, fuzzy, no-c-format
 msgid ""
 "A delegate injection point may specify any number of qualifier annotations. "
@@ -277,14 +167,7 @@
 "Un atributo de delegado puede especificar una anotación de enlace. Luego el "
 "decorador sólo estará vinculado a los Web Beans con el mismo enlace."
 
-#. Tag: programlisting
-#: decorators.xml:90
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
-msgstr "<![CDATA[@Decorates @Foreign Account account;]]>"
-
 #. Tag: para
-#: decorators.xml:92
 #, fuzzy, no-c-format
 msgid ""
 "The decorator may invoke the delegate object, which has much the same effect "
@@ -296,64 +179,12 @@
 "mismo efecto que llamar a <literal>InvocationContext.proceed()</literal> "
 "desde un interceptor."
 
-#. Tag: programlisting
-#: decorators.xml:98
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      account.withdraw(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedWithdrawl(amount) );\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      account.deposit(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedDeposit(amount) );\n"
-"      }\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator \n"
-"        implements Account {\n"
-"    \n"
-"    @Decorates Account account;\n"
-"    \n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    public void withdraw(BigDecimal amount) {\n"
-"        account.withdraw(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedWithdrawl(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"    public void deposit(BigDecimal amount);\n"
-"        account.deposit(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedDeposit(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: title
-#: decorators.xml:103
 #, no-c-format
 msgid "Enabling decorators"
 msgstr "Habilitar decoradores"
 
 #. Tag: para
-#: decorators.xml:105
 #, no-c-format
 msgid ""
 "By default, all decorators are disabled. We need to <emphasis>enable</"
@@ -361,24 +192,7 @@
 "bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:111
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <decorators>\n"
-"         <class>org.mycompany.myapp.LargeTransactionDecorator</class>\n"
-"   </decorators>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:113
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
@@ -388,7 +202,6 @@
 "<literal>&lt;Interceptores&gt;</literal> sirve para interceptores:"
 
 #. Tag: para
-#: decorators.xml:120
 #, no-c-format
 msgid ""
 "it enables us to specify a total ordering for all decorators in our system, "
@@ -398,14 +211,139 @@
 "sistema, garantizando una conducta de determinación y "
 
 #. Tag: para
-#: decorators.xml:126
 #, no-c-format
 msgid "it lets us enable or disable decorator classes at deployment time."
 msgstr ""
 "nos permite habilitar o inhabilitar las clases de decorador en el momento de "
 "implementación."
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "   public BigDecimal getBalance();\n"
+#~ "   public User getOwner();\n"
+#~ "   public void withdraw(BigDecimal amount);\n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "    public BigDecimal getBalance();\n"
+#~ "    public User getOwner();\n"
+#~ "    public void withdraw(BigDecimal amount);\n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[<Decorators>\n"
+#~ "    <myapp:LargeTransactionDecorator/>\n"
+#~ "</Decorators>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator \n"
+#~ "        implements Account {\n"
+#~ "    \n"
+#~ "    @Decorates Account account;\n"
+#~ "    \n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    public void withdraw(BigDecimal amount) {\n"
+#~ "        account.withdraw(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "        account.deposit(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedDeposit(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
+#~ msgstr "<![CDATA[@Decorates Account account;]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
+#~ msgstr "<![CDATA[@Decorates @Foreign Account account;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      account.withdraw(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      account.deposit(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedDeposit(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator \n"
+#~ "        implements Account {\n"
+#~ "    \n"
+#~ "    @Decorates Account account;\n"
+#~ "    \n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    public void withdraw(BigDecimal amount) {\n"
+#~ "        account.withdraw(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "        account.deposit(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedDeposit(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "All decorators have a <emphasis>delegate attribute</emphasis>. The type "
 #~ "and binding types of the delegate attribute determine which Web Beans the "
 #~ "decorator is bound to. The delegate attribute type must implement or "

Modified: doc/trunk/reference/es-ES/dependencies.po
===================================================================
--- doc/trunk/reference/es-ES/dependencies.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/dependencies.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: dependencies.xml:5
 #, no-c-format
 msgid "Weld project dependencies"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:7
 #, no-c-format
 msgid ""
 "This section lists compile-time and runtime dependencies for Weld. This list "
@@ -30,105 +28,88 @@
 msgstr ""
 
 #. Tag: title
-#: dependencies.xml:13
 #, no-c-format
 msgid "Artifacts coming from Sun"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:21 dependencies.xml:110
 #, no-c-format
 msgid "Artifact"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:24 dependencies.xml:113
 #, no-c-format
 msgid "Scope"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:33
+#. Tag: para
 #, no-c-format
-msgid "javax.ejb:ejb-api:3.1"
+msgid "<literal>javax.ejb:ejb-api:3.1</literal>"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:36 dependencies.xml:44 dependencies.xml:52
-#: dependencies.xml:60 dependencies.xml:68 dependencies.xml:76
-#: dependencies.xml:128
 #, no-c-format
 msgid "compile"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:41
+#. Tag: para
 #, no-c-format
-msgid "javax.faces:jsf-api:2.0"
+msgid "<literal>javax.faces:jsf-api:2.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:49
+#. Tag: para
 #, no-c-format
-msgid "javax.el:el-api:2.1"
+msgid "<literal>javax.el:el-api:2.1</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:57
+#. Tag: para
 #, no-c-format
-msgid "javax.persistence:persistence-api:2.0"
+msgid "<literal>javax.persistence:persistence-api:2.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:65
+#. Tag: para
 #, no-c-format
-msgid "javax.servlet:servlet-api:3.0"
+msgid "<literal>javax.servlet:servlet-api:3.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:73
+#. Tag: para
 #, no-c-format
-msgid "javax.interceptor:interceptor-api:1.1"
+msgid "<literal>javax.interceptor:interceptor-api:1.1</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:81
+#. Tag: para
 #, no-c-format
-msgid "org.glasfish.web:el-impl:2.1.2"
+msgid "<literal>org.glasfish.web:el-impl:2.1.2</literal>"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:84 dependencies.xml:92
 #, no-c-format
 msgid "runtime"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:89
+#. Tag: para
 #, no-c-format
-msgid "javax.faces:jsf-impl:2.0.x"
+msgid "<literal>javax.faces:jsf-impl:2.0.x</literal>"
 msgstr ""
 
 #. Tag: title
-#: dependencies.xml:101
 #, no-c-format
 msgid "Artifacts coming from Hibernate"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:116
 #, no-c-format
 msgid "Notes"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:125
+#. Tag: para
 #, no-c-format
-msgid "javax.validation:validation-api"
+msgid "<literal>javax.validation:validation-api</literal>"
 msgstr ""
 
-#. Tag: ulink
-#: dependencies.xml:131
+#. Tag: para
 #, no-c-format
-msgid "BVAL-193"
+msgid ""
+"<ulink url=\"http://opensource.atlassian.com/projects/hibernate/browse/BVAL-"
+"193\">BVAL-193</ulink>"
 msgstr ""

Modified: doc/trunk/reference/es-ES/ee.po
===================================================================
--- doc/trunk/reference/es-ES/ee.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/ee.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ee\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-19 11:56+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: ee.xml:4
 #, no-c-format
 msgid "Java EE integration"
 msgstr "Integración Java EE"
 
 #. Tag: para
-#: ee.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "CDI is fully integrated into the Java EE environment. Beans have access to "
@@ -39,13 +37,11 @@
 "Driven Beans, los cuales no son Web Beans."
 
 #. Tag: title
-#: ee.xml:13
 #, no-c-format
 msgid "Built-in beans"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:15
 #, no-c-format
 msgid ""
 "In the Java EE environment, the container provides the following built-in "
@@ -53,20 +49,17 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:22
 #, no-c-format
 msgid "the current JTA <literal>UserTransaction</literal>,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:27
 #, no-c-format
 msgid ""
 "a <literal>Principal</literal> representing the current caller identity,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:32
 #, no-c-format
 msgid ""
 "the default <ulink url=\"http://jcp.org/en/jsr/detail?id=303\">Bean "
@@ -74,7 +67,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:38
 #, no-c-format
 msgid ""
 "a <literal>Validator</literal> for the default <literal>ValidationFactory</"
@@ -82,7 +74,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:45
 #, no-c-format
 msgid ""
 "The CDI specification does not require the servlet context objects, "
@@ -98,32 +89,18 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:57
 #, no-c-format
 msgid ""
 "Oh, you <emphasis>really</emphasis> want to inject the "
 "<literal>FacesContext</literal>? Alright then, try this producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[class FacesContextProducer {\n"
-"   @Produces @RequestScoped FacesContext getFacesContext() {\n"
-"      return FacesContext.getCurrentInstance();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: ee.xml:67
 #, fuzzy, no-c-format
 msgid "Injecting Java EE resources into a bean"
 msgstr "Inyección de recursos de Java EE en un Web Bean"
 
 #. Tag: para
-#: ee.xml:69
 #, fuzzy, no-c-format
 msgid ""
 "All managed beans may take advantage of Java EE component environment "
@@ -138,51 +115,7 @@
 "visto algunos ejemplos de esto, aunque no prestamos mucha atención en el "
 "momento."
 
-#. Tag: programlisting
-#: ee.xml:76
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @Resource UserTransaction transaction;\n"
-"\n"
-"   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"throws Exception { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource Transaction transaction;\n"
-"\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"    \n"
-"}]]>"
-
-#. Tag: programlisting
-#: ee.xml:78
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Login implements Serializable {\n"
-"   @Inject Credentials credentials;\n"
-"   @PersistenceContext EntityManager userDatabase;\n"
-"    ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped\n"
-"public class Login {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @PersistenceContext EntityManager userDatabase;\n"
-"    \n"
-"    ...\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: ee.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "The Java EE <literal>@PostConstruct</literal> and <literal>@PreDestroy</"
@@ -196,7 +129,6 @@
 "es llamado después de realizar <emphasis>toda</emphasis> la inyección."
 
 #. Tag: para
-#: ee.xml:86
 #, no-c-format
 msgid ""
 "Of course, we advise that component environment injection be used to define "
@@ -204,13 +136,11 @@
 msgstr ""
 
 #. Tag: title
-#: ee.xml:94
 #, fuzzy, no-c-format
 msgid "Calling a bean from a servlet"
 msgstr "Llamando a Web Bean desde un Servlet"
 
 #. Tag: para
-#: ee.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
@@ -220,55 +150,7 @@
 "inyecte el Web Bean mediante campo de Web Beans o Inyección de método "
 "inicializador."
 
-#. Tag: programlisting
-#: ee.xml:101
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Login extends HttpServlet {\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject Login login;\n"
-"\n"
-"   @Override\n"
-"   public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"      throws ServletException, IOException {\n"
-"      credentials.setUsername(request.getParameter(\"username\")):\n"
-"      credentials.setPassword(request.getParameter(\"password\")):\n"
-"      login.login();\n"
-"      if ( login.isLoggedIn() ) {\n"
-"         response.sendRedirect(\"/home.jsp\");\n"
-"      }\n"
-"      else {\n"
-"         response.sendRedirect(\"/loginError.jsp\");\n"
-"      }\n"
-"   }\n"
-"            \n"
-"}]]>"
-msgstr ""
-"public class Login extends HttpServlet {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @Current Login login;\n"
-"\n"
-"    @Override\n"
-"    public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"        throws ServletException, IOException {\n"
-"        credentials.setUsername( request.getAttribute(\"username\") ):\n"
-"        credentials.setPassword( request.getAttribute(\"password\") ):\n"
-"        login.login();\n"
-"        if ( login.isLoggedIn() ) {\n"
-"            response.sendRedirect(\"/home.jsp\");\n"
-"        }\n"
-"        else {\n"
-"            response.sendRedirect(\"/loginError.jsp\");\n"
-"        }\n"
-"    }\n"
-"            \n"
-"}"
-
 #. Tag: para
-#: ee.xml:103
 #, fuzzy, no-c-format
 msgid ""
 "Since instances of servlets are shared across all incoming threads, the bean "
@@ -282,13 +164,11 @@
 "la petición y sesión HTTP actuales."
 
 #. Tag: title
-#: ee.xml:112
 #, fuzzy, no-c-format
 msgid "Calling a bean from a message-driven bean"
 msgstr "Llamada a un Web Bean desde un Message-Driven Bean"
 
 #. Tag: para
-#: ee.xml:114
 #, no-c-format
 msgid ""
 "CDI injection applies to all EJBs, even when they aren't managed beans. In "
@@ -297,41 +177,13 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:119
 #, fuzzy, no-c-format
 msgid "You can even use CDI interceptor bindings for message-driven Beans."
 msgstr ""
 "Se pueden incluso utilizar enlaces de interceptor de Web Beans para Message-"
 "Driven Beans."
 
-#. Tag: programlisting
-#: ee.xml:121
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"   @Inject Inventory inventory;\n"
-"   @PersistenceContext EntityManager em;\n"
-"\n"
-"   public void onMessage(Message message) {\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"\n"
-"    @Current Inventory inventory;\n"
-"    @PersistenceContext EntityManager em;\n"
-"\n"
-"    public void onMessage(Message message) {\n"
-"        ...\n"
-"    }\n"
-"            \n"
-"}"
-
 #. Tag: para
-#: ee.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "Please note that there is no session or conversation context available when "
@@ -346,19 +198,16 @@
 "literal> Web Beans están disponibles."
 
 #. Tag: para
-#: ee.xml:129
 #, no-c-format
 msgid "But how about beans which <emphasis>send</emphasis> JMS messages?"
 msgstr ""
 
 #. Tag: title
-#: ee.xml:136
 #, no-c-format
 msgid "JMS endpoints"
 msgstr "endpoints JMS"
 
 #. Tag: para
-#: ee.xml:138
 #, no-c-format
 msgid ""
 "Sending messages using JMS can be quite complex, because of the number of "
@@ -382,96 +231,20 @@
 "de hilos de los cuales tenemos que preocuparnos."
 
 #. Tag: para
-#: ee.xml:147
 #, no-c-format
 msgid ""
 "You can use producer fields and methods to prepare all of these resources "
 "for injection into a bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[public class OrderResources {\n"
-"   @Resource(name=\"jms/ConnectionFactory\")\n"
-"   private ConnectionFactory connectionFactory;\n"
-"  \n"
-"   @Resource(name=\"jms/OrderQueue\")\n"
-"   private Queue orderQueue;\n"
-"  \n"
-"   @Produces @OrderConnection\n"
-"   public Connection createOrderConnection() throws JMSException {\n"
-"    return connectionFactory.createConnection();\n"
-"   }\n"
-"  \n"
-"   public void closeOrderConnection(@Disposes @OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      connection.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderSession\n"
-"   public Session createOrderSession(@OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      return connection.createSession(true, Session.AUTO_ACKNOWLEDGE);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderSession(@Disposes @OrderSession Session session)\n"
-"         throws JMSException {\n"
-"      session.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderMessageProducer\n"
-"   public MessageProducer createOrderMessageProducer(@OrderSession Session "
-"session)\n"
-"         throws JMSException {\n"
-"      return session.createProducer(orderQueue);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderMessageProducer(@Disposes @OrderMessageProducer "
-"MessageProducer producer)\n"
-"         throws JMSException {\n"
-"      producer.close();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: ee.xml:153
 #, no-c-format
 msgid ""
 "In this example, we can just inject the prepared <literal>MessageProducer</"
 "literal>, <literal>Connection</literal> or <literal>QueueSession</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:158
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject Order order;\n"
-"@Inject @OrderMessageProducer MessageProducer producer;\n"
-"@Inject @OrderSession QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"   MapMessage msg = orderSession.createMapMessage();\n"
-"   msg.setLong(\"orderId\", order.getId());\n"
-"   ...\n"
-"   producer.send(msg);\n"
-"}]]>"
-msgstr ""
-"@OrderProcessor QueueSender orderSender;\n"
-"@OrderProcessor QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"    MapMessage msg = orderSession.createMapMessage();\n"
-"    ...\n"
-"    orderSender.send(msg);\n"
-"}"
-
 #. Tag: para
-#: ee.xml:164
 #, fuzzy, no-c-format
 msgid ""
 "The lifecycle of the injected JMS objects is completely controlled by the "
@@ -481,22 +254,20 @@
 "administrador deWeb Bean."
 
 #. Tag: title
-#: ee.xml:171
 #, no-c-format
 msgid "Packaging and deployment"
 msgstr "Empaquetamiento y despliegue."
 
 #. Tag: para
-#: ee.xml:173
 #, fuzzy, no-c-format
 msgid ""
 "CDI doesn't define any special deployment archive. You can package beans in "
-"JARs, EJB-JARs or WARs&#8212;any deployment location in the application "
-"classpath. However, the archive must be a \"bean archive\". That means each "
-"archive that contains beans <emphasis>must</emphasis> include a file named "
+"jars, ejb jars or wars—any deployment location in the application classpath. "
+"However, the archive must be a \"bean archive\". That means each archive "
+"that contains beans <emphasis>must</emphasis> include a file named "
 "<literal>beans.xml</literal> in the <literal>META-INF</literal> directory of "
 "the classpath or <literal>WEB-INF</literal> directory of the web root (for "
-"WAR archives). The file may be empty. Beans deployed in archives that do not "
+"war archives). The file may be empty. Beans deployed in archives that do not "
 "have a <literal>beans.xml</literal> file will not be available for use in "
 "the application."
 msgstr ""
@@ -510,7 +281,6 @@
 "estarán disponibles para uso en la aplicación."
 
 #. Tag: para
-#: ee.xml:182
 #, fuzzy, no-c-format
 msgid ""
 "In an embeddable EJB container, beans may be deployed in any location in "
@@ -522,7 +292,137 @@
 "contenedor Lite EJB incorporable. De nuevo, cada lugar debe contener un "
 "archivo <literal>web-beans.xml</literal>."
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "throws Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource Transaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login implements Serializable {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @PersistenceContext EntityManager userDatabase;\n"
+#~ "    ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @PersistenceContext EntityManager userDatabase;\n"
+#~ "    \n"
+#~ "    ...\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Login extends HttpServlet {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject Login login;\n"
+#~ "\n"
+#~ "   @Override\n"
+#~ "   public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "      throws ServletException, IOException {\n"
+#~ "      credentials.setUsername(request.getParameter(\"username\")):\n"
+#~ "      credentials.setPassword(request.getParameter(\"password\")):\n"
+#~ "      login.login();\n"
+#~ "      if ( login.isLoggedIn() ) {\n"
+#~ "         response.sendRedirect(\"/home.jsp\");\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "            \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "public class Login extends HttpServlet {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @Current Login login;\n"
+#~ "\n"
+#~ "    @Override\n"
+#~ "    public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "        throws ServletException, IOException {\n"
+#~ "        credentials.setUsername( request.getAttribute(\"username\") ):\n"
+#~ "        credentials.setPassword( request.getAttribute(\"password\") ):\n"
+#~ "        login.login();\n"
+#~ "        if ( login.isLoggedIn() ) {\n"
+#~ "            response.sendRedirect(\"/home.jsp\");\n"
+#~ "        }\n"
+#~ "        else {\n"
+#~ "            response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "            \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "   @Inject Inventory inventory;\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "   public void onMessage(Message message) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "\n"
+#~ "    @Current Inventory inventory;\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "    public void onMessage(Message message) {\n"
+#~ "        ...\n"
+#~ "    }\n"
+#~ "            \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Order order;\n"
+#~ "@Inject @OrderMessageProducer MessageProducer producer;\n"
+#~ "@Inject @OrderSession QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "   MapMessage msg = orderSession.createMapMessage();\n"
+#~ "   msg.setLong(\"orderId\", order.getId());\n"
+#~ "   ...\n"
+#~ "   producer.send(msg);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@OrderProcessor QueueSender orderSender;\n"
+#~ "@OrderProcessor QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "    MapMessage msg = orderSession.createMapMessage();\n"
+#~ "    ...\n"
+#~ "    orderSender.send(msg);\n"
+#~ "}"
+
+#~ msgid ""
 #~ "There is one restriction to be aware of here: <literal>@PersistenceContext"
 #~ "(type=EXTENDED)</literal> is not supported for simple Web Beans."
 #~ msgstr ""

Modified: doc/trunk/reference/es-ES/environments.po
===================================================================
--- doc/trunk/reference/es-ES/environments.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/environments.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,22 +15,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: environments.xml:4
 #, no-c-format
 msgid "Application servers and environments supported by Weld"
 msgstr ""
 
 #. Tag: title
-#: environments.xml:7
 #, no-c-format
 msgid "Using Weld with JBoss AS"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:9
 #, no-c-format
 msgid ""
-"If you are using JBoss AS 5.2, no additional configuration is required to "
+"If you are using JBoss AS 6.0, no additional configuration is required to "
 "use Weld (or CDI for that matter). All you need to do is make your "
 "application a bean bean archive by adding <literal>META-INF/beans.xml</"
 "literal> to the classpath or <literal>WEB-INF/beans.xml</literal> to the web "
@@ -38,50 +35,39 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:15
 #, no-c-format
 msgid ""
 "Unfortunately, you can't use Weld with earlier versions of JBoss AS since "
 "they are missing key libraries. If you want to learn how to upgrade the "
-"built-in support on JBoss AS 5.2, then read on."
+"built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:20
 #, no-c-format
 msgid ""
-"Upgrading the Weld add-on is easy. The Weld distribution has a build that "
-"can take care of this task for you in a single command. First, we need to "
-"tell Weld where JBoss AS is located. Create a new file named <literal>local."
-"build.properties</literal> in the examples directory of the Weld "
-"distribution and assign the path of your JBoss AS installation to the "
-"property key <literal>jboss.home</literal>, as follows:"
+"If there is a newer release of Weld than what is included in the latest "
+"JBoss AS 6 release, upgrading the Weld add-on is easy. The Weld distribution "
+"includes a build script that can take care of this task for you in a single "
+"command."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:27
+#. Tag: para
 #, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"
+msgid ""
+"First, we need to tell Weld where JBoss AS is located. This information is "
+"communicated by assigning the <literal>JBOSS_HOME</literal> environment "
+"variable. In a bash shell, you can assign the environment variable as "
+"follows:"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:29
 #, no-c-format
 msgid ""
 "Now we can install the Weld deployer from the <literal>jboss-as</literal> "
 "directory of the Weld distribution:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:33
-#, no-c-format
-msgid ""
-"$> cd jboss-as\n"
-"$> ant update"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:36
 #, no-c-format
 msgid ""
 "A new deployer, <literal>weld.deployer</literal> is added to JBoss AS. This "
@@ -92,13 +78,11 @@
 msgstr ""
 
 #. Tag: title
-#: environments.xml:46
 #, no-c-format
 msgid "GlassFish"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:48
 #, no-c-format
 msgid ""
 "Weld is also built into GlassFish from V3 onwards. Since GlassFish V3 is the "
@@ -109,13 +93,11 @@
 msgstr ""
 
 #. Tag: title
-#: environments.xml:56
 #, no-c-format
 msgid "Servlet containers (such as Tomcat or Jetty)"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:58
 #, no-c-format
 msgid ""
 "While JSR-299 does not require support for servlet environments, Weld can be "
@@ -123,7 +105,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:64
 #, no-c-format
 msgid ""
 "There is a major limitation to using a servlet container. Weld doesn't "
@@ -134,7 +115,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:72
 #, no-c-format
 msgid ""
 "Weld should be used as a web application library in a servlet container. You "
@@ -145,62 +125,52 @@
 "could use its component jars:"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:84
+#. Tag: para
 #, no-c-format
-msgid "jsr299-api.jar"
+msgid "<literal>jsr299-api.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:89
+#. Tag: para
 #, no-c-format
-msgid "weld-api.jar"
+msgid "<literal>weld-api.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:94
+#. Tag: para
 #, no-c-format
-msgid "weld-spi.jar"
+msgid "<literal>weld-spi.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:99
+#. Tag: para
 #, no-c-format
-msgid "weld-core.jar"
+msgid "<literal>weld-core.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:104
+#. Tag: para
 #, no-c-format
-msgid "weld-logging.jar"
+msgid "<literal>weld-logging.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:109
+#. Tag: para
 #, no-c-format
-msgid "weld-servlet-int.jar"
+msgid "<literal>weld-servlet-int.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:114
+#. Tag: para
 #, no-c-format
-msgid "javassist.jar"
+msgid "<literal>javassist.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:119
+#. Tag: para
 #, no-c-format
-msgid "dom4j.jar"
+msgid "<literal>dom4j.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:124
+#. Tag: para
 #, no-c-format
-msgid "google-collections.jar"
+msgid "<literal>google-collections.jar</literal>"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:129
 #, no-c-format
 msgid ""
 "You also need to explicitly specify the servlet listener (used to boot Weld, "
@@ -208,24 +178,12 @@
 "literal> in the web root:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:137
 #, no-c-format
 msgid "Tomcat"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:139
 #, no-c-format
 msgid ""
 "Tomcat has a read-only JNDI, so Weld can't automatically bind the "
@@ -234,40 +192,14 @@
 "following contents:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:145
-#, no-c-format
-msgid ""
-"<![CDATA[<Context>\n"
-"   <Resource name=\"BeanManager\" \n"
-"      auth=\"Container\"\n"
-"      type=\"javax.enterprise.inject.spi.BeanManager\"\n"
-"      factory=\"org.jboss.weld.resources.ManagerObjectFactory\"/>\n"
-"</Context>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:147
 #, no-c-format
 msgid ""
 "and make it available to your deployment by adding this to the bottom of "
 "<literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[<resource-env-ref>\n"
-"   <resource-env-ref-name>BeanManager</resource-env-ref-name>\n"
-"   <resource-env-ref-type>\n"
-"      javax.enterprise.inject.spi.BeanManager\n"
-"   </resource-env-ref-type>\n"
-"</resource-env-ref>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:153
 #, no-c-format
 msgid ""
 "Tomcat only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -276,7 +208,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:158
 #, no-c-format
 msgid ""
 "Weld also supports Servlet injection in Tomcat. To enable this, place the "
@@ -284,22 +215,12 @@
 "literal>, and add the following to <literal>META-INF/context.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:164
-#, no-c-format
-msgid ""
-"<![CDATA[<Listener className=\"org.jboss.weld.environment.tomcat."
-"WeldLifecycleListener\"/>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:169
 #, no-c-format
 msgid "Jetty"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:171
 #, no-c-format
 msgid ""
 "Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind "
@@ -307,32 +228,7 @@
 "INF/jetty-env.xml</literal> with the following contents:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:176
-#, no-c-format
-msgid ""
-"<![CDATA[<!DOCTYPE Configure PUBLIC \"-//Mort Bay Consulting//DTD Configure//"
-"EN\"\n"
-"   \"http://jetty.mortbay.org/configure.dtd\">\n"
-"<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext"
-"\">\n"
-"   <New id=\"BeanManager\" class=\"org.mortbay.jetty.plus.naming.Resource"
-"\">\n"
-"      <Arg><Ref id=\"webAppCtx\"/></Arg> \n"
-"      <Arg>BeanManager</Arg>\n"
-"      <Arg>\n"
-"         <New class=\"javax.naming.Reference\">\n"
-"            <Arg>javax.enterprise.inject.spi.BeanManager</Arg> \n"
-"            <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>\n"
-"            <Arg/>\n"
-"         </New>\n"
-"      </Arg>\n"
-"   </New>\n"
-"</Configure>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:178
 #, no-c-format
 msgid ""
 "Notice that Jetty doesn't not have built-in support for an <literal>javax."
@@ -342,7 +238,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:184
 #, no-c-format
 msgid ""
 "Jetty only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -351,19 +246,16 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:189
 #, no-c-format
 msgid "Weld does not currently support Servlet injection in Jetty."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:198
 #, no-c-format
 msgid "Java SE"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:200
 #, no-c-format
 msgid ""
 "In addition to improved integration of the Enterprise Java stack, the "
@@ -376,7 +268,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:208
 #, no-c-format
 msgid ""
 "When executing in the SE environment the following features of Weld are "
@@ -384,7 +275,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:214
 #, no-c-format
 msgid ""
 "Managed beans with <literal>@PostConstruct</literal> and "
@@ -392,13 +282,11 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:220
 #, no-c-format
 msgid "Dependency injection with qualifiers and alternatives"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:225
 #, no-c-format
 msgid ""
 "<literal>@Application</literal>, <literal>@Dependent</literal> and "
@@ -406,43 +294,36 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:231
 #, no-c-format
 msgid "Interceptors and decorators"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:236
 #, no-c-format
 msgid "Stereotypes"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:241
 #, no-c-format
 msgid "Events"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:246
 #, no-c-format
 msgid "Portable extension support"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:252
 #, no-c-format
 msgid "EJB beans are not supported."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:257
 #, no-c-format
 msgid "CDI SE Module"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:259
 #, no-c-format
 msgid ""
 "Weld provides an extension which will boot a CDI bean manager in Java SE, "
@@ -450,26 +331,12 @@
 "command line parameters can be injected using either of the following:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:264
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters List<String> params;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: environments.xml:266
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters String[] paramsArray;]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:268
 #, no-c-format
 msgid "The second form is useful for compatibility with existing classes."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:273
 #, no-c-format
 msgid ""
 "The command line parameters do not become available for injection until the "
@@ -480,45 +347,26 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:282
 #, no-c-format
 msgid "Here's an example of a simple CDI SE application:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:286
-#, no-c-format
-msgid ""
-"<![CDATA[@Singleton\n"
-"public class HelloWorld\n"
-"{\n"
-"   public void printHello(@Observes ContainerInitialized event, @Parameters "
-"List<String> parameters) {\n"
-"       System.out.println(\"Hello \" + parameters.get(0));\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:292
 #, no-c-format
 msgid "Bootstrapping CDI SE"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:294
 #, no-c-format
 msgid "CDI SE applications can be bootstrapped in the following ways."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:300
 #, no-c-format
 msgid "The ContainerInitialized Event"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:302
 #, no-c-format
 msgid ""
 "Thanks to the power of CDI's typesafe event model, application developers "
@@ -530,27 +378,18 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:310
 #, no-c-format
 msgid ""
 "In this case your application can be started by calling the provided main "
 "method like so:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:313
-#, no-c-format
-msgid "<![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:319
 #, no-c-format
 msgid "Programatic Bootstrap API"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:321
 #, no-c-format
 msgid ""
 "For added flexibility, CDI SE also comes with a bootstrap API which can be "
@@ -559,90 +398,65 @@
 "classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:327
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class Weld\n"
-"{\n"
-"\n"
-"   /** Boots Weld and creates and returns a WeldContainer instance, through "
-"which\n"
-"    * beans and events can be accesed. */\n"
-"   public WeldContainer initialize() {...}\n"
-"\n"
-"   /** Convenience method for shutting down the container. */\n"
-"   public void shutdown() {...}\n"
-"\n"
-"}]]>"
+"Here's an example application main method which uses this API to initialize "
+"a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:329
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class WeldContainer\n"
-"{\n"
-"\n"
-"   /** Provides access to all beans within the application. */\n"
-"   public Instance<Object> instance() {...}\n"
-"\n"
-"   /** Provides access to all events within the application. */\n"
-"   public Event<Object> event() {...}\n"
-"\n"
-"   /** Provides direct access to the BeanManager. */\n"
-"   public BeanManager getBeanManager() {...}\n"
-"\n"
-"}]]>"
+"Alternatively the application could be started by firing a custom event "
+"which would then be observed by another simple bean. The following example "
+"fires <literal>MyEvent</literal> on startup."
 msgstr ""
 
-#. Tag: para
-#: environments.xml:331
+#. Tag: title
 #, no-c-format
-msgid ""
-"Here's an example application main method which uses this API to initialize "
-"a bean of type <literal>MyApplicationBean</literal>."
+msgid "Thread Context"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:334
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.instance().select(MyApplicationBean.class).get();\n"
-"   weld.shutdown();\n"
-"}]]>"
+"In contrast to Java EE applications, Java SE applications place no "
+"restrictions on developers regarding the creation and usage of threads. "
+"Therefore Weld SE provides a custom scope annotation, "
+"<literal>@ThreadScoped</literal>, and corresponding context implementation "
+"which can be used to bind bean instances to the current thread. It is "
+"intended to be used in scenarios where you might otherwise use "
+"<literal>ThreadLocal</literal>, and does in fact use <literal>ThreadLocal</"
+"literal> under the hood."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:336
 #, no-c-format
 msgid ""
-"Alternatively the application could be started by firing a custom event "
-"which would then be observed by another simple bean. The following example "
-"fires <literal>MyEvent</literal> on startup."
+"To use the @ThreadScoped annotation you need to enable the "
+"<literal>RunnableDecorator</literal> which 'listens' for all executions of "
+"<literal>Runnable.run()</literal> and decorates them by setting up the "
+"thread context beforehand, bound to the current thread, and destroying the "
+"context afterwards."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:340
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.event().select(MyEvent.class).fire( new MyEvent() );\n"
-"   weld.shutdown();\n"
-"}]]>"
+"It is not necessary to use @ThreadScoped in all multithreaded applications. "
+"The thread context is not intended as a replacement for defining your own "
+"application-specific contexts. It is generally only useful in situtations "
+"where you would otherwise have used ThreadLocal directly, which are "
+"typically rare."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:348
 #, no-c-format
 msgid "Setting the Classpath"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:350
 #, no-c-format
 msgid ""
 "Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld "

Modified: doc/trunk/reference/es-ES/events.po
===================================================================
--- doc/trunk/reference/es-ES/events.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/events.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: events\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-19 13:59+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: events.xml:4
 #, no-c-format
 msgid "Events"
 msgstr "Eventos"
 
 #. Tag: para
-#: events.xml:6
 #, no-c-format
 msgid ""
 "Dependency injection enables loose-coupling by allowing the implementation "
@@ -34,7 +32,6 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:13
 #, no-c-format
 msgid ""
 "This basic schema might sound like the familiar observer/observable pattern, "
@@ -42,7 +39,6 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:18
 #, no-c-format
 msgid ""
 "not only are event producers decoupled from observers; observers are "
@@ -53,7 +49,6 @@
 "productores."
 
 #. Tag: para
-#: events.xml:22
 #, no-c-format
 msgid ""
 "observers can specify a combination of \"selectors\" to narrow the set of "
@@ -63,7 +58,6 @@
 "limitar el conjunto de notificaciones de eventos que recibirán y"
 
 #. Tag: para
-#: events.xml:28
 #, fuzzy, no-c-format
 msgid ""
 "observers can be notified immediately, or can specify that delivery of the "
@@ -74,7 +68,6 @@
 "actual"
 
 #. Tag: para
-#: events.xml:35
 #, no-c-format
 msgid ""
 "The CDI event notification facility uses more or less the same typesafe "
@@ -82,13 +75,11 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:39
 #, fuzzy, no-c-format
 msgid "Event payload"
 msgstr "Productores de Evento"
 
 #. Tag: para
-#: events.xml:41
 #, no-c-format
 msgid ""
 "The event object carries state from producer to consumer. The event object "
@@ -100,35 +91,18 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:48
 #, no-c-format
 msgid ""
 "An event qualifier is just a normal qualifier, defined using "
 "<literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({FIELD, PARAMETER})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated {}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated { ... }]]>"
-
 #. Tag: title
-#: events.xml:57
 #, no-c-format
 msgid "Event observers"
 msgstr "Observadores de evento"
 
 #. Tag: para
-#: events.xml:59
 #, fuzzy, no-c-format
 msgid ""
 "An <emphasis>observer method</emphasis> is a method of a bean with a "
@@ -137,18 +111,7 @@
 "Un <emphasis>método de observador</emphasis> es un método de un Web Bean con "
 "un parámetro anotado <literal>@Observes</literal>."
 
-#. Tag: programlisting
-#: events.xml:64
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }]]>"
-
 #. Tag: para
-#: events.xml:66
 #, fuzzy, no-c-format
 msgid ""
 "The annotated parameter is called the <emphasis>event parameter</emphasis>. "
@@ -163,23 +126,12 @@
 "un tipo de enlace se utiliza como un selector de evento, es llamado un "
 "<emphasis>tipo de enlace de evento</emphasis>."
 
-#. Tag: programlisting
-#: events.xml:72 events.xml:240
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:74
 #, fuzzy, no-c-format
 msgid ""
-"An observer method need not specify any event qualifiers&#8212;in this case "
-"it is interested in <emphasis>all</emphasis> events of a particular type. If "
-"it does specify qualifiers, it's only interested in events which have those "
+"An observer method need not specify any event qualifiers—in this case it is "
+"interested in <emphasis>all</emphasis> events of a particular type. If it "
+"does specify qualifiers, it's only interested in events which have those "
 "qualifiers."
 msgstr ""
 "Un método de observador no necesita especificar ningún enlace de evento  "
@@ -188,7 +140,6 @@
 "está  interesado en eventos que también tienen esos enlaces de eventos."
 
 #. Tag: para
-#: events.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "The observer method may have additional parameters, which are injection "
@@ -198,24 +149,12 @@
 "inyectan de acuerdo con la semántica de inyección del parámetro usual de "
 "método de Web Beans:"
 
-#. Tag: programlisting
-#: events.xml:84
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document, User user) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document, User user) { ... }]]>"
-
 #. Tag: title
-#: events.xml:89
 #, no-c-format
 msgid "Event producers"
 msgstr "Productores de Evento"
 
 #. Tag: para
-#: events.xml:91
 #, no-c-format
 msgid ""
 "Event producers fire events using an instance of the parameterized "
@@ -223,14 +162,7 @@
 "obtained by injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:96
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
-msgstr "<![CDATA[@Observable Event<Document> documentEvent]]>"
-
 #. Tag: para
-#: events.xml:98
 #, fuzzy, no-c-format
 msgid ""
 "A producer raises events by calling the <literal>fire()</literal> method of "
@@ -240,20 +172,12 @@
 "interfaz del <literal>Evento</literal>, pasando un <emphasis>objeto de "
 "evento</emphasis>:"
 
-#. Tag: programlisting
-#: events.xml:103
-#, no-c-format
-msgid "<![CDATA[documentEvent.fire(document);]]>"
-msgstr "<![CDATA[documentEvent.fire(document);]]>"
-
 #. Tag: para
-#: events.xml:105
 #, fuzzy, no-c-format
 msgid "This particular event will be delivered to every observer method that:"
 msgstr "El evento será entregado a cada método de observador que:"
 
 #. Tag: para
-#: events.xml:111
 #, fuzzy, no-c-format
 msgid ""
 "has an event parameter to which the event object (the <literal>Document</"
@@ -262,13 +186,11 @@
 "tenga un parámetro de evento al cual el objeto de evento sea asignable y"
 
 #. Tag: para
-#: events.xml:115
 #, fuzzy, no-c-format
 msgid "specifies no qualifiers."
 msgstr "especifique que no hay enlaces de eventos."
 
 #. Tag: para
-#: events.xml:119
 #, fuzzy, no-c-format
 msgid ""
 "The container simply calls all the observer methods, passing the event "
@@ -283,19 +205,16 @@
 "la excepción es reenviada por el método <literal>fire()</literal>."
 
 #. Tag: para
-#: events.xml:125
 #, no-c-format
 msgid "Qualifiers can be applied to an event in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: events.xml:131
 #, no-c-format
 msgid "by annotating the <literal>Event</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: events.xml:134
 #, no-c-format
 msgid ""
 "by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
@@ -303,19 +222,11 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:138
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is far simpler:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:142
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
-msgstr "<![CDATA[@Observable @Updated Event<Document> documentUpdatedEvent]]>"
-
 #. Tag: para
-#: events.xml:144
 #, fuzzy, no-c-format
 msgid ""
 "Then, every event fired via this instance of <literal>Event</literal> has "
@@ -327,14 +238,12 @@
 "observador que:"
 
 #. Tag: para
-#: events.xml:151
 #, no-c-format
 msgid "has an event parameter to which the event object is assignable, and"
 msgstr ""
 "tenga un parámetro de evento al cual el objeto de evento sea asignable y"
 
 #. Tag: para
-#: events.xml:154
 #, fuzzy, no-c-format
 msgid ""
 "does not have any event qualifier <emphasis>except</emphasis> for the event "
@@ -345,7 +254,6 @@
 "enlaces de evento pasados a <literal>fire()</literal>."
 
 #. Tag: para
-#: events.xml:161
 #, no-c-format
 msgid ""
 "The downside of annotating the injection point is that we can't specify the "
@@ -355,18 +263,7 @@
 "<literal>Event</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:167
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
-"(document);]]>"
-msgstr ""
-"<![CDATA[documentEvent.fire( document, new AnnotationLiteral<Updated>()"
-"{} );]]>"
-
 #. Tag: para
-#: events.xml:169
 #, no-c-format
 msgid ""
 "Events can have multiple event qualifiers, assembled using any combination "
@@ -375,13 +272,11 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:178
 #, fuzzy, no-c-format
 msgid "Conditional observer methods"
 msgstr "Observadores transaccionales"
 
 #. Tag: para
-#: events.xml:180
 #, no-c-format
 msgid ""
 "By default, if there is no instance of an observer in the current context, "
@@ -391,25 +286,13 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:186
 #, no-c-format
 msgid ""
 "A conditional observer is specified by adding <literal>receive = IF_EXISTS</"
 "literal> to the <literal>@Observes</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = IF_EXISTS) "
-"@Updated Document d) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:193
 #, no-c-format
 msgid ""
 "A bean with scope <literal>@Dependent</literal> cannot be a conditional "
@@ -417,37 +300,16 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:200
 #, fuzzy, no-c-format
 msgid "Event qualifiers with members"
 msgstr "Enlaces de evento con miembros"
 
 #. Tag: para
-#: events.xml:202
 #, fuzzy, no-c-format
 msgid "An event qualifier type may have annotation members:"
 msgstr "Un tipo de enlace de evento puede tener miembros de anotación:"
 
-#. Tag: programlisting
-#: events.xml:204
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"   RoleType value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"    RoleType value();\n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:206
 #, no-c-format
 msgid ""
 "The member value is used to narrow the messages delivered to the observer:"
@@ -455,18 +317,7 @@
 "El valor de miembro se utiliza para limitar los mensajes enviados al "
 "observador:"
 
-#. Tag: programlisting
-#: events.xml:208
-#, no-c-format
-msgid ""
-"<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
-"{ ... }]]>"
-
 #. Tag: para
-#: events.xml:210
 #, fuzzy, no-c-format
 msgid ""
 "Event qualifier type members may be specified statically by the event "
@@ -476,14 +327,7 @@
 "por el producto del evento, a través de anotaciones en el punto de inyección "
 "del notificador de evento."
 
-#. Tag: programlisting
-#: events.xml:215
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
-msgstr "<![CDATA[@Observable @Role(ADMIN) Event<LoggedIn> LoggedInEvent;}}]]>"
-
 #. Tag: para
-#: events.xml:217
 #, fuzzy, no-c-format
 msgid ""
 "Alternatively, the value of the event qualifier type member may be "
@@ -494,20 +338,7 @@
 "determinado de modo dinámico por el productor de evento. Empezamos por "
 "escribir una subclase abstracta de <literal>AnnotationLiteral</literal>:"
 
-#. Tag: programlisting
-#: events.xml:222
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[abstract class RoleBinding \n"
-"   extends AnnotationLiteral<Role> \n"
-"   implements Role {}]]>"
-msgstr ""
-"<![CDATA[abstract class RoleBinding \n"
-"    extends AnnotationLiteral<Role> \n"
-"    implements Role {}]]>"
-
 #. Tag: para
-#: events.xml:224
 #, fuzzy, no-c-format
 msgid ""
 "The event producer passes an instance of this class to <literal>select()</"
@@ -516,45 +347,17 @@
 "El productor de evento pasa una instancia de esta clase a <literal>fire()</"
 "literal>:"
 
-#. Tag: programlisting
-#: events.xml:226
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[documentEvent.select(new RoleBinding() {\n"
-"   public void value() { return user.getRole(); }\n"
-"}).fire(document);]]>"
-msgstr ""
-"<![CDATA[documentEvent.fire( document, new RoleBinding() { public void value"
-"() { return user.getRole(); } } );]]>"
-
 #. Tag: title
-#: events.xml:231
 #, fuzzy, no-c-format
 msgid "Multiple event qualifiers"
 msgstr "Enlaces de evento múltiples"
 
 #. Tag: para
-#: events.xml:233
 #, fuzzy, no-c-format
 msgid "Event qualifier types may be combined, for example:"
 msgstr "Los tipos de enlaces de evento pueden combinarse, por ejemplo:"
 
-#. Tag: programlisting
-#: events.xml:235
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>(){})."
-"fire(document);]]>"
-msgstr ""
-"<![CDATA[@Observable @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.fire(document, new "
-"AnnotationLiteral<Updated>(){});]]>"
-
 #. Tag: para
-#: events.xml:237
 #, no-c-format
 msgid ""
 "When this event occurs, all of the following observer methods will be "
@@ -563,44 +366,12 @@
 "Cuando un evento ocurre, todos los siguientes métodos de observador serán "
 "notificados:"
 
-#. Tag: programlisting
-#: events.xml:239
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
-"document) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
-"document) { ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:241
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
-"{ ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:242
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }}}]]>"
-msgstr ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }}}]]>"
-
 #. Tag: title
-#: events.xml:247
 #, no-c-format
 msgid "Transactional observers"
 msgstr "Observadores transaccionales"
 
 #. Tag: para
-#: events.xml:249
 #, no-c-format
 msgid ""
 "Transactional observers receive their event notifications during the before "
@@ -616,31 +387,18 @@
 "contexto de aplicación, pero sólo cuando las transacciones que actualizan el "
 "árbol de <literal>Categoría</literal> tengan éxito:"
 
-#. Tag: programlisting
-#: events.xml:256
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public void refreshCategoryTree(@Observes(during = AFTER_SUCCESS) "
-"CategoryUpdateEvent event) { ... }]]>"
-msgstr ""
-"<![CDATA[public void refreshCategoryTree(@AfterTransactionSuccess @Observes "
-"CategoryUpdateEvent event) { ... }]]>"
-
 #. Tag: para
-#: events.xml:258
 #, fuzzy, no-c-format
 msgid "There are five kinds of transactional observers:"
 msgstr "Hay tres clases de observadores transaccionales:"
 
 #. Tag: para
-#: events.xml:262
 #, no-c-format
 msgid ""
 "<literal>IN_PROGESS</literal> observers are called immediately (default)"
 msgstr ""
 
 #. Tag: para
-#: events.xml:265
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_SUCCESS</literal> observers are called during the after "
@@ -652,7 +410,6 @@
 "finaliza exitosamente."
 
 #. Tag: para
-#: events.xml:271
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_FAILURE</literal> observers are called during the after "
@@ -664,7 +421,6 @@
 "no se finaliza con éxito."
 
 #. Tag: para
-#: events.xml:277
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_COMPLETION</literal> observers are called during the after "
@@ -674,7 +430,6 @@
 "tras la fase de finalización de la transacción."
 
 #. Tag: para
-#: events.xml:283
 #, fuzzy, no-c-format
 msgid ""
 "<literal>BEFORE_COMPLETION</literal> observers are called during the before "
@@ -684,7 +439,6 @@
 "llamados durante la fase anterior de finalización de la transacción"
 
 #. Tag: para
-#: events.xml:290
 #, fuzzy, no-c-format
 msgid ""
 "Transactional observers are very important in a stateful object model "
@@ -695,7 +449,6 @@
 "una transacción atómica."
 
 #. Tag: para
-#: events.xml:295
 #, no-c-format
 msgid ""
 "Imagine that we have cached a JPA query result set in the application scope:"
@@ -703,50 +456,7 @@
 "Imagine que hemos almacenado en caché una serie de resultados de petición "
 "JPA en el ámbito de la aplicación:"
 
-#. Tag: programlisting
-#: events.xml:297
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   List<Product> products;\n"
-"\n"
-"   @Produces @Catalog \n"
-"   List<Product> getCatalog() {\n"
-"      if (products==null) {\n"
-"         products = em.createQuery(\"select p from Product p where p.deleted "
-"= false\")\n"
-"            .getResultList();\n"
-"      }\n"
-"      return products;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    List<Product> products;\n"
-"\n"
-"    @Produces @Catalog \n"
-"    List<Product> getCatalog() {\n"
-"        if (products==null) {\n"
-"            products = em.createQuery(\"select p from Product p where p."
-"deleted = false\")\n"
-"                .getResultList();\n"
-"        }\n"
-"        return products;\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:299
 #, no-c-format
 msgid ""
 "From time to time, a <literal>Product</literal> is created or deleted. When "
@@ -760,7 +470,6 @@
 "de que la transacción finalice exitosamente antes de ¡actualizar!"
 
 #. Tag: para
-#: events.xml:305
 #, fuzzy, no-c-format
 msgid ""
 "The bean that creates and deletes <literal>Product</literal>s could raise "
@@ -769,51 +478,7 @@
 "El Web Bean que crea y borra <literal>Productos</literal> podría crear "
 "eventos, por ejemplo:"
 
-#. Tag: programlisting
-#: events.xml:309
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"   @PersistenceContext EntityManager em;\n"
-"   @Inject @Any Event<Product> productEvent;\n"
-"\n"
-"   public void delete(Product product) {\n"
-"      em.delete(product);\n"
-"      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
-"(product);\n"
-"   }\n"
-"    \n"
-"   public void persist(Product product) {\n"
-"      em.persist(product);\n"
-"      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
-"(product);\n"
-"   }\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"\n"
-"    @PersistenceContext EntityManager em;\n"
-"    @Observable Event<Product> productEvent;\n"
-"\n"
-"    public void delete(Product product) {\n"
-"        em.delete(product);\n"
-"        productEvent.fire(product, new AnnotationLiteral<Deleted>(){});\n"
-"    }\n"
-"    \n"
-"    public void persist(Product product) {\n"
-"        em.persist(product);\n"
-"        productEvent.fire(product, new AnnotationLiteral<Created>(){});\n"
-"    }\n"
-"    \n"
-"    ...\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:311
 #, no-c-format
 msgid ""
 "And now <literal>Catalog</literal> can observe the events after successful "
@@ -822,42 +487,270 @@
 "Ahora el <literal>Catálogo</literal> puede observar los eventos después de "
 "finalizar la transacción exitosamente:"
 
-#. Tag: programlisting
-#: events.xml:315
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"   ...\n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
-"product) {\n"
-"      products.add(product);\n"
-"   }\n"
-"    \n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
-"product) {\n"
-"      products.remove(product);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"    ...\n"
-"    \n"
-"    void addProduct(@AfterTransactionSuccess @Observes @Created Product "
-"product) {\n"
-"        products.add(product);\n"
-"    }\n"
-"    \n"
-"    void addProduct(@AfterTransactionSuccess @Observes @Deleted Product "
-"product) {\n"
-"        products.remove(product);\n"
-"    }\n"
-"    \n"
-"}]]>"
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({FIELD, PARAMETER})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated { ... }]]>"
 
 #~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
+#~ msgstr "<![CDATA[@Observable Event<Document> documentEvent]]>"
+
+#~ msgid "<![CDATA[documentEvent.fire(document);]]>"
+#~ msgstr "<![CDATA[documentEvent.fire(document);]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Updated Event<Document> documentUpdatedEvent]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
+#~ "(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.fire( document, new AnnotationLiteral<Updated>()"
+#~ "{} );]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = "
+#~ "IF_EXISTS) @Updated Document d) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "   RoleType value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "    RoleType value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Role(ADMIN) Event<LoggedIn> LoggedInEvent;}}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "   extends AnnotationLiteral<Role> \n"
+#~ "   implements Role {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "    extends AnnotationLiteral<Role> \n"
+#~ "    implements Role {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new RoleBinding() {\n"
+#~ "   public void value() { return user.getRole(); }\n"
+#~ "}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.fire( document, new RoleBinding() { public void "
+#~ "value() { return user.getRole(); } } );]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>()"
+#~ "{}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.fire(document, new "
+#~ "AnnotationLiteral<Updated>(){});]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public void refreshCategoryTree(@Observes(during = "
+#~ "AFTER_SUCCESS) CategoryUpdateEvent event) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void refreshCategoryTree(@AfterTransactionSuccess "
+#~ "@Observes CategoryUpdateEvent event) { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   List<Product> products;\n"
+#~ "\n"
+#~ "   @Produces @Catalog \n"
+#~ "   List<Product> getCatalog() {\n"
+#~ "      if (products==null) {\n"
+#~ "         products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "            .getResultList();\n"
+#~ "      }\n"
+#~ "      return products;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    List<Product> products;\n"
+#~ "\n"
+#~ "    @Produces @Catalog \n"
+#~ "    List<Product> getCatalog() {\n"
+#~ "        if (products==null) {\n"
+#~ "            products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "                .getResultList();\n"
+#~ "        }\n"
+#~ "        return products;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "   @Inject @Any Event<Product> productEvent;\n"
+#~ "\n"
+#~ "   public void delete(Product product) {\n"
+#~ "      em.delete(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void persist(Product product) {\n"
+#~ "      em.persist(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    @Observable Event<Product> productEvent;\n"
+#~ "\n"
+#~ "    public void delete(Product product) {\n"
+#~ "        em.delete(product);\n"
+#~ "        productEvent.fire(product, new AnnotationLiteral<Deleted>(){});\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void persist(Product product) {\n"
+#~ "        em.persist(product);\n"
+#~ "        productEvent.fire(product, new AnnotationLiteral<Created>(){});\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    ...\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "   ...\n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
+#~ "product) {\n"
+#~ "      products.add(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
+#~ "product) {\n"
+#~ "      products.remove(product);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "    ...\n"
+#~ "    \n"
+#~ "    void addProduct(@AfterTransactionSuccess @Observes @Created Product "
+#~ "product) {\n"
+#~ "        products.add(product);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    void addProduct(@AfterTransactionSuccess @Observes @Deleted Product "
+#~ "product) {\n"
+#~ "        products.remove(product);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "The Web Beans event notification facility allows Web Beans to interact in "
 #~ "a totally decoupled manner. Event <emphasis>producers</emphasis> raise "
 #~ "events that are then delivered to event <emphasis>observers</emphasis> by "

Modified: doc/trunk/reference/es-ES/example.po
===================================================================
--- doc/trunk/reference/es-ES/example.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/example.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: example\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-20 10:54+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: example.xml:4
 #, no-c-format
 msgid "JSF web application example"
 msgstr "ejemplo de aplicación de red JSF"
 
 #. Tag: para
-#: example.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "Let's illustrate these ideas with a full example. We're going to implement "
@@ -37,114 +35,19 @@
 "un Web Bean para mantener el nombre de usuario y contraseña escritos durante "
 "el inicio de sesión:"
 
-#. Tag: programlisting
-#: example.xml:12
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    @NotNull @Length(min=3, max=25)\n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    @NotNull @Length(min=6, max=20)\n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"        \n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:14
 #, fuzzy, no-c-format
 msgid "This bean is bound to the login prompt in the following JSF form:"
 msgstr ""
 "Este Web Bean está vinculado al intérprete de comandos de inicio de sesión "
 "en el siguiente formulario JSF:"
 
-#. Tag: programlisting
-#: example.xml:16
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<h:form>\n"
-"   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"      <f:validateBean>\n"
-"         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"         <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"         <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"      </f:validateBean>\n"
-"   </h:panelGrid>\n"
-"   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-msgstr ""
-"<![CDATA[<h:form>\n"
-"    <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"        <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"        <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"        <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"        <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"    </h:panelGrid>\n"
-"    <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"    <h:commandButton value=\"Logout\" acion=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-
 #. Tag: para
-#: example.xml:18
 #, no-c-format
 msgid "Users are represented by a JPA entity:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:22
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Entity\n"
-"public class User {\n"
-"   private @NotNull @Length(min=3, max=25) @Id String username;\n"
-"   private @NotNull @Length(min=6, max=20) String password;\n"
-"   \n"
-"   public String getUsername() { return username; }\n"
-"   public void setUsername(String username) { this.username = username; }\n"
-"   public String setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"        \n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:24
 #, no-c-format
 msgid ""
 "(Note that we're also going to need a <literal>persistence.xml</literal> "
@@ -153,7 +56,6 @@
 msgstr ""
 
 #. Tag: para
-#: example.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "The actual work is done by a session-scoped bean that maintains information "
@@ -164,141 +66,21 @@
 "información acerca del usuario actualmente conectado y expone la entidad del "
 "<literal>Usuario</literal> a otras Web Beans:"
 
-#. Tag: programlisting
-#: example.xml:34
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login implements Serializable {\n"
-"\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject @UserDatabase EntityManager userDatabase;\n"
-"\n"
-"   private User user;\n"
-"    \n"
-"   public void login() {\n"
-"      List<User> results = userDatabase.createQuery(\n"
-"         \"select u from User u where u.username = :username and u.password "
-"= :password\")\n"
-"         .setParameter(\"username\", credentials.getUsername())\n"
-"         .setParameter(\"password\", credentials.getPassword())\n"
-"         .getResultList();\n"
-"        \n"
-"      if (!results.isEmpty()) {\n"
-"         user = results.get(0);\n"
-"      }\n"
-"      else {\n"
-"         // perhaps add code here to report a failed login\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void logout() {\n"
-"      user = null;\n"
-"   }\n"
-"    \n"
-"   public boolean isLoggedIn() {\n"
-"      return user != null;\n"
-"   }\n"
-"    \n"
-"   @Produces @LoggedIn User getCurrentUser() {\n"
-"      return user;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @PersistenceContext EntityManager userDatabase;\n"
-"\n"
-"    private User user;\n"
-"    \n"
-"    public void login() {\n"
-"            \n"
-"        List<User> results = userDatabase.createQuery(\n"
-"           \"select u from User u where u.username=:username and u.password=:"
-"password\")\n"
-"           .setParameter(\"username\", credentials.getUsername())\n"
-"           .setParameter(\"password\", credentials.getPassword())\n"
-"           .getResultList();\n"
-"        \n"
-"        if ( !results.isEmpty() ) {\n"
-"           user = results.get(0);\n"
-"        }\n"
-"        \n"
-"    }\n"
-"    \n"
-"    public void logout() {\n"
-"        user = null;\n"
-"    }\n"
-"    \n"
-"    public boolean isLoggedIn() {\n"
-"       return user!=null;\n"
-"    }\n"
-"    \n"
-"    @Produces @LoggedIn User getCurrentUser() {\n"
-"        return user;\n"
-"    }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:36
 #, no-c-format
 msgid ""
 "<literal>@LoggedIn</literal> and <literal>@UserDatabase</literal> are custom "
 "qualifier annotations:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:38
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"public @interface LoggedIn {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD})\n"
-"@BindingType\n"
-"public @interface LoggedIn {}]]>"
-
-#. Tag: programlisting
-#: example.xml:40
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, PARAMETER, FIELD})\n"
-"public @interface UserDatabase {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD})\n"
-"@BindingType\n"
-"public @interface LoggedIn {}]]>"
-
 #. Tag: para
-#: example.xml:42
 #, no-c-format
 msgid ""
 "We need an adaptor bean to expose our typesafe <literal>EntityManager</"
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:46
-#, no-c-format
-msgid ""
-"<![CDATA[class UserDatabaseProducer {\n"
-"   @Produces @UserDatabase @PersistenceContext \n"
-"   static EntityManager userDatabase;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "Now <literal>DocumentEditor</literal>, or any other bean, can easily inject "
@@ -306,51 +88,12 @@
 msgstr ""
 "Ahora, cualquier otro Web Bean puede fácilmente inyectar al usuario actual:"
 
-#. Tag: programlisting
-#: example.xml:50
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DocumentEditor {\n"
-"   @Inject Document document;\n"
-"   @Inject @LoggedIn User currentUser;\n"
-"   @Inject @DocumentDatabase EntityManager docDatabase;\n"
-"    \n"
-"   public void save() {\n"
-"      document.setCreatedBy(currentUser);\n"
-"      docDatabase.persist(document);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class DocumentEditor {\n"
-"\n"
-"    @Current Document document;\n"
-"    @LoggedIn User currentUser;\n"
-"    @PersistenceContext EntityManager docDatabase;\n"
-"    \n"
-"    public void save() {\n"
-"        document.setCreatedBy(currentUser);\n"
-"        docDatabase.persist(document);\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:52
 #, no-c-format
 msgid "Or we can reference the current user in a JSF view:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:54
-#, no-c-format
-msgid ""
-"<![CDATA[<h:panelGroup rendered=\"#{login.loggedIn}\">\n"
-"   signed in as #{currentUser.username}\n"
-"</h:panelGroup>]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:56
 #, fuzzy, no-c-format
 msgid ""
 "Hopefully, this example gave you a taste of the CDI programming model. In "
@@ -360,6 +103,229 @@
 "Bean. En el próximo capítulo, estudiaremos más a fondo la inyección de "
 "dependencia de Web Beans."
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=3, max=25)\n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=6, max=20)\n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "        \n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<h:form>\n"
+#~ "   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "      <f:validateBean>\n"
+#~ "         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"username\" value=\"#{credentials.username}\"/"
+#~ ">\n"
+#~ "         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"password\" value=\"#{credentials.password}\"/"
+#~ ">\n"
+#~ "      </f:validateBean>\n"
+#~ "   </h:panelGrid>\n"
+#~ "   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#"
+#~ "{!login.loggedIn}\"/>\n"
+#~ "   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</h:form>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<h:form>\n"
+#~ "    <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "        <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "        <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
+#~ "        <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "        <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
+#~ "    </h:panelGrid>\n"
+#~ "    <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered="
+#~ "\"#{!login.loggedIn}\"/>\n"
+#~ "    <h:commandButton value=\"Logout\" acion=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</h:form>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Entity\n"
+#~ "public class User {\n"
+#~ "   private @NotNull @Length(min=3, max=25) @Id String username;\n"
+#~ "   private @NotNull @Length(min=6, max=20) String password;\n"
+#~ "   \n"
+#~ "   public String getUsername() { return username; }\n"
+#~ "   public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "   public String setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "        \n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login implements Serializable {\n"
+#~ "\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject @UserDatabase EntityManager userDatabase;\n"
+#~ "\n"
+#~ "   private User user;\n"
+#~ "    \n"
+#~ "   public void login() {\n"
+#~ "      List<User> results = userDatabase.createQuery(\n"
+#~ "         \"select u from User u where u.username = :username and u."
+#~ "password = :password\")\n"
+#~ "         .setParameter(\"username\", credentials.getUsername())\n"
+#~ "         .setParameter(\"password\", credentials.getPassword())\n"
+#~ "         .getResultList();\n"
+#~ "        \n"
+#~ "      if (!results.isEmpty()) {\n"
+#~ "         user = results.get(0);\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         // perhaps add code here to report a failed login\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void logout() {\n"
+#~ "      user = null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public boolean isLoggedIn() {\n"
+#~ "      return user != null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "      return user;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @PersistenceContext EntityManager userDatabase;\n"
+#~ "\n"
+#~ "    private User user;\n"
+#~ "    \n"
+#~ "    public void login() {\n"
+#~ "            \n"
+#~ "        List<User> results = userDatabase.createQuery(\n"
+#~ "           \"select u from User u where u.username=:username and u."
+#~ "password=:password\")\n"
+#~ "           .setParameter(\"username\", credentials.getUsername())\n"
+#~ "           .setParameter(\"password\", credentials.getPassword())\n"
+#~ "           .getResultList();\n"
+#~ "        \n"
+#~ "        if ( !results.isEmpty() ) {\n"
+#~ "           user = results.get(0);\n"
+#~ "        }\n"
+#~ "        \n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void logout() {\n"
+#~ "        user = null;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public boolean isLoggedIn() {\n"
+#~ "       return user!=null;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "        return user;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface LoggedIn {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD})\n"
+#~ "@BindingType\n"
+#~ "public @interface LoggedIn {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface UserDatabase {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD})\n"
+#~ "@BindingType\n"
+#~ "public @interface LoggedIn {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "   @Inject Document document;\n"
+#~ "   @Inject @LoggedIn User currentUser;\n"
+#~ "   @Inject @DocumentDatabase EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "   public void save() {\n"
+#~ "      document.setCreatedBy(currentUser);\n"
+#~ "      docDatabase.persist(document);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "\n"
+#~ "    @Current Document document;\n"
+#~ "    @LoggedIn User currentUser;\n"
+#~ "    @PersistenceContext EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "    public void save() {\n"
+#~ "        document.setCreatedBy(currentUser);\n"
+#~ "        docDatabase.persist(document);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
 #~ msgid "Of course, <literal>@LoggedIn</literal> is a binding annotation:"
 #~ msgstr ""
 #~ "Obviamente, <literal>@LoggedIn</literal> es una anotación de enlace:"

Modified: doc/trunk/reference/es-ES/extend.po
===================================================================
--- doc/trunk/reference/es-ES/extend.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/extend.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: extend\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-19 14:15+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: extend.xml:5
 #, no-c-format
 msgid "Portable extensions"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "CDI is intended to be a foundation for frameworks, extensions and "
@@ -38,13 +36,11 @@
 "diseñadores de Web Beans:"
 
 #. Tag: para
-#: extend.xml:15
 #, no-c-format
 msgid "integration with Business Process Management engines,"
 msgstr "integración con motores de Gestión de Proceso de Negocios,"
 
 #. Tag: para
-#: extend.xml:18
 #, no-c-format
 msgid ""
 "integration with third-party frameworks such as Spring, Seam, GWT or Wicket, "
@@ -54,31 +50,26 @@
 "Wicket, y"
 
 #. Tag: para
-#: extend.xml:23
 #, fuzzy, no-c-format
 msgid "new technology based upon the CDI programming model."
 msgstr "nueva tecnología basada en el modelo de programación de Web Beans."
 
 #. Tag: para
-#: extend.xml:27
 #, no-c-format
 msgid "More formally, according to the spec:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:32
 #, no-c-format
 msgid "A portable extension may integrate with the container by:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:35
 #, no-c-format
 msgid "Providing its own beans, interceptors and decorators to the container"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:40
 #, no-c-format
 msgid ""
 "Injecting dependencies into its own objects using the dependency injection "
@@ -86,13 +77,11 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:45
 #, no-c-format
 msgid "Providing a context implementation for a custom scope"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:50
 #, no-c-format
 msgid ""
 "Augmenting or overriding the annotation-based metadata with metadata from "
@@ -100,13 +89,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:58
 #, fuzzy, no-c-format
 msgid "Creating an <literal>Extension</literal>"
 msgstr "La clase <literal>Bean</literal>"
 
 #. Tag: para
-#: extend.xml:60
 #, no-c-format
 msgid ""
 "The first step in creating a portable extension is to write a class that "
@@ -115,14 +102,7 @@
 "service provider architecture."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:66
-#, no-c-format
-msgid "class MyExtension implements Extension { ... }"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:68
 #, no-c-format
 msgid ""
 "Next, we need to register our extension as a service provider by creating a "
@@ -130,14 +110,7 @@
 "literal>, which contains the name of our extension class:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:74
-#, no-c-format
-msgid "org.mydomain.extension.MyExtension"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:76
 #, no-c-format
 msgid ""
 "An extension is not a bean, exactly, since it is instantiated by the "
@@ -146,18 +119,7 @@
 "process is complete."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:82
-#, no-c-format
-msgid ""
-"@Inject \n"
-"MyBean(MyExtension myExtension) {\n"
-"   myExtension.doSomething();\n"
-"}"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:84
 #, no-c-format
 msgid ""
 "And, like beans, extensions can have observer methods. Usually, the observer "
@@ -165,33 +127,28 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:92
 #, no-c-format
 msgid "Container lifecycle events"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:94
 #, no-c-format
 msgid ""
 "During the initialization process, the container fires a series of events, "
 "including:"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:101
-#, no-c-format
-msgid "BeforeBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>BeforeBeanDiscovery</literal>"
+msgstr "El objeto <literal>Manager</literal>"
 
-#. Tag: literal
-#: extend.xml:106
-#, no-c-format
-msgid "ProcessAnnotatedType"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>ProcessAnnotatedType</literal>"
+msgstr "El objeto <literal>Manager</literal>"
 
 #. Tag: para
-#: extend.xml:110
 #, no-c-format
 msgid ""
 "<literal>ProcessInjectionTarget</literal> and <literal>ProcessProducer</"
@@ -199,54 +156,27 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:115
 #, no-c-format
 msgid ""
 "<literal>ProcessBean</literal> and <literal>ProcessObserverMethod</literal>"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:121
-#, no-c-format
-msgid "AfterBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>AfterBeanDiscovery</literal>"
+msgstr "El objeto <literal>Manager</literal>"
 
-#. Tag: literal
-#: extend.xml:126
+#. Tag: para
 #, no-c-format
-msgid "AfterDeploymentValidation"
+msgid "<literal>AfterDeploymentValidation</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:131
 #, no-c-format
 msgid "Extensions may observe these events:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:135
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"   \n"
-"   void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bbd) {\n"
-"      Logger.global.debug(\"beginning the scanning process\");\n"
-"   }\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      Logger.global.debug(\"scanning type: \" + pat.getAnnotatedType()."
-"getJavaClass().getName());\n"
-"   } \n"
-"\n"
-"   void afterBeanDiscovery(@Observes AfterBeanDiscovery abd) {\n"
-"      Logger.global.debug(\"finished the scanning process\");\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:137
 #, no-c-format
 msgid ""
 "In fact, the extension can do a lot more than just observe. The extension is "
@@ -254,45 +184,19 @@
 "example:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:142
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      //tell the container to ignore the type if it is annotated @Ignore\n"
-"      if ( pat.getAnnotatedType().isAnnotionPresent(Ignore.class) ) pat.veto"
-"();   \n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:144
 #, fuzzy, no-c-format
 msgid "The observer method may inject a <literal>BeanManager</literal>"
 msgstr ""
 "El centro nervioso para extender Web Beans es el objeto <literal>Manager</"
 "literal>. "
 
-#. Tag: programlisting
-#: extend.xml:148
-#, no-c-format
-msgid ""
-"<![CDATA[<T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> "
-"pat, BeanManager beanManager) { ... }]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:153
 #, fuzzy, no-c-format
 msgid "The <literal>BeanManager</literal> object"
 msgstr "El objeto <literal>Manager</literal>"
 
 #. Tag: para
-#: extend.xml:155
 #, fuzzy, no-c-format
 msgid ""
 "The nerve center for extending CDI is the <literal>BeanManager</literal> "
@@ -303,54 +207,7 @@
 "Beans, interceptores, decoradores, observadores y contextos en forma "
 "programada."
 
-#. Tag: programlisting
-#: extend.xml:161
-#, no-c-format
-msgid ""
-"<![CDATA[public interface BeanManager {\n"
-"   public Object getReference(Bean<?> bean, Type beanType, "
-"CreationalContext<?> ctx);\n"
-"   public Object getInjectableReference(InjectionPoint ij, "
-"CreationalContext<?> ctx);\n"
-"   public <T> CreationalContext<T> createCreationalContext(Contextual<T> "
-"contextual);\n"
-"   public Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers);\n"
-"   public Set<Bean<?>> getBeans(String name);\n"
-"   public Bean<?> getPassivationCapableBean(String id);\n"
-"   public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);\n"
-"   public void validate(InjectionPoint injectionPoint);\n"
-"   public void fireEvent(Object event, Annotation... qualifiers);\n"
-"   public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, "
-"Annotation... qualifiers);\n"
-"   public List<Decorator<?>> resolveDecorators(Set<Type> types, "
-"Annotation... qualifiers);\n"
-"   public List<Interceptor<?>> resolveInterceptors(InterceptionType type, "
-"Annotation... interceptorBindings);\n"
-"   public boolean isScope(Class<? extends Annotation> annotationType);\n"
-"   public boolean isNormalScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isPassivatingScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isQualifier(Class<? extends Annotation> annotationType);\n"
-"   public boolean isInterceptorBinding(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isStereotype(Class<? extends Annotation> annotationType);\n"
-"   public Set<Annotation> getInterceptorBindingDefinition(Class<? extends "
-"Annotation> bindingType);\n"
-"   public Set<Annotation> getStereotypeDefinition(Class<? extends "
-"Annotation> stereotype);\n"
-"   public Context getContext(Class<? extends Annotation> scopeType);\n"
-"   public ELResolver getELResolver();\n"
-"   public ExpressionFactory wrapExpressionFactory(ExpressionFactory "
-"expressionFactory);\n"
-"   public <T> AnnotatedType<T> createAnnotatedType(Class<T> type);\n"
-"   public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> "
-"type);\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:163
 #, fuzzy, no-c-format
 msgid ""
 "Any bean or other Java EE component which supports injection can obtain an "
@@ -358,14 +215,7 @@
 msgstr ""
 "Podemos obtener una instancia de <literal>Manager</literal> vía inyección:"
 
-#. Tag: programlisting
-#: extend.xml:166
-#, fuzzy, no-c-format
-msgid "@Inject BeanManager beanManager;"
-msgstr "@Current Manager manager"
-
 #. Tag: para
-#: extend.xml:168
 #, no-c-format
 msgid ""
 "Java EE components may obtain an instance of <literal>BeanManager</literal> "
@@ -375,7 +225,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:174
 #, fuzzy, no-c-format
 msgid ""
 "Let's study some of the interfaces exposed by the <literal>BeanManager</"
@@ -385,13 +234,11 @@
 "literal>. "
 
 #. Tag: title
-#: extend.xml:179
 #, fuzzy, no-c-format
 msgid "The <literal>InjectionTarget</literal> interface"
 msgstr "La interfaz <literal>Contexto</literal>"
 
 #. Tag: para
-#: extend.xml:181
 #, no-c-format
 msgid ""
 "The first thing that a framework developer is going to look for in the "
@@ -401,7 +248,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:188
 #, no-c-format
 msgid ""
 "We recommend that frameworks let CDI take over the job of actually "
@@ -412,50 +258,12 @@
 "field injection will be supported."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:196
-#, no-c-format
-msgid ""
-"<![CDATA[//get the BeanManager from JNDI\n"
-"BeanManager beanManager = (BeanManager) new InitialContext().lookup(\"java:"
-"comp/BeanManager\");\n"
-"\n"
-"//CDI uses an AnnotatedType object to read the annotations of a class\n"
-"AnnotatedType<SomeFrameworkComponent> type = beanManager.createAnnotatedType"
-"(SomeFrameworkComponent.class);\n"
-"\n"
-"//The extension uses an InjectionTarget to delegate instantiation, "
-"dependency injection \n"
-"//and lifecycle callbacks to the CDI container\n"
-"InjectionTarget<SomeFrameworkComponent> it = beanManager."
-"createInjectionTarget(type);\n"
-"\n"
-"//each instance needs its own CDI CreationalContext\n"
-"CreationalContext ctx = beanManager.createCreationalContext(null);\n"
-"\n"
-"//instantiate the framework component and inject its dependencies\n"
-"SomeFrameworkComponent instance = it.produce(ctx);  //call the constructor\n"
-"it.inject(instance, ctx);  //call initializer methods and perform field "
-"injection\n"
-"it.postConstruct(instance);  //call the @PostConstruct method\n"
-"\n"
-"...\n"
-"\n"
-"//destroy the framework component instance and clean up dependent objects\n"
-"it.preDestroy(instance);  //call the @PreDestroy method\n"
-"it.dispose(instance);  //it is now safe to discard the instance\n"
-"ctx.release();  //clean up dependent objects\n"
-"]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:201
 #, fuzzy, no-c-format
 msgid "The <literal>Bean</literal> interface"
 msgstr "La interfaz <literal>Contexto</literal>"
 
 #. Tag: para
-#: extend.xml:203
 #, fuzzy, no-c-format
 msgid ""
 "Instances of the interface <literal>Bean</literal> represent beans. There is "
@@ -469,46 +277,18 @@
 "<literal>Manager</literal> para cada Web Bean en la aplicación."
 
 #. Tag: para
-#: extend.xml:210
 #, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface exposes all the interesting things we "
-"dicussed in <xref linkend=\"bean-anatomy\"/>."
+"dicussed in <xref linkend=\"bean-anatomy\" />."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:215
-#, no-c-format
-msgid ""
-"<![CDATA[public interface Bean<T> extends Contextual<T> {\n"
-"   public Set<Type> getTypes();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public String getName();\n"
-"   public Set<Class<? extends Annotation>> getStereotypes();\n"
-"   public Class<?> getBeanClass();\n"
-"   public boolean isAlternative();\n"
-"   public boolean isNullable();\n"
-"   public Set<InjectionPoint> getInjectionPoints();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:217
 #, no-c-format
 msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:221
-#, no-c-format
-msgid ""
-"<![CDATA[Set<Bean<?>> allBeans = beanManager.getBeans(Obect.class, new "
-"AnnotationLiteral<Any>() {});]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:223
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface makes it possible for a portable "
@@ -526,13 +306,11 @@
 "se inyecta en Web Beans."
 
 #. Tag: title
-#: extend.xml:233
 #, fuzzy, no-c-format
 msgid "Registering a <literal>Bean</literal>"
 msgstr "La clase <literal>Bean</literal>"
 
 #. Tag: para
-#: extend.xml:235
 #, no-c-format
 msgid ""
 "The most common kind of CDI portable extension registers a bean (or beans) "
@@ -540,7 +318,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:239
 #, no-c-format
 msgid ""
 "In this example, we make a framework class, <literal>SecurityManager</"
@@ -550,101 +327,7 @@
 "<literal>SecurityManager</literal> instance."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[public class SecurityManagerExtension implements Extension {\n"
-"    \n"
-"    void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager "
-"bm) {\n"
-"            \n"
-"        //use this to read annotations of the class\n"
-"        AnnotatedType<SecurityManager> at = bm.createAnnotatedType"
-"(SecurityManager.class); \n"
-"\n"
-"        //use this to instantiate the class and inject dependencies\n"
-"        final InjectionTarget<SecurityManager> it = bm.createInjectionTarget"
-"(at); \n"
-"\n"
-"        abd.addBean( new Bean<SecurityManager>() {\n"
-"\n"
-"            @Override\n"
-"            public Class<?> getBeanClass() {\n"
-"                return SecurityManager.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public String getName() {\n"
-"                return \"securityManager\";\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getQualifiers() {\n"
-"                Set<Annotation> qualifiers = new HashSet<Annotation>();\n"
-"                qualifiers.add( new AnnotationLiteral<Default>() {} );\n"
-"                qualifiers.add( new AnnotationLiteral<Any>() {} );\n"
-"                return qualifiers;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<? extends Annotation> getScope() {\n"
-"                return SessionScoped.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Class<? extends Annotation>> getStereotypes() {\n"
-"                return Collections.emptySet();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypes() {\n"
-"                Set<Type> types = new HashSet<Type>();\n"
-"                types.add(SecurityManager.class);\n"
-"                types.add(Object.class);\n"
-"                return types;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAlternative() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isNullable() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public SecurityManager create(CreationalContext<SecurityManager> "
-"ctx) {\n"
-"                SecurityManager instance = it.produce(ctx);\n"
-"                it.inject(instance, ctx);\n"
-"                it.postConstruct(instance);\n"
-"                return instance;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void destroy(SecurityManager instance, \n"
-"                                CreationalContext<SecurityManager> ctx) {\n"
-"                it.preDestroy(instance);\n"
-"                it.dispose(instance);\n"
-"                ctx.release();\n"
-"            }\n"
-"            \n"
-"        } );\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:248
 #, no-c-format
 msgid ""
 "But a portable extension can also mess with beans that are discovered "
@@ -652,13 +335,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:255
 #, no-c-format
 msgid "Wrapping an <literal>AnnotatedType</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:257
 #, no-c-format
 msgid ""
 "One of the most interesting things that an extension class can do is process "
@@ -667,7 +348,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:262
 #, no-c-format
 msgid ""
 "Let's start with an example of an extension that provides support for the "
@@ -678,101 +358,7 @@
 "<literal>value()</literal> of the <literal>@Named</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:270
-#, no-c-format
-msgid ""
-"<![CDATA[public class QualifiedNameExtension implements Extension {\n"
-"\n"
-"    <X> void processAnnotatedType(@Observes ProcessAnnotatedType<X> pat) {\n"
-"\n"
-"        //wrap this to override the annotations of the class\n"
-"        final AnnotatedType<X> at = pat.getAnnotatedType();\n"
-"        \n"
-"        AnnotatedType<X> wrapped = new AnnotatedType<X>() {\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedConstructor<X>> getConstructors() {\n"
-"                return at.getConstructors();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedField<? super X>> getFields() {\n"
-"                return at.getFields();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<X> getJavaClass() {\n"
-"                return at.getJavaClass();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedMethod<? super X>> getMethods() {\n"
-"                return at.getMethods();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public <T extends Annotation> T getAnnotation(final Class<T> "
-"annType) {\n"
-"                if ( Named.class.equals(annType) ) {\n"
-"                    class NamedLiteral \n"
-"                            extends AnnotationLiteral<Named> \n"
-"                            implements Named {\n"
-"                        @Override\n"
-"                        public String value() {\n"
-"                            Package pkg = at.getClass().getPackage();\n"
-"                            String unqualifiedName = at.getAnnotation(Named."
-"class).value();\n"
-"                            final String qualifiedName;\n"
-"                            if ( pkg.isAnnotationPresent(Named.class) ) {\n"
-"                                qualifiedName = pkg.getAnnotation(Named."
-"class).value() \n"
-"                                      + '.' + unqualifiedName;\n"
-"                            }\n"
-"                            else {\n"
-"                                qualifiedName = unqualifiedName;\n"
-"                            }\n"
-"                            return qualifiedName;\n"
-"                        }\n"
-"                    }\n"
-"                    return (T) new NamedLiteral();\n"
-"                }\n"
-"                else {\n"
-"                    return at.getAnnotation(annType);\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getAnnotations() {\n"
-"                return at.getAnnotations();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Type getBaseType() {\n"
-"                return at.getBaseType();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypeClosure() {\n"
-"                return at.getTypeClosure();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annType) {\n"
-"                return at.isAnnotationPresent(annType);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pat.setAnnotatedType(wrapped);\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:272
 #, no-c-format
 msgid ""
 "Here's a second example, which adds the <literal>@Alternative</literal> "
@@ -780,41 +366,7 @@
 "literal> interface."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:277
-#, no-c-format
-msgid ""
-"<![CDATA[class ServiceAlternativeExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"   \n"
-"      final AnnotatedType<T> type = pat.getAnnotatedType();\n"
-"      \n"
-"      if ( Service.class.isAssignableFrom( type.getJavaClass() ) ) {\n"
-"      \n"
-"         //if the class implements Service, make it an @Alternative\n"
-"         AnnotatedType<T> wrapped = new AnnotatedType<T>() {\n"
-"         \n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annotationType) {\n"
-"               return annotationType.equals(Alternative.class) ? \n"
-"                  true : type.isAnnotationPresent(annotationType);\n"
-"            }\n"
-"            \n"
-"            //remaining methods of AnnotatedType\n"
-"            ...\n"
-"         }\n"
-"         \n"
-"         pat.setAnnotatedType(wrapped);\n"
-"      }\n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:283
 #, no-c-format
 msgid ""
 "The <literal>AnnotatedType</literal> is not the only thing that can be "
@@ -822,13 +374,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:288
 #, no-c-format
 msgid "Wrapping an <literal>InjectionTarget</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:290
 #, no-c-format
 msgid ""
 "The <literal>InjectionTarget</literal> interface exposes operations for "
@@ -840,7 +390,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:297
 #, no-c-format
 msgid ""
 "Here's a CDI portable extension that reads values from properties files and "
@@ -852,16 +401,7 @@
 "<literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:305
-#, no-c-format
-msgid ""
-"firstName=Gavin\n"
-"lastName=King"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:307
 #, no-c-format
 msgid ""
 "The portable extension works by wrapping the containers "
@@ -869,121 +409,7 @@
 "<literal>inject()</literal> method."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:310
-#, no-c-format
-msgid ""
-"<![CDATA[public class ConfigExtension implements Extension {\n"
-"\n"
-"        <X> void processInjectionTarget(@Observes ProcessInjectionTarget<X> "
-"pit) {\n"
-"                \n"
-"                //wrap this to intercept the component lifecycle\n"
-"            final InjectionTarget<X> it = pit.getInjectionTarget();\n"
-"            \n"
-"        final Map<Field, Object> configuredValues = new HashMap<Field, "
-"Object>();\n"
-"        \n"
-"        //use this to read annotations of the class and its members\n"
-"        AnnotatedType<X> at = pit.getAnnotatedType();\n"
-"        \n"
-"        //read the properties file\n"
-"        String propsFileName = at.getClass().getSimpleName() + \".properties"
-"\";\n"
-"        InputStream stream = at.getJavaClass().getResourceAsStream"
-"(propsFileName);\n"
-"        if (stream!=null) {\n"
-"            \n"
-"            try {\n"
-"                Properties props = new Properties();\n"
-"                props.load(stream);\n"
-"                for (Map.Entry<Object, Object> property : props.entrySet()) "
-"{\n"
-"                    String fieldName = property.getKey().toString();\n"
-"                    Object value = property.getValue();\n"
-"                    try {\n"
-"                        Field field = at.getJavaClass().getField"
-"(fieldName);\n"
-"                        field.setAccessible(true);\n"
-"                        if ( field.getType().isAssignableFrom( value.getClass"
-"() ) ) {\n"
-"                            configuredValues.put(field, value);\n"
-"                        }\n"
-"                        else {\n"
-"                            //TODO: do type conversion automatically\n"
-"                            pit.addDefinitionError( new InjectionException(\n"
-"                                   \"field is not of type String: \" + "
-"field ) );\n"
-"                        }\n"
-"                    }\n"
-"                    catch (NoSuchFieldException nsfe) {\n"
-"                        pit.addDefinitionError(nsfe);\n"
-"                    }\n"
-"                    finally {\n"
-"                        stream.close();\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"            catch (IOException ioe) {\n"
-"                pit.addDefinitionError(ioe);\n"
-"            }\n"
-"        }\n"
-"        \n"
-"        InjectionTarget<X> wrapped = new InjectionTarget<X>() {\n"
-"\n"
-"            @Override\n"
-"            public void inject(X instance, CreationalContext<X> ctx) {\n"
-"                it.inject(instance, ctx);\n"
-"                \n"
-"                //set the values onto the new instance of the component\n"
-"                for (Map.Entry<Field, Object> configuredValue: "
-"configuredValues.entrySet()) {\n"
-"                    try {\n"
-"                        configuredValue.getKey().set(instance, "
-"configuredValue.getValue());\n"
-"                    }\n"
-"                    catch (Exception e) {\n"
-"                        throw new InjectionException(e);\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void postConstruct(X instance) {\n"
-"                it.postConstruct(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void preDestroy(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void dispose(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public X produce(CreationalContext<X> ctx) {\n"
-"                return it.produce(ctx);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pit.setInjectionTarget(wrapped);\n"
-"        \n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:312
 #, no-c-format
 msgid ""
 "There's a lot more to the portable extension SPI than what we've discussed "
@@ -992,13 +418,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:320
 #, no-c-format
 msgid "The <literal>Context</literal> interface"
 msgstr "La interfaz <literal>Contexto</literal>"
 
 #. Tag: para
-#: extend.xml:322
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Context</literal> interface supports addition of new scopes to "
@@ -1007,30 +431,7 @@
 "La interfaz <literal>Contexto</literal> soporta la adición de nuevos ámbitos "
 "a Web Beans, o extensión de los ámbitos incorporados a nuevos entornos."
 
-#. Tag: programlisting
-#: extend.xml:327
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface Context {\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
-"creationalContext);\n"
-"   public <T> T get(Contextual<T> contextual);\n"
-"   boolean isActive();\n"
-"}]]>"
-msgstr ""
-"public interface Context {\n"
-"    \n"
-"    public Class&lt;? extends Annotation&gt; getScopeType();\n"
-"    \n"
-"    public &lt;T&gt; T get(Bean&lt;T&gt; bean, boolean create);\n"
-"    \n"
-"    boolean isActive();\n"
-"    \n"
-"}"
-
 #. Tag: para
-#: extend.xml:329
 #, fuzzy, no-c-format
 msgid ""
 "For example, we might implement <literal>Context</literal> to add a business "
@@ -1042,7 +443,31 @@
 "ámbito de conversación a una aplicación que utiliza Wicket."
 
 #, fuzzy
+#~ msgid "@Inject BeanManager beanManager;"
+#~ msgstr "@Current Manager manager"
+
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public interface Context {\n"
+#~ "   public Class<? extends Annotation> getScope();\n"
+#~ "   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
+#~ "creationalContext);\n"
+#~ "   public <T> T get(Contextual<T> contextual);\n"
+#~ "   boolean isActive();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "public interface Context {\n"
+#~ "    \n"
+#~ "    public Class&lt;? extends Annotation&gt; getScopeType();\n"
+#~ "    \n"
+#~ "    public &lt;T&gt; T get(Bean&lt;T&gt; bean, boolean create);\n"
+#~ "    \n"
+#~ "    boolean isActive();\n"
+#~ "    \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
 #~ "There are two subinterfaces of <literal>Bean</literal> defined by the CDI "
 #~ "specification: <literal>Interceptor</literal> and <literal>Decorator</"
 #~ "literal>."

Modified: doc/trunk/reference/es-ES/extensions.po
===================================================================
--- doc/trunk/reference/es-ES/extensions.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/extensions.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,25 +15,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: extensions.xml:8
 #, no-c-format
 msgid "CDI extensions available as part of Weld"
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:11
 #, no-c-format
 msgid "These modules are usable on any JSR-299 implementation, not just Weld!"
 msgstr ""
 
 #. Tag: title
-#: extensions.xml:17
 #, no-c-format
 msgid "Weld Logger"
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:19
 #, no-c-format
 msgid ""
 "Adding logging to your application is now even easier with simple injection "
@@ -42,26 +38,7 @@
 "will be injected into any instance of the bean."
 msgstr ""
 
-#. Tag: programlisting
-#: extensions.xml:25
-#, no-c-format
-msgid ""
-"<![CDATA[import org.slf4j.Logger;\n"
-"import javax.inject.Inject;\n"
-"\n"
-"public class Checkout {\n"
-"   private @Inject Logger log;\n"
-"\n"
-"   public void invoiceItems() {\n"
-"      ShoppingCart cart;\n"
-"      ...\n"
-"      log.debug(\"Items invoiced for {}\", cart);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extensions.xml:27
 #, no-c-format
 msgid ""
 "The example shows how objects can be interpolated into a message. If you use "
@@ -71,7 +48,6 @@
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:34
 #, no-c-format
 msgid ""
 "You can add Weld logging to your project by including weld-logger.jar, sl4j-"
@@ -81,7 +57,6 @@
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:39
 #, no-c-format
 msgid ""
 "If you are using Weld as your JSR-299 implementation, there's no need to "

Modified: doc/trunk/reference/es-ES/gettingstarted.po
===================================================================
--- doc/trunk/reference/es-ES/gettingstarted.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/gettingstarted.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ri\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-20 10:55+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,27 +17,24 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: gettingstarted.xml:5
 #, no-c-format
 msgid "Getting started with Weld"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:7
 #, no-c-format
 msgid ""
 "Weld comes with two starter example applications, in addition to more "
 "specialized examples. The first, <literal>weld-numberguess</literal>, is a "
-"web (WAR) example containing only non-transactional managed beans. This "
+"web (war) example containing only non-transactional managed beans. This "
 "example can be run on a wide range of servers, including JBoss AS, "
 "GlassFish, Apache Tomcat, Jetty, Google App Engine, and any compliant Java "
 "EE 6 container. The second example, <literal>weld-translator</literal>, is "
-"an enterprise (EAR) example that contains session beans. This example must "
-"be run on JBoss AS 5.2, Glassfish 3.0 or any compliant Java EE 6 container."
+"an enterprise (ear) example that contains session beans. This example must "
+"be run on JBoss AS 6.0, Glassfish 3.0 or any compliant Java EE 6 container."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:16
 #, no-c-format
 msgid ""
 "Both examples use JSF 2.0 as the web framework and, as such, can be found in "
@@ -45,13 +42,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:22
 #, no-c-format
 msgid "Prerequisites"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:24
 #, no-c-format
 msgid ""
 "To run the examples with the provided build scripts, you'll need the "
@@ -59,58 +54,47 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:30
 #, fuzzy, no-c-format
 msgid "the latest release of Weld, which contains the examples"
 msgstr "la última versión de la IR de Web Beans,"
 
 #. Tag: para
-#: gettingstarted.xml:33
 #, no-c-format
 msgid "Ant 1.7.0, to build and deploy the examples"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:36
 #, no-c-format
 msgid "a supported runtime environment (minimum versions shown)"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:39
-#, no-c-format
-msgid ""
-"JBoss AS 5.2.0 (currently only nightly builds of JBoss AS 5.2.0.Beta1 are "
-"available),"
-msgstr ""
+#, fuzzy, no-c-format
+msgid "JBoss AS 6.0.0,"
+msgstr "JBoss AS 5.0.0.GA, y"
 
 #. Tag: para
-#: gettingstarted.xml:42
 #, no-c-format
 msgid "GlassFish 3.0,"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:45
 #, no-c-format
-msgid "Apache Tomcat 6.0.x (WAR example only), or"
+msgid "Apache Tomcat 6.0.x (war example only), or"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:48
 #, no-c-format
-msgid "Jetty 6.1.x (WAR example only)"
+msgid "Jetty 6.1.x (war example only)"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:53
 #, no-c-format
 msgid ""
 "(optionally) Maven 2.x, to run the examples in an embedded servlet container"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:58
 #, no-c-format
 msgid ""
 "You'll need a full install of Ant 1.7.0. Some linux distributions only "
@@ -119,27 +103,24 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:64
 #, no-c-format
 msgid ""
 "In the next few sections, you'll be using the Ant command (<literal>ant</"
 "literal>) to invoke the Ant build script in each example to compile, "
-"assemble and deploy the example to JBoss AS and, for the WAR example, Apache "
-"Tomcat. You can also deploy the generated artifact (WAR or EAR) to any other "
+"assemble and deploy the example to JBoss AS and, for the war example, Apache "
+"Tomcat. You can also deploy the generated artifact (war or ear) to any other "
 "container that supports Java EE 6, such as GlassFish 3."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:71
 #, no-c-format
 msgid ""
 "If you have Maven installed, you can use the Maven command (<literal>mvn</"
-"literal>) to compile and assemble the standalone artifact (WAR or EAR) and, "
-"for the WAR example, run it in an embedded container."
+"literal>) to compile and assemble the standalone artifact (war or ear) and, "
+"for the war example, run it in an embedded container."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:76
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
@@ -147,28 +128,25 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:81
 #, no-c-format
 msgid "Deploying to JBoss AS"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:83
 #, no-c-format
 msgid ""
 "To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss."
-"org/jbossas/\">JBoss AS 5.2.0.Beta1</ulink> or above. If a release of the "
-"JBoss AS 5.2 line isn't yet available, you can download a <ulink url="
-"\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-5.x-sun16/"
-"\">nightly snapshot</ulink>. The reason JBoss AS 5.2.0.Beta1 or above is "
-"required is because it's the first release that has both CDI and Bean "
-"Validation support built-in, making it close enough to Java EE 6 to run the "
-"examples. The good news is that there are no additional modifications you "
-"have to make to the server. It's ready to go!"
+"org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS "
+"6.0 line isn't yet available, you can download a <ulink url=\"http://hudson."
+"jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</"
+"ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the "
+"first release that has both CDI and Bean Validation support built-in, making "
+"it close enough to Java EE 6 to run the examples. The good news is that "
+"there are no additional modifications you have to make to the server. It's "
+"ready to go!"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:92
 #, no-c-format
 msgid ""
 "After you have downloaded JBoss AS, extract it. (We recommended renaming the "
@@ -178,16 +156,7 @@
 "installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[$> unzip jboss-5.2.*.zip\n"
-"$> mv jboss-5.2.*/ jboss-as-5.2]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:101
 #, no-c-format
 msgid ""
 "In order for the build scripts to know where to deploy the example, you have "
@@ -198,74 +167,36 @@
 "<literal>jboss.home</literal>, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:108
-#, fuzzy, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
-msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
-
 #. Tag: para
-#: gettingstarted.xml:110
 #, fuzzy, no-c-format
 msgid "You're now ready to deploy your first example!"
 msgstr "Ahora, ¡está listo para desplegar su primer ejemplo!"
 
 #. Tag: para
-#: gettingstarted.xml:114
 #, no-c-format
 msgid ""
 "Switch to the <literal>examples/jsf/numberguess</literal> directory and "
 "execute the Ant <literal>deploy</literal> target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:119
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant deploy]]>"
-msgstr ""
-"$ cd examples/numberguess\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:121
 #, no-c-format
 msgid ""
 "If you haven't already, start JBoss AS. You can either start JBoss AS from a "
 "Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:125
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/jboss-as-5.2\n"
-"$> ./bin/run.sh]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:127 gettingstarted.xml:369
 #, no-c-format
 msgid "a Windows command window:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:131
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\jboss-as-5.2\\bin\n"
-"$> run]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:133 gettingstarted.xml:375
 #, no-c-format
 msgid "or you can start the server using an IDE, like Eclipse."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:138
 #, no-c-format
 msgid ""
 "If you are using Eclipse, you should seriously consider installing the "
@@ -275,7 +206,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:145
 #, fuzzy, no-c-format
 msgid ""
 "Wait a few seconds for the application to deploy (or the application server "
@@ -289,7 +219,6 @@
 "localhost:8080/webbeans-translator</ulink>)."
 
 #. Tag: para
-#: gettingstarted.xml:152
 #, no-c-format
 msgid ""
 "The Ant build script includes additional targets for JBoss AS to deploy and "
@@ -298,7 +227,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:158
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant restart</literal> - deploy the example in exploded format to "
@@ -307,7 +235,6 @@
 "<literal>ant restart</literal> - despliega el ejemplo en formato explotado"
 
 #. Tag: para
-#: gettingstarted.xml:163
 #, no-c-format
 msgid ""
 "<literal>ant explode</literal> - update an exploded example, without "
@@ -317,7 +244,6 @@
 "reiniciar el despliegue"
 
 #. Tag: para
-#: gettingstarted.xml:168
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant deploy</literal> - deploy the example in compressed jar format "
@@ -327,19 +253,16 @@
 "comprimido"
 
 #. Tag: para
-#: gettingstarted.xml:173
 #, fuzzy, no-c-format
 msgid "<literal>ant undeploy</literal> - remove the example from JBoss AS"
 msgstr "<literal>ant undeploy</literal> - quita el ejemplo del servidor"
 
 #. Tag: para
-#: gettingstarted.xml:178
 #, no-c-format
 msgid "<literal>ant clean</literal> - clean the example"
 msgstr "<literal>ant clean</literal> - borra el ejemplo"
 
 #. Tag: para
-#: gettingstarted.xml:185
 #, no-c-format
 msgid ""
 "The second starter example, <literal>weld-translator</literal>, will "
@@ -348,27 +271,15 @@
 "translator example directory and execute the deploy target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/translator\n"
-"$> ant deploy]]>"
-msgstr ""
-"$ cd examples/translator\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:194
 #, no-c-format
 msgid ""
 "The translator uses session beans, which are packaged in an EJB module "
-"within an EAR. Java EE 6 will allow session beans to be deployed in WAR "
+"within an ear. Java EE 6 will allow session beans to be deployed in war "
 "modules, but that's a topic for a later chapter."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:200
 #, fuzzy, no-c-format
 msgid ""
 "Again, wait a few seconds for the application to deploy (if you're really "
@@ -380,55 +291,32 @@
 "(<ulink url=\"http://localhost:8080/webbeans-translator\">http://"
 "localhost:8080/webbeans-translator</ulink>)."
 
-#. Tag: para
-#: gettingstarted.xml:206
-#, no-c-format
-msgid ""
-"TODO Insert note about upgrading the Weld deployer that directs reader to "
-"section on the JBoss AS environment"
-msgstr ""
-
 #. Tag: title
-#: gettingstarted.xml:213
 #, no-c-format
 msgid "Deploying to GlassFish"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:215
 #, no-c-format
 msgid ""
-"Deploying to GlassFish should be easy, right? After all, it's the Java EE 6 "
-"reference implementation. Since it's the Java EE 6 reference implementation, "
-"that means it also bundles the JSR-299 reference implementation, Weld! So "
-"yes, it's very easy."
+"Deploying to GlassFish should be easy and familiar, right? After all, it's "
+"the Java EE 6 reference implementation and Weld is the JSR-299 reference "
+"implementation, meaning Weld gets bundled with GlassFish. So yes, it's all "
+"quite easy and familiar."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:221
 #, no-c-format
 msgid ""
 "To deploy the examples to GlassFish, you'll need the final <ulink url="
-"\"https://glassfish.dev.java.net/\">GlassFish V3</ulink> release (the "
-"preview release won't do). If the final release isn't yet available, you can "
-"download a <ulink url=\"http://download.java.net/glassfish/v3/promoted/"
-"\">promoted build</ulink> in the meantime. Select the b69 preview release or "
-"above that ends in either <literal>-unix.sh</literal> or <literal>-windows."
-"exe</literal> depending on your platform. After the download is complete, "
-"execute the installer. On Linux/Unix, you'll need to first make the script "
-"executable."
+"\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</"
+"ulink> release. Select the release that ends in either <literal>-unix.sh</"
+"literal> or <literal>-windows.exe</literal> depending on your platform. "
+"After the download is complete, execute the installer. On Linux/Unix, you'll "
+"need to first make the script executable."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:231
-#, no-c-format
-msgid ""
-"<![CDATA[$> chmod 755 glassfish-v3-b69-unix.sh\n"
-"$> ./glassfish-v3-b69-unix.sh]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:233
 #, no-c-format
 msgid ""
 "On Windows you can just click on the executable. Follow the instructions in "
@@ -439,7 +327,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:240
 #, no-c-format
 msgid ""
 "If you've deployed either of the starter examples, <literal>weld-"
@@ -448,16 +335,7 @@
 "either of the two directories and build it."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess (or examples/jsf/translator)\n"
-"$> ant package]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:248
 #, no-c-format
 msgid ""
 "The deployable archive for the <literal>weld-numberguess</literal>, named "
@@ -469,24 +347,17 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:255
 #, no-c-format
 msgid ""
-"You deploy applications to GlassFish using the <ulink url=\"http://"
-"localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin Console "
-"running, you need to start a GlassFish domain, in our case <literal>domain1</"
-"literal>. Switch to the <literal>bin</literal> folder in the directory where "
-"you installed GlassFish and execute the following command:"
+"One way to deploy applications to GlassFish is by using the <ulink url="
+"\"http://localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin "
+"Console running, you need to start a GlassFish domain, in our case "
+"<literal>domain1</literal>. Switch to the <literal>bin</literal> folder in "
+"the directory where you installed GlassFish and execute the following "
+"command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:262
-#, no-c-format
-msgid "<![CDATA[$> asadmin start-domain domain1]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:264
 #, no-c-format
 msgid ""
 "After a few seconds you can visit the Admin Console in the browser at the "
@@ -503,22 +374,26 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:276
 #, no-c-format
 msgid ""
+"Alternatively, you can deploy the application to GlassFish using the asadmin "
+"command:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The reason the same artifact can be deployed to both JBoss AS and GlassFish, "
 "without any modifications, is because all of the features being used are "
 "part of the standard platform. And what a capable platform it has become!"
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:285
 #, no-c-format
 msgid "Deploying to Apache Tomcat"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:287
 #, no-c-format
 msgid ""
 "Servlet containers are not required to support Java EE services like CDI. "
@@ -527,7 +402,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:291
 #, no-c-format
 msgid ""
 "Weld comes with a servlet listener which bootstraps the CDI environment, "
@@ -538,7 +412,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:297
 #, fuzzy, no-c-format
 msgid ""
 "Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll "
@@ -548,16 +421,7 @@
 "Luego, descargue la IR de Web Beans desde <ulink url=\"http://seamframework."
 "org/Download\">seamframework.org</ulink>, y descomprímalo. Por ejemplo:"
 
-#. Tag: programlisting
-#: gettingstarted.xml:302
-#, fuzzy, no-c-format
-msgid "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
-msgstr ""
-"<![CDATA[$ cd /Applications\n"
-"$ unzip ~/jboss-5.0.0.GA.zip]]>"
-
 #. Tag: para
-#: gettingstarted.xml:304
 #, no-c-format
 msgid ""
 "You have two choices for how you can deploy the application to Tomcat. You "
@@ -568,13 +432,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:312
 #, no-c-format
 msgid "Deploying with Ant"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:314
 #, no-c-format
 msgid ""
 "In order for Ant to push the artifact to the Tomcat hot deploy directory, it "
@@ -585,38 +447,19 @@
 "property key <literal>tomcat.home</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:321
-#, fuzzy, no-c-format
-msgid "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
-msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
-
 #. Tag: para
-#: gettingstarted.xml:323
 #, fuzzy, no-c-format
 msgid "Now you're ready to deploy the numberguess example to Tomcat!"
 msgstr "Para desplegar el ejemplo numberguess:"
 
 #. Tag: para
-#: gettingstarted.xml:327
 #, no-c-format
 msgid ""
 "Change to the <literal>examples/jsf/numberguess</literal> directory again "
 "and run the Ant <literal>deploy</literal> target for Tomcat:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:332
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant tomcat.deploy]]>"
-msgstr ""
-"$ cd examples/numberguess\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:335
 #, no-c-format
 msgid ""
 "The Ant build script includes additional targets for Tomcat to deploy and "
@@ -625,7 +468,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:341
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.restart</literal> - deploy the example in exploded "
@@ -634,7 +476,6 @@
 "<literal>ant restart</literal> - despliega el ejemplo en formato explotado"
 
 #. Tag: para
-#: gettingstarted.xml:346
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.explode</literal> - update an exploded example, without "
@@ -644,7 +485,6 @@
 "reiniciar el despliegue"
 
 #. Tag: para
-#: gettingstarted.xml:351
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.deploy</literal> - deploy the example in compressed jar "
@@ -654,39 +494,18 @@
 "comprimido"
 
 #. Tag: para
-#: gettingstarted.xml:356
 #, fuzzy, no-c-format
 msgid "<literal>ant tomcat.undeploy</literal> - remove the example from Tomcat"
 msgstr "<literal>ant undeploy</literal> - quita el ejemplo del servidor"
 
 #. Tag: para
-#: gettingstarted.xml:363
 #, no-c-format
 msgid ""
 "If you haven't already, start Tomcat. You can either start Tomcat from a "
 "Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:367
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/apache-tomcat-6\n"
-"$> ./bin/start.sh]]>"
-msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
-
-#. Tag: programlisting
-#: gettingstarted.xml:373
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
-"$> start]]>"
-msgstr ""
-"<![CDATA[$ cd /Applications\n"
-"$ unzip ~/jboss-5.0.0.GA.zip]]>"
-
 #. Tag: para
-#: gettingstarted.xml:379
 #, no-c-format
 msgid ""
 "Wait a few seconds for the application to deploy (or the application server "
@@ -697,13 +516,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:388
 #, no-c-format
 msgid "Deploying with Maven"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:390
 #, no-c-format
 msgid ""
 "You can also deploy the application to Tomcat using Maven. This section is a "
@@ -713,7 +530,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:396
 #, no-c-format
 msgid ""
 "The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
@@ -725,7 +541,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:403
 #, no-c-format
 msgid ""
 "To allow Maven to communicate with Tomcat over HTTP, edit the <literal>conf/"
@@ -733,41 +548,20 @@
 "following line:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:408
-#, no-c-format
-msgid "<![CDATA[<user username=\"admin\" password=\"\" roles=\"manager\"/>]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:410
 #, no-c-format
 msgid ""
 "Restart Tomcat. You can now deploy the application to Tomcat with Maven "
 "using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:414
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:exploded tomcat:exploded -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:416
 #, no-c-format
 msgid ""
 "Once the application is deployed, you can redeploy it using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:420
-#, no-c-format
-msgid "<![CDATA[$> mvn tomcat:redeploy -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:422
 #, no-c-format
 msgid ""
 "The <literal>-Ptomcat</literal> argument activates the <literal>tomcat</"
@@ -776,21 +570,13 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:427
 #, no-c-format
 msgid ""
 "Rather than shipping the container off to a standalone Tomcat installation, "
 "you can also execute the application in an embedded Tomcat 6 container:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:432
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace tomcat:run -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:434
 #, no-c-format
 msgid ""
 "The advantage of using the embedded server is that changes to assets in "
@@ -800,14 +586,7 @@
 "classpath resource, you need to execute a build:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:441
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:443
 #, no-c-format
 msgid ""
 "There are several other Maven goals that you can use if you are hacking on "
@@ -816,13 +595,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:453
 #, no-c-format
 msgid "Deploying to Jetty"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:457
 #, no-c-format
 msgid ""
 "Support for Jetty in the examples is a more recent addition. Since Jetty is "
@@ -833,7 +610,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:464
 #, no-c-format
 msgid ""
 "If you've read through the entire Tomcat section, then you're all ready to "
@@ -843,7 +619,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:470
 #, no-c-format
 msgid ""
 "The Maven POM (<literal>pom.xml</literal>) includes a profile named "
@@ -855,25 +630,15 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:479
 #, no-c-format
 msgid ""
 "To run the <literal>weld-numberguess</literal> example on Jetty, switch to "
 "the example directory and execute the <literal>inplace</literal> goal of the "
-"Maven WAR plugin followed by the <literal>run</literal> goal of the Maven "
+"Maven war plugin followed by the <literal>run</literal> goal of the Maven "
 "Jetty plugin with the <literal>jetty</literal> profile enabled, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:485
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> mvn war:inplace jetty:run -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:487
 #, no-c-format
 msgid ""
 "The log output of Jetty will be shown in the console. Once Jetty reports "
@@ -884,7 +649,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:494
 #, no-c-format
 msgid ""
 "Any changes to assets in <literal>src/main/webapp</literal> take effect "
@@ -892,30 +656,22 @@
 "application may automatically redeploy. The redeploy behavior can be fined-"
 "tuned in the plugin configuration. If you make a change to a classpath "
 "resource, you need to execute a build and the <literal>inplace</literal> "
-"goal of the Maven WAR plugin, again with the <literal>jetty</literal> "
+"goal of the Maven war plugin, again with the <literal>jetty</literal> "
 "profile enabled."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:501
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:503
 #, no-c-format
 msgid ""
-"The <literal>war:inplace</literal> goal copies the compiled classes and JARs "
+"The <literal>war:inplace</literal> goal copies the compiled classes and jars "
 "inside <literal>src/main/webapp</literal>, under <literal>WEB-INF/classes</"
 "literal> and <literal>WEB-INF/lib</literal>, respectively, mixing source and "
 "compiled files. However, the build does work around these temporary files by "
-"excluding them from the packaged WAR and cleaning them during the Maven "
+"excluding them from the packaged war and cleaning them during the Maven "
 "clean phase."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:510
 #, no-c-format
 msgid ""
 "You have two options if you want to run the example on Jetty from the IDE. "
@@ -925,33 +681,18 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:516
 #, no-c-format
 msgid "First, initialize the Eclipse project:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:520
-#, no-c-format
-msgid "<![CDATA[$> mvn clean eclipse:clean eclipse:eclipse -Pjetty-ide]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:522
 #, no-c-format
 msgid ""
 "Next, assemble all the necessary resources under <literal>src/main/webapp</"
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:526
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace -Pjetty-ide]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:528
 #, no-c-format
 msgid ""
 "Now, you are ready to run the server in Eclipse. Import the project into "
@@ -964,7 +705,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:536
 #, no-c-format
 msgid ""
 "Now that you have gotten the starter applications deployed on the server of "
@@ -973,7 +713,59 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
+
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> ant deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/numberguess\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/translator\n"
+#~ "$> ant deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/translator\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
+#~ msgstr ""
+#~ "<![CDATA[$ cd /Applications\n"
+#~ "$ unzip ~/jboss-5.0.0.GA.zip]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> ant tomcat.deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/numberguess\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd /path/to/apache-tomcat-6\n"
+#~ "$> ./bin/start.sh]]>"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
+#~ "$> start]]>"
+#~ msgstr ""
+#~ "<![CDATA[$ cd /Applications\n"
+#~ "$ unzip ~/jboss-5.0.0.GA.zip]]>"
+
+#, fuzzy
+#~ msgid ""
 #~ "Getting started with Web Beans, the Reference Implementation of JSR-299"
 #~ msgstr "La implementación de referencia de Web Beans"
 
@@ -1005,10 +797,6 @@
 #~ "literal> que contiene beans empresariales. Para ejecutar los ejemplos "
 #~ "necesitará lo siguiente:"
 
-#, fuzzy
-#~ msgid "JBoss AS 5.0.1.GA, or"
-#~ msgstr "JBoss AS 5.0.0.GA, y"
-
 #~ msgid "Ant 1.7.0."
 #~ msgstr "Ant 1.7.0."
 

Modified: doc/trunk/reference/es-ES/injection.po
===================================================================
--- doc/trunk/reference/es-ES/injection.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/injection.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: injection\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-19 15:18+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,28 +17,24 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: injection.xml:4
 #, fuzzy, no-c-format
 msgid "Dependency injection and programmatic lookup"
 msgstr "Inyección de dependencia"
 
 #. Tag: para
-#: injection.xml:6
 #, no-c-format
 msgid ""
-"One of the most significant features of CDI&#8212;certainly the most "
-"recognized&#8212;is dependency injection; excuse me, <emphasis>typesafe</"
-"emphasis> dependency injection."
+"One of the most significant features of CDI—certainly the most recognized—is "
+"dependency injection; excuse me, <emphasis>typesafe</emphasis> dependency "
+"injection."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:12
 #, no-c-format
 msgid "Injection points"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:14
 #, no-c-format
 msgid ""
 "The <literal>@Inject</literal> annotation lets us define an injection point "
@@ -47,77 +43,21 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:19
 #, fuzzy, no-c-format
 msgid "<emphasis>Bean constructor</emphasis> parameter injection:"
 msgstr "Inyección de parámetro del método <emphasis>Inicializador</emphasis>:"
 
-#. Tag: programlisting
-#: injection.xml:23
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private final ShoppingCart cart;\n"
-"    \n"
-"   @Inject\n"
-"   public Checkout(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"    private final ShoppingCart cart;\n"
-"    \n"
-"    @Initializer\n"
-"    public Checkout(ShoppingCart cart) {\n"
-"        this.cart = cart;\n"
-"    }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:26
 #, no-c-format
 msgid "A bean can only have one injectable constructor."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:31
 #, fuzzy, no-c-format
 msgid "<emphasis>Initializer method</emphasis> parameter injection:"
 msgstr "Inyección de parámetro del método <emphasis>Inicializador</emphasis>:"
 
-#. Tag: programlisting
-#: injection.xml:35
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private ShoppingCart cart;\n"
-"\n"
-"   @Inject\n"
-"   void setShoppingCart(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"    private ShoppingCart cart;\n"
-"\n"
-"    @Initializer \n"
-"    void setShoppingCart(ShoppingCart cart) {\n"
-"        this.cart = cart;\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:38
 #, no-c-format
 msgid ""
 "A bean can have multiple initializer methods. If the bean is a session bean, "
@@ -126,29 +66,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:44
 #, no-c-format
 msgid "And direct field injection:"
 msgstr "E inyección directa de campo:"
 
-#. Tag: programlisting
-#: injection.xml:48
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"   private @Inject ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"    private @Current ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:51
 #, no-c-format
 msgid ""
 "Getter and setter methods are not required for field injection to work "
@@ -156,7 +78,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:56
 #, fuzzy, no-c-format
 msgid ""
 "Dependency injection always occurs when the bean instance is first "
@@ -167,7 +88,6 @@
 "Bean es instanciada primero:"
 
 #. Tag: para
-#: injection.xml:63
 #, fuzzy, no-c-format
 msgid ""
 "First, the container calls the bean constructor (the default constructor or "
@@ -178,7 +98,6 @@
 "obtener una instancia del Web Bean."
 
 #. Tag: para
-#: injection.xml:69
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container initializes the values of all injected fields of the "
@@ -188,7 +107,6 @@
 "inyectados del Web Bean."
 
 #. Tag: para
-#: injection.xml:74
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container calls all initializer methods of bean (the call order is "
@@ -198,7 +116,6 @@
 "inicializadores del Web Bean."
 
 #. Tag: para
-#: injection.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "Finally, the <literal>@PostConstruct</literal> method, if any, is called."
@@ -207,7 +124,6 @@
 "literal>, si existe."
 
 #. Tag: para
-#: injection.xml:86
 #, no-c-format
 msgid ""
 "(The only complication is that the container might call initializer methods "
@@ -216,7 +132,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:90
 #, no-c-format
 msgid ""
 "One major advantage of constructor injection is that it allows the bean to "
@@ -224,7 +139,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:95
 #, no-c-format
 msgid ""
 "CDI also supports parameter injection for some other methods that are "
@@ -232,36 +146,21 @@
 "producer methods:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:100
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:102
 #, no-c-format
 msgid ""
 "This is a case where the <literal>@Inject</literal> annotation <emphasis>is "
 "not</emphasis> required at the injection point. The same is true for "
-"observer methods (which we'll meet in <xref linkend=\"events\"/>) and "
+"observer methods (which we'll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:110
 #, no-c-format
 msgid "What gets injected"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:112
 #, fuzzy, no-c-format
 msgid ""
 "The CDI specification defines a procedure, called <emphasis>typesafe "
@@ -284,7 +183,6 @@
 "<literal>AmbiguousDependencyException</literal>."
 
 #. Tag: para
-#: injection.xml:120
 #, fuzzy, no-c-format
 msgid ""
 "The purpose of this algorithm is to allow multiple beans to implement the "
@@ -294,7 +192,6 @@
 "el mismo tipo API ya sea:"
 
 #. Tag: para
-#: injection.xml:126
 #, fuzzy, no-c-format
 msgid ""
 "allow the client to select which implementation it requires using a "
@@ -304,7 +201,6 @@
 "<emphasis>anotaciones de enlace</emphasis>,"
 
 #. Tag: para
-#: injection.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "allow the application deployer to select which implementation is appropriate "
@@ -316,13 +212,11 @@
 "inhabilitando los <emphasis>tipos de despliegue</emphasis>, o"
 
 #. Tag: para
-#: injection.xml:137
 #, no-c-format
 msgid "allow the beans to be isolated into separate modules."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:143
 #, no-c-format
 msgid ""
 "Obviously, if you have exactly one bean of a given type, and an injection "
@@ -332,7 +226,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:149
 #, no-c-format
 msgid ""
 "But then, things start to get complicated. Let's explore how the container "
@@ -341,13 +234,11 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:157
 #, fuzzy, no-c-format
 msgid "Qualifier annotations"
 msgstr "Anotaciones de Enlace"
 
 #. Tag: para
-#: injection.xml:159
 #, fuzzy, no-c-format
 msgid ""
 "If we have more than one bean that implements a particular bean type, the "
@@ -360,36 +251,7 @@
 "mediante una anotación de enlace. Por ejemplo, deberían haber dos "
 "aplicaciones del <literal>PaymentProcessor</literal>:"
 
-#. Tag: programlisting
-#: injection.xml:165
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Synchronous\n"
-"public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: injection.xml:167
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Asynchronous\n"
-"public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:169
 #, fuzzy, no-c-format
 msgid ""
 "Where <literal>@Synchronous</literal> and <literal>@Asynchronous</literal> "
@@ -398,36 +260,7 @@
 "Donde <literal>@PayByCheque</literal> y <literal>@PayByCreditCard</literal> "
 "son anotaciones de enlace:"
 
-#. Tag: programlisting
-#: injection.xml:173
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Synchronous {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayByCheque {}]]>"
-
-#. Tag: programlisting
-#: injection.xml:175
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Asynchronous {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayByCheque {}]]>"
-
 #. Tag: para
-#: injection.xml:177
 #, fuzzy, no-c-format
 msgid ""
 "A client bean developer uses the qualifier annotation to specify exactly "
@@ -437,76 +270,21 @@
 "especificar exactamente el Web Bean que debe inyectarse."
 
 #. Tag: para
-#: injection.xml:181
 #, no-c-format
 msgid "Using field injection:"
 msgstr "Uso de inyección de campo:"
 
-#. Tag: programlisting
-#: injection.xml:183
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
-"@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@PayByCheque PaymentProcessor chequePaymentProcessor;\n"
-"@PayByCreditCard PaymentProcessor creditCardPaymentProcessor;]]>"
-
 #. Tag: para
-#: injection.xml:185
 #, no-c-format
 msgid "Using initializer method injection:"
 msgstr "Uso de inyección de método inicializador:"
 
-#. Tag: programlisting
-#: injection.xml:187
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public void setPaymentProcessors(@Synchronous PaymentProcessor "
-"syncPaymentProcessor, \n"
-"                                 @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public void setPaymentProcessors(@PayByCheque PaymentProcessor "
-"chequePaymentProcessor, \n"
-"                                 @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:189
 #, fuzzy, no-c-format
 msgid "Using constructor injection:"
 msgstr "O uso de inyección de constructor:"
 
-#. Tag: programlisting
-#: injection.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
-"                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public Checkout(@PayByCheque PaymentProcessor chequePaymentProcessor, \n"
-"                @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:193
 #, no-c-format
 msgid ""
 "Qualifier annotations can also qualify method arguments of producer, "
@@ -515,29 +293,7 @@
 "runtime based on the state of the system:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:199
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces\n"
-"PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
-"syncPaymentProcessor,\n"
-"                                     @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   return isSynchronous() ? syncPaymentProcessor : asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public void setPaymentProcessors(@PayByCheque PaymentProcessor "
-"chequePaymentProcessor, \n"
-"                                 @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:201
 #, no-c-format
 msgid ""
 "If an injected field or a parameter of a bean constructor or initializer "
@@ -546,7 +302,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:206
 #, no-c-format
 msgid ""
 "Now, you may be thinking, <emphasis>\"What's the different between using a "
@@ -558,7 +313,6 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:216
 #, fuzzy, no-c-format
 msgid ""
 "The built-in qualifiers <literal>@Default</literal> and <literal>@Any</"
@@ -568,7 +322,6 @@
 "<literal>@PostConstruct</literal> y <literal>@PreDestroy</literal>."
 
 #. Tag: para
-#: injection.xml:218
 #, no-c-format
 msgid ""
 "Whenever a bean or injection point does not explicitly declare a qualifier, "
@@ -581,33 +334,18 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:225
 #, no-c-format
 msgid ""
 "This is especially useful if you want to iterate over all beans with a "
 "certain bean type. For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:226
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject \n"
-"void initServices(@Any Instance<Service> services) { \n"
-"   for (Service service: services) {\n"
-"      service.init();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:232
 #, no-c-format
 msgid "Qualifiers with members"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:234
 #, no-c-format
 msgid ""
 "Java annotations can have members. We can use annotation members to further "
@@ -617,41 +355,13 @@
 "single annotation with a member:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:240
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayBy {\n"
-"    PaymentType value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:242
 #, no-c-format
 msgid ""
 "Then we select one of the possible member values when appling the qualifier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:246
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:248
 #, fuzzy, no-c-format
 msgid ""
 "We can force the container to ignore a member of a qualifier type by "
@@ -661,50 +371,19 @@
 "tipo de anotación de enlace anotando al miembro <literal>@NonBinding</"
 "literal>."
 
-#. Tag: programlisting
-#: injection.xml:253
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"   @Nonbinding String comment() default \"\";\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @NonBinding public String value();\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:258
 #, no-c-format
 msgid "Multiple qualifiers"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:260
 #, fuzzy, no-c-format
 msgid "An injection point may specify multiple qualifiers:"
 msgstr ""
 "Un punto de inyección puede incluso especificar múltiples anotaciones de "
 "enlace:"
 
-#. Tag: programlisting
-#: injection.xml:264
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
-"syncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:266
 #, fuzzy, no-c-format
 msgid ""
 "Then only a bean which has <emphasis>both</emphasis> qualifier annotations "
@@ -713,29 +392,12 @@
 "En este caso, sólo el Web Bean que tiene <emphasis>ambas</emphasis> "
 "anotaciones de enlace sería elegible para inyección."
 
-#. Tag: programlisting
-#: injection.xml:271
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Synchronous @Reliable\n"
-"public class SynchronousReliablePaymentProcessor implements PaymentProcessor "
-"{\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:276
 #, no-c-format
 msgid "Alternatives"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:278
 #, no-c-format
 msgid ""
 "Alternatives are beans whose implementation is specific to a particular "
@@ -744,22 +406,7 @@
 "<literal>@Asynchronous PaymentProcessor</literal>, all in one:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:282
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Synchronous @Asynchronous\n"
-"public class MockPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:284
 #, no-c-format
 msgid ""
 "By default, <literal>@Alternative</literal> beans are disabled. We need to "
@@ -768,24 +415,7 @@
 "and injection. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:290
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <class>org.mycompany.mock.MockPaymentProcessor</class>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:292
 #, no-c-format
 msgid ""
 "When an ambiguous dependency exists at an injection point, the container "
@@ -795,13 +425,11 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:301
 #, fuzzy, no-c-format
 msgid "Fixing unsatisfied and ambiguous dependencies"
 msgstr "Corregir dependencias insatisfechas"
 
 #. Tag: para
-#: injection.xml:303
 #, fuzzy, no-c-format
 msgid ""
 "The typesafe resolution algorithm fails when, after considering the "
@@ -817,7 +445,6 @@
 "Bean no puede identificar con precisión un Web Bean para inyectar."
 
 #. Tag: para
-#: injection.xml:310
 #, no-c-format
 msgid ""
 "During the course of your development, you're going to encounter this "
@@ -825,13 +452,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:314
 #, no-c-format
 msgid "To fix an <emphasis>unsatisfied dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:320
 #, no-c-format
 msgid ""
 "create a bean which implements the bean type and has all the qualifier types "
@@ -839,7 +464,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:325
 #, no-c-format
 msgid ""
 "make sure that the bean you already have is in the classpath of the module "
@@ -847,7 +471,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:330
 #, no-c-format
 msgid ""
 "explicitly enable an <literal>@Alternative</literal> bean that implements "
@@ -856,13 +479,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:337
 #, no-c-format
 msgid "To fix an <emphasis>ambiguous dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:343
 #, no-c-format
 msgid ""
 "introduce a qualifier to distinguish between the two implementations of the "
@@ -870,14 +491,12 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:348
 #, no-c-format
 msgid ""
 "disable one of the beans by annotating it <literal>@Alternative</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:353
 #, no-c-format
 msgid ""
 "move one of the implementations to a module that is not in the classpath of "
@@ -885,7 +504,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:359
 #, no-c-format
 msgid ""
 "disable one of two <literal>@Alternative</literal> beans that are trying to "
@@ -893,7 +511,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:366
 #, no-c-format
 msgid ""
 "See <ulink url=\"http://sfwk.org/Documentation/"
@@ -904,22 +521,19 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:374
 #, no-c-format
 msgid "Just remember: \"There can be only one.\""
 msgstr ""
 
 #. Tag: para
-#: injection.xml:377
 #, no-c-format
 msgid ""
 "On the other hand, if you really do have an optional or multivalued "
 "injection point, you should change the type of your injection point to "
-"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\"/>."
+"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:382
 #, fuzzy, no-c-format
 msgid ""
 "Now there's one more issue you need to be aware of when using the dependency "
@@ -929,13 +543,11 @@
 "Web Beans."
 
 #. Tag: title
-#: injection.xml:389
 #, no-c-format
 msgid "Client proxies"
 msgstr "Los proxy de cliente"
 
 #. Tag: para
-#: injection.xml:391
 #, fuzzy, no-c-format
 msgid ""
 "Clients of an injected bean do not usually hold a direct reference to a bean "
@@ -946,13 +558,12 @@
 "directa a una instancia de Web Bean."
 
 #. Tag: para
-#: injection.xml:396
 #, fuzzy, no-c-format
 msgid ""
 "Imagine that a bean bound to the application scope held a direct reference "
 "to a bean bound to the request scope. The application-scoped bean is shared "
 "between many different requests. However, each request should see a "
-"different instance of the request scoped bean&#8212;the current one!"
+"different instance of the request scoped bean—the current one!"
 msgstr ""
 "Imagine que un Web Bean vinculado al ámbito de aplicación mantiene una "
 "referencia directa a un Web Bean vinculado al ámbito de petición. La "
@@ -961,7 +572,6 @@
 "la petición en el ámbito de WebBean!"
 
 #. Tag: para
-#: injection.xml:402
 #, fuzzy, no-c-format
 msgid ""
 "Now imagine that a bean bound to the session scope holds a direct reference "
@@ -979,7 +589,6 @@
 "sesión en el ámbito de Web Bean!"
 
 #. Tag: para
-#: injection.xml:409
 #, fuzzy, no-c-format
 msgid ""
 "Therefore, unless a bean has the default scope <literal>@Dependent</"
@@ -1002,7 +611,6 @@
 "recursivo a otros Web Beans inyectados."
 
 #. Tag: para
-#: injection.xml:417
 #, fuzzy, no-c-format
 msgid ""
 "Unfortunately, due to limitations of the Java language, some Java types "
@@ -1018,7 +626,6 @@
 "proxy al tipo de un punto de inyección."
 
 #. Tag: para
-#: injection.xml:423
 #, fuzzy, no-c-format
 msgid "The following Java types cannot be proxied by the container:"
 msgstr ""
@@ -1026,14 +633,12 @@
 "de Java:"
 
 #. Tag: para
-#: injection.xml:427
 #, fuzzy, no-c-format
 msgid ""
 "classes which don't have a non-private constructor with no parameters, and"
 msgstr "las clases que no tienen un constructor no-privado sin parámetros y "
 
 #. Tag: para
-#: injection.xml:430
 #, no-c-format
 msgid ""
 "classes which are declared <literal>final</literal> or have a "
@@ -1043,13 +648,11 @@
 "<literal>final</literal>,"
 
 #. Tag: para
-#: injection.xml:435
 #, no-c-format
 msgid "arrays and primitive types."
 msgstr "matrices y tipos primarios."
 
 #. Tag: para
-#: injection.xml:439
 #, no-c-format
 msgid ""
 "It's usually very easy to fix an unproxyable dependency problem. If an "
@@ -1058,13 +661,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:446
 #, no-c-format
 msgid "add a constructor with no parameters to <literal>X</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:451
 #, no-c-format
 msgid ""
 "change the type of the injection point to <literal>Instance&lt;X&gt;</"
@@ -1072,7 +673,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:456
 #, no-c-format
 msgid ""
 "introduce an interface <literal>Y</literal>, implemented by the injected "
@@ -1080,7 +680,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:462
 #, no-c-format
 msgid ""
 "if all else fails, change the scope of the injected bean to "
@@ -1088,7 +687,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:469
 #, no-c-format
 msgid ""
 "A future release of Weld will likely support a non-standard workaround for "
@@ -1096,7 +694,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:476
 #, no-c-format
 msgid ""
 "Sun, IcedTea, Mac: <literal>Unsafe.allocateInstance()</literal> (The most "
@@ -1104,7 +701,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:481
 #, no-c-format
 msgid ""
 "IBM, JRockit: <literal>ReflectionFactory.newConstructorForSerialization()</"
@@ -1112,19 +708,16 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:487
 #, no-c-format
 msgid "But we didn't get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:496
 #, fuzzy, no-c-format
 msgid "Obtaining a contextual instance by programmatic lookup"
 msgstr "Obtención de un Web Bean por búsqueda programática"
 
 #. Tag: para
-#: injection.xml:498
 #, no-c-format
 msgid ""
 "In certain situations, injection is not the most convenient way to obtain a "
@@ -1132,13 +725,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:505
 #, no-c-format
 msgid "the bean type or qualifiers vary dynamically at runtime, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:510
 #, no-c-format
 msgid ""
 "depending upon the deployment, there may be no bean which satisfies the type "
@@ -1146,13 +737,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:515
 #, no-c-format
 msgid "we would like to iterate over all beans of a certain type."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:521
 #, fuzzy, no-c-format
 msgid ""
 "In these situations, the application may obtain an instance of the interface "
@@ -1161,14 +750,7 @@
 "La aplicación puede obtener una instancia de la interfaz <literal>Manager</"
 "literal> a través de inyección:"
 
-#. Tag: programlisting
-#: injection.xml:526
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:528
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>get()</literal> method of <literal>Instance</literal> produces "
@@ -1177,26 +759,17 @@
 "Tipos de despliegue <literal>@Mock</literal> y <literal>@Staging</literal> "
 "para pruebas"
 
-#. Tag: programlisting
-#: injection.xml:532
-#, fuzzy, no-c-format
-msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:534
 #, no-c-format
 msgid "Qualifiers can be specified in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:540
 #, no-c-format
 msgid "by annotating the <literal>Instance</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:543
 #, fuzzy, no-c-format
 msgid ""
 "by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
@@ -1206,22 +779,11 @@
 "<literal>@PostConstruct</literal> y <literal>@PreDestroy</literal>."
 
 #. Tag: para
-#: injection.xml:547
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is much, much easier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:551
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
-"paymentProcessorSource;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:553
 #, no-c-format
 msgid ""
 "Now, the <literal>PaymentProcessor</literal> returned by <literal>get()</"
@@ -1229,7 +791,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:558
 #, no-c-format
 msgid ""
 "Alternatively, we can specify the qualifier dynamically. First, we add the "
@@ -1237,15 +798,7 @@
 "default qualifier. (All beans have the qualifier <literal>@Any</literal>.)"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:563
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:565
 #, no-c-format
 msgid ""
 "Next, we need to obtain an instance of our qualifier type. Since annotatons "
@@ -1255,68 +808,30 @@
 "subclassing the helper class <literal>AnnotationLiteral</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:572
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[abstract class AsynchronousQualifier\n"
-"extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
-msgstr ""
-"<![CDATA[abstract class CreditCardBinding \n"
-"    extends AnnotationLiteral<CreditCard> \n"
-"    implements CreditCard {}]]>"
-
 #. Tag: para
-#: injection.xml:574
 #, no-c-format
 msgid "In some cases, we can use an anonymous class:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:578
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
-"   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
-msgstr ""
-"<![CDATA[PaymentProcessor p = manager.getInstanceByType(PaymentProcessor."
-"class, \n"
-"                                               new "
-"AnnotationLiteral<CreditCard>(){});]]>"
-
 #. Tag: para
-#: injection.xml:581
 #, no-c-format
 msgid ""
 "We can't use an anonymous class to implement a qualifier type with members."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:586
 #, no-c-format
 msgid ""
 "Now, finally, we can pass the qualifier to the <literal>select()</literal> "
 "method of <literal>Instance</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:590
-#, no-c-format
-msgid ""
-"<![CDATA[Annotation qualifier = synchronously ?\n"
-"      new SynchronousQualifier() : new AsynchronousQualifier();\n"
-"PaymentProcessor p = anyPaymentProcessor.select(qualifier).get().process"
-"(payment);]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:595
 #, no-c-format
 msgid "The <literal>InjectionPoint</literal> object"
 msgstr "El objeto <literal>InjectionPoint</literal>"
 
 #. Tag: para
-#: injection.xml:597
 #, fuzzy, no-c-format
 msgid ""
 "There are certain kinds of dependent objects (beans with scope "
@@ -1330,7 +845,6 @@
 "ejemplo:"
 
 #. Tag: para
-#: injection.xml:603
 #, no-c-format
 msgid ""
 "The log category for a <literal>Logger</literal> depends upon the class of "
@@ -1340,7 +854,6 @@
 "clase de objeto que lo posea."
 
 #. Tag: para
-#: injection.xml:607
 #, no-c-format
 msgid ""
 "Injection of a HTTP parameter or header value depends upon what parameter or "
@@ -1350,7 +863,6 @@
 "parámetro o del nombre de encabezado especificado en el punto de inyección."
 
 #. Tag: para
-#: injection.xml:611
 #, no-c-format
 msgid ""
 "Injection of the result of an EL expression evaluation depends upon the "
@@ -1360,7 +872,6 @@
 "expresión que fue especificada en el punto de inyección."
 
 #. Tag: para
-#: injection.xml:616
 #, fuzzy, no-c-format
 msgid ""
 "A bean with scope <literal>@Dependent</literal> may inject an instance of "
@@ -1372,7 +883,6 @@
 "relativos al punto de inyección al que pertenezca."
 
 #. Tag: para
-#: injection.xml:620
 #, no-c-format
 msgid ""
 "Let's look at an example. The following code is verbose, and vulnerable to "
@@ -1381,14 +891,7 @@
 "Veamos un ejemplo. El código siguiente es detallado, y vulnerable a "
 "problemas de refactorización:"
 
-#. Tag: programlisting
-#: injection.xml:623
-#, no-c-format
-msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-msgstr "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-
 #. Tag: para
-#: injection.xml:625
 #, no-c-format
 msgid ""
 "This clever little producer method lets you inject a JDK <literal>Logger</"
@@ -1397,42 +900,12 @@
 "Este método inteligente de productor permite inyectar un <literal>Logger</"
 "literal> JDK sin especificar explícitamente la categoría de registro:"
 
-#. Tag: programlisting
-#: injection.xml:628
-#, no-c-format
-msgid ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:630
 #, no-c-format
 msgid "We can now write:"
 msgstr "Ahora podemos escribir:"
 
-#. Tag: programlisting
-#: injection.xml:632
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject Logger log;]]>"
-msgstr "<![CDATA[@Current Logger log;]]>"
-
 #. Tag: para
-#: injection.xml:634
 #, fuzzy, no-c-format
 msgid ""
 "Not convinced? Then here's a second example. To inject HTTP parameters, we "
@@ -1441,74 +914,19 @@
 "¿No está convencido? Entonces, veamos un segundo ejemplo. Para inyectar "
 "parámetros, necesitamos definir el tipo de vinculación:"
 
-#. Tag: programlisting
-#: injection.xml:637
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @Nonbinding public String value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @NonBinding public String value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:639
 #, fuzzy, no-c-format
 msgid "We would use this qualifier type at injection points as follows:"
 msgstr ""
 "Utilizaríamos este tipo de enlace en puntos de inyección, como a "
 "continuación:"
 
-#. Tag: programlisting
-#: injection.xml:641
-#, no-c-format
-msgid ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-msgstr ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-
 #. Tag: para
-#: injection.xml:643
 #, no-c-format
 msgid "The following producer method does the work:"
 msgstr "El siguiente método de productor sí funciona:"
 
-#. Tag: programlisting
-#: injection.xml:645
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotated().getAnnotation(HttpParam."
-"class).value());\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotation(HttpParam.class).value"
-"());\n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:647
 #, fuzzy, no-c-format
 msgid ""
 "(Note that the <literal>value()</literal> member of the <literal>HttpParam</"
@@ -1520,7 +938,6 @@
 "porque está anotado como <literal>@NonBinding.</literal>)"
 
 #. Tag: para
-#: injection.xml:650
 #, fuzzy, no-c-format
 msgid ""
 "The container provides a built-in bean that implements the "
@@ -1529,30 +946,395 @@
 "El administrador de Web Bean proporciona un Web Bean incorporado que "
 "implementa la interfaz <literal>InjectionPoint</literal>:"
 
-#. Tag: programlisting
-#: injection.xml:653
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Type getType();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Bean<?> getBean();\n"
-"   public Member getMember();\n"
-"   public Annotated getAnnotated();\n"
-"   public boolean isDelegate();\n"
-"   public boolean isTransient();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Object getInstance(); \n"
-"   public Bean<?> getBean(); \n"
-"   public Member getMember(): \n"
-"   public <T extends Annotation> T getAnnotation(Class<T> annotation); \n"
-"   public Set<T extends Annotation> getAnnotations(); \n"
-"}]]>"
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   public Checkout(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "    private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "    @Initializer\n"
+#~ "    public Checkout(ShoppingCart cart) {\n"
+#~ "        this.cart = cart;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "}]]>"
 
 #, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private ShoppingCart cart;\n"
+#~ "\n"
+#~ "   @Inject\n"
+#~ "   void setShoppingCart(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "    private ShoppingCart cart;\n"
+#~ "\n"
+#~ "    @Initializer \n"
+#~ "    void setShoppingCart(ShoppingCart cart) {\n"
+#~ "        this.cart = cart;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "   private @Inject ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "    private @Current ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Synchronous\n"
+#~ "public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Asynchronous\n"
+#~ "public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Synchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayByCheque {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Asynchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayByCheque {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
+#~ "@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque PaymentProcessor chequePaymentProcessor;\n"
+#~ "@PayByCreditCard PaymentProcessor creditCardPaymentProcessor;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public void setPaymentProcessors(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor, \n"
+#~ "                                 @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public void setPaymentProcessors(@PayByCheque PaymentProcessor "
+#~ "chequePaymentProcessor, \n"
+#~ "                                 @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
+#~ "                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public Checkout(@PayByCheque PaymentProcessor chequePaymentProcessor, \n"
+#~ "                @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces\n"
+#~ "PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor,\n"
+#~ "                                     @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   return isSynchronous() ? syncPaymentProcessor : "
+#~ "asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public void setPaymentProcessors(@PayByCheque PaymentProcessor "
+#~ "chequePaymentProcessor, \n"
+#~ "                                 @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayBy {\n"
+#~ "    PaymentType value();\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "   @Nonbinding String comment() default \"\";\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @NonBinding public String value();\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
+#~ "syncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Synchronous @Reliable\n"
+#~ "public class SynchronousReliablePaymentProcessor implements "
+#~ "PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative @Synchronous @Asynchronous\n"
+#~ "public class MockPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
+#~ "paymentProcessorSource;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]"
+#~ ">"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[abstract class AsynchronousQualifier\n"
+#~ "extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[abstract class CreditCardBinding \n"
+#~ "    extends AnnotationLiteral<CreditCard> \n"
+#~ "    implements CreditCard {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
+#~ "   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
+#~ msgstr ""
+#~ "<![CDATA[PaymentProcessor p = manager.getInstanceByType(PaymentProcessor."
+#~ "class, \n"
+#~ "                                               new "
+#~ "AnnotationLiteral<CreditCard>(){});]]>"
+
+#~ msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
+#~ msgstr "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
+
+#~ msgid ""
+#~ "<![CDATA[class LogFactory {\n"
+#~ "\n"
+#~ "   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
+#~ "      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass"
+#~ "().getName()); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[class LogFactory {\n"
+#~ "\n"
+#~ "   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
+#~ "      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass"
+#~ "().getName()); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject Logger log;]]>"
+#~ msgstr "<![CDATA[@Current Logger log;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @Nonbinding public String value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @NonBinding public String value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@HttpParam(\"username\") String username;\n"
+#~ "@HttpParam(\"password\") String password;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@HttpParam(\"username\") String username;\n"
+#~ "@HttpParam(\"password\") String password;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[class HttpParams\n"
+#~ "\n"
+#~ "   @Produces @HttpParam(\"\")\n"
+#~ "   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
+#~ "      return request.getParameter(ip.getAnnotated().getAnnotation"
+#~ "(HttpParam.class).value());\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[class HttpParams\n"
+#~ "\n"
+#~ "   @Produces @HttpParam(\"\")\n"
+#~ "   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
+#~ "      return request.getParameter(ip.getAnnotation(HttpParam.class).value"
+#~ "());\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public interface InjectionPoint { \n"
+#~ "   public Type getType();\n"
+#~ "   public Set<Annotation> getQualifiers();\n"
+#~ "   public Bean<?> getBean();\n"
+#~ "   public Member getMember();\n"
+#~ "   public Annotated getAnnotated();\n"
+#~ "   public boolean isDelegate();\n"
+#~ "   public boolean isTransient();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface InjectionPoint { \n"
+#~ "   public Object getInstance(); \n"
+#~ "   public Bean<?> getBean(); \n"
+#~ "   public Member getMember(): \n"
+#~ "   public <T extends Annotation> T getAnnotation(Class<T> annotation); \n"
+#~ "   public Set<T extends Annotation> getAnnotations(); \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
 #~ "It's usually very easy to fix an unproxyable dependency problem. Simply "
 #~ "add a constructor with no parameters to the injected class, introduce an "
 #~ "interface, or, if all else fails, change the scope of the injected bean "

Modified: doc/trunk/reference/es-ES/interceptors.po
===================================================================
--- doc/trunk/reference/es-ES/interceptors.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/interceptors.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: interceptors\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-19 15:37+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: interceptors.xml:5
 #, no-c-format
 msgid "Interceptors"
 msgstr "Interceptores"
 
 #. Tag: para
-#: interceptors.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Interceptor functionality is defined in the Java Interceptors specification. "
@@ -34,32 +32,27 @@
 "de enlace a Web Beans."
 
 #. Tag: para
-#: interceptors.xml:12
 #, fuzzy, no-c-format
 msgid ""
 "The Interceptors specification defines two kinds of interception points:"
 msgstr "La especificación EJB define dos clases de puntos de interceptación:"
 
 #. Tag: para
-#: interceptors.xml:18
 #, no-c-format
 msgid "business method interception, and"
 msgstr "la interceptación de método de negocios y"
 
 #. Tag: para
-#: interceptors.xml:21
 #, no-c-format
 msgid "lifecycle callback interception."
 msgstr "la interceptación de devolución de llamadas de ciclo de vida"
 
 #. Tag: para
-#: interceptors.xml:25
 #, fuzzy, no-c-format
 msgid "In addition, the EJB specification defines timeout method interception."
 msgstr "La especificación EJB define dos clases de puntos de interceptación:"
 
 #. Tag: para
-#: interceptors.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>business method interceptor</emphasis> applies to invocations of "
@@ -68,23 +61,7 @@
 "Un <emphasis>interceptor de método de negocios</emphasis> se aplica a "
 "invocaciones de métodos del Web Bean por clientes del Web Bean:"
 
-#. Tag: programlisting
-#: interceptors.xml:34
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:36
 #, no-c-format
 msgid ""
 "A <emphasis>lifecycle callback interceptor</emphasis> applies to invocations "
@@ -94,22 +71,7 @@
 "emphasis> se aplica a invocaciones de devolución de llamadas de ciclo de "
 "vida por el contenedor:"
 
-#. Tag: programlisting
-#: interceptors.xml:41
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"   @PostConstruct \n"
-"   public void injectDependencies(InvocationContext ctx) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"    @PostConstruct public void injectDependencies(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:43
 #, no-c-format
 msgid ""
 "An interceptor class may intercept both lifecycle callbacks and business "
@@ -119,7 +81,6 @@
 "de ciclo de vida y métodos de negocios."
 
 #. Tag: para
-#: interceptors.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>timeout method interceptor</emphasis> applies to invocations of "
@@ -129,29 +90,12 @@
 "emphasis> se aplica a invocaciones de devolución de llamadas de ciclo de "
 "vida por el contenedor:"
 
-#. Tag: programlisting
-#: interceptors.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TimeoutInterceptor {\n"
-"   @AroundTimeout \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:55
 #, no-c-format
 msgid "Interceptor bindings"
 msgstr "Enlaces de interceptor"
 
 #. Tag: para
-#: interceptors.xml:57
 #, fuzzy, no-c-format
 msgid ""
 "Suppose we want to declare that some of our beans are transactional. The "
@@ -163,22 +107,7 @@
 "de enlace de interceptor</emphasis> para especificar exactamente en cuáles "
 "Web Beans estamos interesados:"
 
-#. Tag: programlisting
-#: interceptors.xml:62
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-
 #. Tag: para
-#: interceptors.xml:64
 #, no-c-format
 msgid ""
 "Now we can easily specify that our <literal>ShoppingCart</literal> is a "
@@ -187,43 +116,18 @@
 "Ahora podemos especificar con facilidad que nuestro <literal>ShoppingCart</"
 "literal> es un objeto transaccional:"
 
-#. Tag: programlisting
-#: interceptors.xml:68
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:70
 #, no-c-format
 msgid "Or, if we prefer, we can specify that just one method is transactional:"
 msgstr ""
 "O, si preferimos, podemos especificar que sólo un método es transaccional:"
 
-#. Tag: programlisting
-#: interceptors.xml:74
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class ShoppingCart {\n"
-"    @Transactional public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:79
 #, no-c-format
 msgid "Implementing interceptors"
 msgstr "Implementación de interceptores"
 
 #. Tag: para
-#: interceptors.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "That's great, but somewhere along the line we're going to have to actually "
@@ -237,56 +141,12 @@
 "EJB, y anotar <literal>@Interceptor</literal> y <literal>@Transactional</"
 "literal>."
 
-#. Tag: programlisting
-#: interceptors.xml:87
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:89
 #, no-c-format
 msgid "Interceptors can take advantage of dependency injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:93
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource UserTransaction transaction;\n"
-"\n"
-"    @AroundInvoke \n"
-"    public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource Transaction transaction;\n"
-"\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:95
 #, no-c-format
 msgid "Multiple interceptors may use the same interceptor binding type."
 msgstr ""
@@ -294,13 +154,11 @@
 "interceptor."
 
 #. Tag: title
-#: interceptors.xml:102
 #, no-c-format
 msgid "Enabling interceptors"
 msgstr "Habilitar Interceptores"
 
 #. Tag: para
-#: interceptors.xml:104
 #, no-c-format
 msgid ""
 "By default, all interceptors are disabled. We need to <emphasis>enable</"
@@ -308,30 +166,12 @@
 "a bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:110
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:112
 #, no-c-format
 msgid "Whoah! Why the angle bracket stew?"
 msgstr "¿Por qué el corchete angular permanece?"
 
 #. Tag: para
-#: interceptors.xml:114
 #, fuzzy, no-c-format
 msgid ""
 "Well, having the XML declaration is actually a <emphasis>good thing</"
@@ -339,7 +179,6 @@
 msgstr "Bien, la declaración XML resuelve dos problemas:"
 
 #. Tag: para
-#: interceptors.xml:120
 #, no-c-format
 msgid ""
 "it enables us to specify a total ordering for all the interceptors in our "
@@ -349,7 +188,6 @@
 "nuestro sistema, garantizando una conducta determinante y "
 
 #. Tag: para
-#: interceptors.xml:126
 #, no-c-format
 msgid "it lets us enable or disable interceptor classes at deployment time."
 msgstr ""
@@ -357,7 +195,6 @@
 "del despliegue."
 
 #. Tag: para
-#: interceptors.xml:130
 #, fuzzy, no-c-format
 msgid ""
 "For example, we could specify that our security interceptor runs before our "
@@ -366,25 +203,7 @@
 "Por ejemplo, podemos especificar que nuestro interceptor de seguridad se "
 "ejecuta antes que nuestro <literal>TransactionInterceptor</literal>."
 
-#. Tag: programlisting
-#: interceptors.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.SecurityInterceptor</class>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:136
 #, no-c-format
 msgid ""
 "Or we could turn them both off in our test environment by simply not "
@@ -392,13 +211,11 @@
 msgstr ""
 
 #. Tag: title
-#: interceptors.xml:142
 #, no-c-format
 msgid "Interceptor bindings with members"
 msgstr "Enlaces de interceptor con miembros"
 
 #. Tag: para
-#: interceptors.xml:144
 #, no-c-format
 msgid ""
 "Suppose we want to add some extra information to our "
@@ -407,26 +224,7 @@
 "Suponga que deseamos agregar alguna información adicional a nuestra "
 "anotación <literal>@Transactional</literal>:"
 
-#. Tag: programlisting
-#: interceptors.xml:148
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"   boolean requiresNew() default false;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"    boolean requiresNew() default false;\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:150
 #, fuzzy, no-c-format
 msgid ""
 "CDI will use the value of <literal>requiresNew</literal> to choose between "
@@ -437,25 +235,7 @@
 "entre dos interceptores, <literal>TransactionInterceptor</literal> y "
 "<literal>RequiresNewTransactionInterceptor</literal>."
 
-#. Tag: programlisting
-#: interceptors.xml:155
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional(requiresNew=true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:157
 #, no-c-format
 msgid ""
 "Now we can use <literal>RequiresNewTransactionInterceptor</literal> like "
@@ -464,18 +244,7 @@
 "Ahora podemos utilizar <literal>RequiresNewTransactionInterceptor</literal> "
 "de esta manera:"
 
-#. Tag: programlisting
-#: interceptors.xml:161
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true)\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional(requiresNew=true)\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:163
 #, fuzzy, no-c-format
 msgid ""
 "But what if we only have one interceptor and we want the container to ignore "
@@ -487,32 +256,12 @@
 "administrador ignore el valor de <literal>requiresNew</literal> al vincular "
 "interceptores? Podemos utilizar la anotación <literal>@NonBinding</literal>:"
 
-#. Tag: programlisting
-#: interceptors.xml:169
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"   @Nonbinding String[] rolesAllowed() default {};\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"    @NonBinding String[] rolesAllowed() default {};\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:174
 #, no-c-format
 msgid "Multiple interceptor binding annotations"
 msgstr "Anotaciones de enlace de múltiples interceptores"
 
 #. Tag: para
-#: interceptors.xml:176
 #, fuzzy, no-c-format
 msgid ""
 "Usually we use combinations of interceptor bindings types to bind multiple "
@@ -526,18 +275,7 @@
 "<literal>TransactionInterceptor</literal> y <literal>SecurityInterceptor</"
 "literal> al mismo Web Bean:"
 
-#. Tag: programlisting
-#: interceptors.xml:182
-#, no-c-format
-msgid ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:184
 #, no-c-format
 msgid ""
 "However, in very complex cases, an interceptor itself may specify some "
@@ -546,18 +284,7 @@
 "Sin embargo, en casos muy complejos, el mismo interceptor puede especificar "
 "una combinación de tipos de interceptor de enlace:"
 
-#. Tag: programlisting
-#: interceptors.xml:189
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:191
 #, no-c-format
 msgid ""
 "Then this interceptor could be bound to the <literal>checkout()</literal> "
@@ -566,68 +293,12 @@
 "Entonces este interceptor podría estar vinculado al método <literal>checkout"
 "()</literal> mediante cualquiera de las siguientes combinaciones:"
 
-#. Tag: programlisting
-#: interceptors.xml:196
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class ShoppingCart {\n"
-"    @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:198
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"    @Transactional public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:200
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart {\n"
-"   @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactionl\n"
-"public class ShoppingCart {\n"
-"    @Secure public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:202
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"    public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:207
 #, no-c-format
 msgid "Interceptor binding type inheritance"
 msgstr "Herencia del tipo de interceptor de enlace"
 
 #. Tag: para
-#: interceptors.xml:209
 #, no-c-format
 msgid ""
 "One limitation of the Java language support for annotations is the lack of "
@@ -638,23 +309,14 @@
 "la falta de herencia de anotación. En realidad, las anotaciones deberían "
 "tener reutilización incorporada, para permitir a este tipo que funcione:"
 
-#. Tag: programlisting
-#: interceptors.xml:214
-#, no-c-format
-msgid ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-msgstr ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:216
 #, fuzzy, no-c-format
 msgid ""
 "Well, fortunately, CDI works around this missing feature of Java. We may "
 "annotate one interceptor binding type with other interceptor binding types "
 "(termed a <emphasis>meta-annotation</emphasis>). The interceptor bindings "
-"are transitive &#8212; any bean with the first interceptor binding inherits "
-"the interceptor bindings declared as meta-annotations."
+"are transitive — any bean with the first interceptor binding inherits the "
+"interceptor bindings declared as meta-annotations."
 msgstr ""
 "Bueno, afortunadamente, Web Beans funciona en torno a esta característica de "
 "Java. Podemos anotar un interceptor de tipo de enlace con otros tipos de "
@@ -662,24 +324,7 @@
 "cualquier Web Bean con el primer enlace de interceptor hereda los enlaces de "
 "interceptor declarados como meta-anotaciones."
 
-#. Tag: programlisting
-#: interceptors.xml:223
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBinding\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBindingType\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:225
 #, fuzzy, no-c-format
 msgid ""
 "Now, any bean annotated <literal>@Action</literal> will be bound to both "
@@ -693,13 +338,11 @@
 "éste existe.)"
 
 #. Tag: title
-#: interceptors.xml:234
 #, no-c-format
 msgid "Use of <literal>@Interceptors</literal>"
 msgstr "Uso de <literal>@Interceptors</literal>"
 
 #. Tag: para
-#: interceptors.xml:236
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>@Interceptors</literal> annotation defined by the interceptor "
@@ -709,37 +352,18 @@
 "La anotación <literal>@Interceptors</literal> definida por la especificación "
 "de EJB es compatible con Web Beans empresariales y sencillos, por ejemplo:"
 
-#. Tag: programlisting
-#: interceptors.xml:239
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"    public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:241
 #, no-c-format
 msgid "However, this approach suffers the following drawbacks:"
 msgstr "Sin embargo, este enfoque tiene los siguientes inconvenientes:"
 
 #. Tag: para
-#: interceptors.xml:245
 #, no-c-format
 msgid "the interceptor implementation is hardcoded in business code,"
 msgstr ""
 "la implementación de interceptor está codificada en código de negocios,"
 
 #. Tag: para
-#: interceptors.xml:250
 #, no-c-format
 msgid "interceptors may not be easily disabled at deployment time, and"
 msgstr ""
@@ -747,23 +371,274 @@
 "despliegue, y"
 
 #. Tag: para
-#: interceptors.xml:255
 #, fuzzy, no-c-format
 msgid ""
-"the interceptor ordering is non-global &#8212; it is determined by the order "
-"in which interceptors are listed at the class level."
+"the interceptor ordering is non-global — it is determined by the order in "
+"which interceptors are listed at the class level."
 msgstr ""
 "la orden del interceptor es no-global &#151; es determinada por la orden en "
 "que se listan los interceptores en el nivel de clase."
 
 #. Tag: para
-#: interceptors.xml:262
 #, fuzzy, no-c-format
 msgid "Therefore, we recommend the use of CDI-style interceptor bindings."
 msgstr ""
 "Por lo tanto, recomendamos el uso de Web Beans estilo interceptor de enlaces."
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DependencyInjectionInterceptor {\n"
+#~ "   @PostConstruct \n"
+#~ "   public void injectDependencies(InvocationContext ctx) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DependencyInjectionInterceptor {\n"
+#~ "    @PostConstruct public void injectDependencies(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class TimeoutInterceptor {\n"
+#~ "   @AroundTimeout \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "    @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke \n"
+#~ "    public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource Transaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {\n"
+#~ "   boolean requiresNew() default false;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {\n"
+#~ "    boolean requiresNew() default false;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
+#~ "public class RequiresNewTransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional(requiresNew=true) @Interceptor\n"
+#~ "public class RequiresNewTransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional(requiresNew = true)\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional(requiresNew=true)\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Secure {\n"
+#~ "   @Nonbinding String[] rolesAllowed() default {};\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Secure {\n"
+#~ "    @NonBinding String[] rolesAllowed() default {};\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure @Interceptor\n"
+#~ "public class TransactionalSecureInterceptor { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure @Interceptor\n"
+#~ "public class TransactionalSecureInterceptor { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "    @Transactional @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "    @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactionl\n"
+#~ "public class ShoppingCart {\n"
+#~ "    @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "    public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "@InterceptorBinding\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Action { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "@InterceptorBindingType\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Action { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
+#~ "class})\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
+#~ "class})\n"
+#~ "public class ShoppingCart {\n"
+#~ "    public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "Web Beans re-uses the basic interceptor architecture of EJB 3.0, "
 #~ "extending the functionality in two directions:"
 #~ msgstr ""

Modified: doc/trunk/reference/es-ES/intro.po
===================================================================
--- doc/trunk/reference/es-ES/intro.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/intro.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: intro\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-19 16:28+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: intro.xml:4
 #, no-c-format
 msgid "Introduction"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "So you're keen to get started writing your first bean? Or perhaps you're "
@@ -39,13 +37,11 @@
 "incluso el primer Web Bean que escribió."
 
 #. Tag: title
-#: intro.xml:13
 #, fuzzy, no-c-format
 msgid "What is a bean?"
 msgstr "¿Qué es un Web Bean?"
 
 #. Tag: para
-#: intro.xml:15
 #, no-c-format
 msgid ""
 "A bean is exactly what you think it is. Only now, it has a true identity in "
@@ -53,7 +49,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:19
 #, no-c-format
 msgid ""
 "Prior to Java EE 6, there was no clear definition of the term \"bean\" in "
@@ -66,7 +61,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:27
 #, no-c-format
 msgid ""
 "Java EE 6 finally lays down that common definition in the Managed Beans "
@@ -80,14 +74,13 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:36
 #, no-c-format
 msgid ""
 "With very few exceptions, almost every concrete Java class that has a "
 "constructor with no parameters (or a constructor designated with the "
 "annotation <literal>@Inject</literal>) is a bean. This includes every "
 "JavaBean and every EJB session bean. If you've already got some JavaBeans or "
-"session beans lying around, they're already beans&#8212;you won't need any "
+"session beans lying around, they're already beans—you won't need any "
 "additional special metadata. There's just little one thing you need to do "
 "before you can start injecting them into stuff: you need to put them in an "
 "archive (a jar, or a Java EE module such as a war or EJB jar) that contains "
@@ -95,33 +88,29 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:45
 #, no-c-format
 msgid ""
 "The JavaBeans and EJBs you've been writing every day, up until now, have not "
 "been able to take advantage of the new services defined by the CDI "
-"specification. But you'll be able to use every one of them with CDI&#8212;"
-"allowing the container to create and destroy instances of your beans and "
-"associate them with a designated context, injecting them into other beans, "
-"using them in EL expressions, specializing them with qualifier annotations, "
-"even adding interceptors and decorators to them&#8212;without modifying your "
-"existing code. At most, you'll need to add some annotations."
+"specification. But you'll be able to use every one of them with CDI—allowing "
+"the container to create and destroy instances of your beans and associate "
+"them with a designated context, injecting them into other beans, using them "
+"in EL expressions, specializing them with qualifier annotations, even adding "
+"interceptors and decorators to them—without modifying your existing code. At "
+"most, you'll need to add some annotations."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:54
 #, no-c-format
 msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
-#: intro.xml:61
 #, no-c-format
 msgid "Getting our feet wet"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:63
 #, fuzzy, no-c-format
 msgid ""
 "Suppose that we have two existing Java classes that we've been using for "
@@ -132,20 +121,7 @@
 "utilizando por años en varias aplicaciones. La primera clase analiza una "
 "cadena en un lista de oraciones:"
 
-#. Tag: programlisting
-#: intro.xml:68
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class SentenceParser {\n"
-"   public List<String> parse(String text) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class SentenceParser {\n"
-"    public List<String> parse(String text) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:70
 #, no-c-format
 msgid ""
 "The second existing class is a stateless session bean front-end for an "
@@ -155,42 +131,12 @@
 "La segunda clase existente es un bean de front-end sin estado de sesión "
 "capaz de traducir oraciones de un idioma a otro:"
 
-#. Tag: programlisting
-#: intro.xml:75
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"   public String translate(String sentence) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"    public String translate(String sentence) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:77
 #, fuzzy, no-c-format
 msgid "Where <literal>Translator</literal> is the EJB local interface:"
 msgstr "Donde <literal>Translator</literal> es la interfaz local:"
 
-#. Tag: programlisting
-#: intro.xml:79
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"   public String translate(String sentence);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"    public String translate(String sentence);\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "Unfortunately, we don't have a class that translates whole text documents. "
@@ -199,54 +145,7 @@
 "Lamentablemente, no tenemos una clase preexistente que traduzca todos los "
 "documentos de texto. Entonces, escribamos un Web Bean que realice esta tarea:"
 
-#. Tag: programlisting
-#: intro.xml:85
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator {\n"
-"   private SentenceParser sentenceParser;\n"
-"   private Translator sentenceTranslator;\n"
-"    \n"
-"   @Inject\n"
-"   TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"      this.sentenceParser = sentenceParser;\n"
-"      this.sentenceTranslator = sentenceTranslator;\n"
-"   }\n"
-"    \n"
-"   public String translate(String text) {\n"
-"      StringBuilder sb = new StringBuilder();\n"
-"      for (String sentence: sentenceParser.parse(text)) {\n"
-"          sb.append(sentenceTranslator.translate(sentence));\n"
-"      }\n"
-"      return sb.toString();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TextTranslator {\n"
-"    \n"
-"    private SentenceParser sentenceParser;\n"
-"    private Translator sentenceTranslator;\n"
-"    \n"
-"    @Initializer\n"
-"    TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"        this.sentenceParser = sentenceParser;\n"
-"        this.sentenceTranslator = sentenceTranslator;\n"
-"    }\n"
-"    \n"
-"    public String translate(String text) {\n"
-"        StringBuilder sb = new StringBuilder();\n"
-"        for (String sentence: sentenceParser.parse(text)) {\n"
-"            sb.append(sentenceTranslator.translate(sentence));\n"
-"        }\n"
-"        return sb.toString();\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:87
 #, fuzzy, no-c-format
 msgid ""
 "But wait! <literal>TextTranslator</literal> does not have a constructor with "
@@ -260,7 +159,6 @@
 "anotado <literal>@Initializer</literal>."
 
 #. Tag: para
-#: intro.xml:93
 #, fuzzy, no-c-format
 msgid ""
 "As you've guessed, the <literal>@Inject</literal> annotation has something "
@@ -277,7 +175,6 @@
 "parámetros del constructor o método."
 
 #. Tag: para
-#: intro.xml:100
 #, no-c-format
 msgid ""
 "We may obtain an instance of <literal>TextTranslator</literal> by injecting "
@@ -288,7 +185,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:107
 #, no-c-format
 msgid ""
 "Let's create a UI controller bean that uses field injection to obtain an "
@@ -296,44 +192,12 @@
 "entered by a user:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:116
-#, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class TranslateController {\n"
-"   @Inject TextTranslator textTranslator;\n"
-"\n"
-"   private String inputText;\n"
-"   private String translation;\n"
-"\n"
-"   // JSF action method, perhaps\n"
-"   public void translate() {\n"
-"      translation = textTranslator.translate(inputText); \n"
-"   }\n"
-"\n"
-"   public String getInputText() {\n"
-"      return inputText;\n"
-"   }\n"
-"\n"
-"   public void setInputText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"\n"
-"   public String getTranslation() {\n"
-"      return translation;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:119
 #, fuzzy, no-c-format
 msgid "Field injection of <literal>TextTranslator</literal> instance"
 msgstr "Donde <literal>Translator</literal> es la interfaz local:"
 
 #. Tag: para
-#: intro.xml:127
 #, no-c-format
 msgid ""
 "Notice the controller bean is request-scoped and named. Since this "
@@ -344,7 +208,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:135
 #, fuzzy, no-c-format
 msgid ""
 "Alternatively, we may obtain an instance of <literal>TextTranslator</"
@@ -354,23 +217,7 @@
 "Podemos obtener una instancia de <literal>TextTranslator</literal> "
 "inyectándola en una Web Bean, Servlet o EJB: "
 
-#. Tag: programlisting
-#: intro.xml:140
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
-"...\n"
-"public void translate() {\n"
-"   textTranslatorInstance.get().translate(inputText);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public setTextTranslator(TextTranslator textTranslator) {\n"
-"    this.textTranslator = textTranslator;\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:142
 #, no-c-format
 msgid ""
 "Notice that it isn't necessary to create a getter or setter method to inject "
@@ -381,17 +228,15 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:148
 #, fuzzy, no-c-format
 msgid ""
 "At system initialization time, the container must validate that exactly one "
 "bean exists which satisfies each injection point. In our example, if no "
-"implementation of <literal>Translator</literal> is available&#8212;if the "
-"<literal>SentenceTranslator</literal> EJB was not deployed&#8212;the "
-"container would inform us of an <emphasis>unsatisfied dependency</emphasis>. "
-"If more than one implementation of <literal>Translator</literal> were "
-"available, the container would inform us of the <emphasis>ambiguous "
-"dependency</emphasis>."
+"implementation of <literal>Translator</literal> is available—if the "
+"<literal>SentenceTranslator</literal> EJB was not deployed—the container "
+"would inform us of an <emphasis>unsatisfied dependency</emphasis>. If more "
+"than one implementation of <literal>Translator</literal> were available, the "
+"container would inform us of the <emphasis>ambiguous dependency</emphasis>."
 msgstr ""
 "En el momento de inicialización, el administrador de Web Bean debe confirmar "
 "que exista exactamente un Web Bean que complete cada punto de inyección. En "
@@ -405,7 +250,6 @@
 "<literal>AmbiguousDependencyException</literal>."
 
 #. Tag: para
-#: intro.xml:156
 #, no-c-format
 msgid ""
 "Before we get too deep in the details, let's pause and examine a bean's "
@@ -414,6 +258,97 @@
 "what <emphasis>makes</emphasis> something a bean."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class SentenceParser {\n"
+#~ "   public List<String> parse(String text) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class SentenceParser {\n"
+#~ "    public List<String> parse(String text) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator {\n"
+#~ "   public String translate(String sentence) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator {\n"
+#~ "    public String translate(String sentence) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Local\n"
+#~ "public interface Translator {\n"
+#~ "   public String translate(String sentence);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Local\n"
+#~ "public interface Translator {\n"
+#~ "    public String translate(String sentence);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class TextTranslator {\n"
+#~ "   private SentenceParser sentenceParser;\n"
+#~ "   private Translator sentenceTranslator;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) {\n"
+#~ "      this.sentenceParser = sentenceParser;\n"
+#~ "      this.sentenceTranslator = sentenceTranslator;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public String translate(String text) {\n"
+#~ "      StringBuilder sb = new StringBuilder();\n"
+#~ "      for (String sentence: sentenceParser.parse(text)) {\n"
+#~ "          sb.append(sentenceTranslator.translate(sentence));\n"
+#~ "      }\n"
+#~ "      return sb.toString();\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TextTranslator {\n"
+#~ "    \n"
+#~ "    private SentenceParser sentenceParser;\n"
+#~ "    private Translator sentenceTranslator;\n"
+#~ "    \n"
+#~ "    @Initializer\n"
+#~ "    TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) {\n"
+#~ "        this.sentenceParser = sentenceParser;\n"
+#~ "        this.sentenceTranslator = sentenceTranslator;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public String translate(String text) {\n"
+#~ "        StringBuilder sb = new StringBuilder();\n"
+#~ "        for (String sentence: sentenceParser.parse(text)) {\n"
+#~ "            sb.append(sentenceTranslator.translate(sentence));\n"
+#~ "        }\n"
+#~ "        return sb.toString();\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
+#~ "...\n"
+#~ "public void translate() {\n"
+#~ "   textTranslatorInstance.get().translate(inputText);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public setTextTranslator(TextTranslator textTranslator) {\n"
+#~ "    this.textTranslator = textTranslator;\n"
+#~ "}]]>"
+
 #~ msgid "Getting started with Web Beans"
 #~ msgstr "Comenzando a escribir Web Beans"
 

Modified: doc/trunk/reference/es-ES/master.po
===================================================================
--- doc/trunk/reference/es-ES/master.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/master.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-19 16:28+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: master.xml:9
 #, no-c-format
 msgid "A note about naming and nomenclature"
 msgstr ""
 
 #. Tag: para
-#: master.xml:10
 #, no-c-format
 msgid ""
 "Shortly before the final draft of JSR-299 was submitted, the specification "
@@ -38,7 +36,6 @@
 msgstr ""
 
 #. Tag: para
-#: master.xml:19
 #, no-c-format
 msgid ""
 "You'll also find that some of the functionality that once existed in the "
@@ -48,43 +45,37 @@
 msgstr ""
 
 #. Tag: para
-#: master.xml:25
 #, no-c-format
 msgid ""
 "Note that this reference guide was started while changes were still being "
 "made to the specification. We've done our best to update it for accuracy. If "
 "you discover a conflict between what is written in this guide and the "
-"specification, the specification is the authority&#8212;assume it is "
-"correct. If you believe you have found an error in the specification, please "
-"report it to the JSR-299 EG."
+"specification, the specification is the authority—assume it is correct. If "
+"you believe you have found an error in the specification, please report it "
+"to the JSR-299 EG."
 msgstr ""
 
 #. Tag: title
-#: master.xml:36
 #, no-c-format
 msgid "Beans"
 msgstr ""
 
 #. Tag: title
-#: master.xml:49
 #, no-c-format
 msgid "Weld, the CDI Reference Implementation"
 msgstr ""
 
 #. Tag: title
-#: master.xml:59
 #, fuzzy, no-c-format
 msgid "Loose coupling with strong typing"
 msgstr "Aprovechar al máximo un tecleado fuerte"
 
 #. Tag: title
-#: master.xml:75
 #, fuzzy, no-c-format
 msgid "CDI and the Java EE ecosystem"
 msgstr "Web Beans en el ecosistema de Java EE"
 
 #. Tag: title
-#: master.xml:87
 #, no-c-format
 msgid "Weld reference"
 msgstr ""

Modified: doc/trunk/reference/es-ES/next.po
===================================================================
--- doc/trunk/reference/es-ES/next.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/next.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: next\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-20 09:48+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: next.xml:4
 #, no-c-format
 msgid "Next steps"
 msgstr "Siguientes pasos"
 
 #. Tag: para
-#: next.xml:6
 #, no-c-format
 msgid ""
 "Because CDI is so new, there's not yet a lot of information available "
@@ -36,7 +34,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:14
 #, fuzzy, no-c-format
 msgid ""
 "The CDI reference implementation, Weld, is being developed at the <ulink url="
@@ -54,7 +51,6 @@
 "de entradas de Blog publicadas allí."
 
 #. Tag: para
-#: next.xml:22
 #, no-c-format
 msgid ""
 "We encourage you to follow the <ulink url=\"https://lists.jboss.org/mailman/"
@@ -64,7 +60,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:28
 #, no-c-format
 msgid ""
 "We are eager to find volunteers to help revise, proofread or translate this "
@@ -73,7 +68,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:35
 #, no-c-format
 msgid ""
 "Checkout source from <ulink url=\"http://anonsvn.jboss.org/repos/weld/doc/"
@@ -81,16 +75,7 @@
 "ulink> using SVN"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:40
-#, no-c-format
-msgid ""
-"<![CDATA[$> svn co http://anonsvn.jboss.org/repos/weld/doc/trunk/reference "
-"weld-reference]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:43
 #, no-c-format
 msgid ""
 "Edit the <literal>pom.xml</literal> file in the root of the checkout and "
@@ -99,19 +84,11 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:49
 #, no-c-format
 msgid "Build using Maven 2"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:52
-#, no-c-format
-msgid "<![CDATA[$> mvn]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:54
 #, no-c-format
 msgid ""
 "If you experience an out of memory error, try setting this environment "
@@ -119,7 +96,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:61
 #, no-c-format
 msgid ""
 "The PDF version of the reference guide will appear the current directory. "
@@ -128,7 +104,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:66
 #, no-c-format
 msgid "We look forward to your participation!"
 msgstr ""

Modified: doc/trunk/reference/es-ES/part1.po
===================================================================
--- doc/trunk/reference/es-ES/part1.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/part1.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part1\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-19 16:38+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,7 +17,6 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: para
-#: part1.xml:14
 #, fuzzy, no-c-format
 msgid ""
 "The <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-299</ulink> "
@@ -34,7 +33,6 @@
 "programación Java EE, el servicio de Web Beans proporciona servicios:"
 
 #. Tag: para
-#: part1.xml:23
 #, fuzzy, no-c-format
 msgid ""
 "an improved lifecycle for stateful objects, bound to well-defined "
@@ -44,13 +42,11 @@
 "<emphasis>contextos</emphasis> bien definidos,"
 
 #. Tag: para
-#: part1.xml:28
 #, no-c-format
 msgid "a typesafe approach to <emphasis>dependency injection</emphasis>,"
 msgstr "un método typesafe para <emphasis>inyección de dependencia</emphasis>,"
 
 #. Tag: para
-#: part1.xml:33
 #, fuzzy, no-c-format
 msgid ""
 "object interaction via an <emphasis>event notification facility</emphasis>,"
@@ -59,7 +55,6 @@
 "emphasis>, y"
 
 #. Tag: para
-#: part1.xml:38
 #, fuzzy, no-c-format
 msgid ""
 "a better approach to binding <emphasis>interceptors</emphasis> to objects, "
@@ -72,7 +67,6 @@
 "problemas de negocios."
 
 #. Tag: para
-#: part1.xml:45
 #, no-c-format
 msgid ""
 "an <emphasis>SPI</emphasis> for developing portable extensions to the "
@@ -80,22 +74,21 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:51
 #, no-c-format
 msgid ""
 "The CDI services are a core aspect of the Java EE platform and include full "
 "support for Java EE modularity and the Java EE component architecture. But "
 "the specification does not limit the use of CDI to the Java EE environment. "
 "In the Java SE environment, the services might be provided by a standalone "
-"CDI implementation like Weld (see <xref linkend=\"weld-se\"/>), or even by a "
-"container that also implements the subset of EJB defined for embedded usage "
-"by the EJB 3.1 specification. CDI is especially useful in the context of web "
-"application development, but the problems it solves are general development "
-"concerns and it is therefore applicable to a wide variety of application."
+"CDI implementation like Weld (see <xref linkend=\"weld-se\" />), or even by "
+"a container that also implements the subset of EJB defined for embedded "
+"usage by the EJB 3.1 specification. CDI is especially useful in the context "
+"of web application development, but the problems it solves are general "
+"development concerns and it is therefore applicable to a wide variety of "
+"application."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:61
 #, no-c-format
 msgid ""
 "An object bound to a lifecycle context is called a bean. CDI includes built-"
@@ -104,19 +97,16 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:68
 #, no-c-format
 msgid "managed beans, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:71
 #, no-c-format
 msgid "EJB session beans."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:75
 #, no-c-format
 msgid ""
 "Both managed beans and EJB session beans may inject other beans. But some "
@@ -126,37 +116,31 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:83
 #, no-c-format
 msgid "message-driven beans,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:86
 #, no-c-format
 msgid "interceptors,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:89
 #, no-c-format
 msgid "servlets, servlet filters and servlet event listeners,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:92
 #, no-c-format
 msgid "JAX-WS service endpoints and handlers, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:95
 #, no-c-format
 msgid "JSP tag handlers and tag library event listeners."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:99
 #, fuzzy, no-c-format
 msgid ""
 "CDI relieves the user of an unfamiliar API of the need to answer the "
@@ -167,37 +151,31 @@
 "contestar las siguientes preguntas:"
 
 #. Tag: para
-#: part1.xml:105
 #, fuzzy, no-c-format
 msgid "What is the lifecycle of this object?"
 msgstr "¿Cuál es el ciclo de vida de este objeto? "
 
 #. Tag: para
-#: part1.xml:108
 #, fuzzy, no-c-format
 msgid "How many simultaneous clients can it have?"
 msgstr "¿Cuántos clientes simultáneos puede tener?"
 
 #. Tag: para
-#: part1.xml:111
 #, fuzzy, no-c-format
 msgid "Is it multithreaded?"
 msgstr "¿Es multihilos?"
 
 #. Tag: para
-#: part1.xml:114
 #, no-c-format
 msgid "How do I get access to it from a client?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:117
 #, fuzzy, no-c-format
 msgid "Do I need to explicitly destroy it?"
 msgstr "¿Necesito destruirlo explícitamente?"
 
 #. Tag: para
-#: part1.xml:120
 #, fuzzy, no-c-format
 msgid ""
 "Where should I keep the reference to it when I'm not currently using it?"
@@ -206,7 +184,6 @@
 "directamente?"
 
 #. Tag: para
-#: part1.xml:125
 #, fuzzy, no-c-format
 msgid ""
 "How can I define an alternative implementation, so that the implementation "
@@ -216,13 +193,11 @@
 "implementación de este objeto pueda variar en el momento de despliegue?"
 
 #. Tag: para
-#: part1.xml:131
 #, fuzzy, no-c-format
 msgid "How should I go about sharing this object between other objects?"
 msgstr "¿Cómo hago para compartir este objeto con otros objetos?"
 
 #. Tag: para
-#: part1.xml:137
 #, no-c-format
 msgid ""
 "CDI is more than a framework. It's a whole, rich programming model. The "
@@ -231,7 +206,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:142
 #, fuzzy, no-c-format
 msgid ""
 "A bean specifies only the type and semantics of other beans it depends upon. "
@@ -249,7 +223,6 @@
 "variar según el escenario de despliegue, sin afectar a ningún cliente."
 
 #. Tag: para
-#: part1.xml:149
 #, fuzzy, no-c-format
 msgid ""
 "Events, interceptors and decorators enhance the loose-coupling inherent in "
@@ -259,7 +232,6 @@
 "<emphasis>acoplamiento-flexible</emphasis>inherente en este modelo:"
 
 #. Tag: para
-#: part1.xml:155
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -269,7 +241,6 @@
 "eventos de los consumidores,"
 
 #. Tag: para
-#: part1.xml:159
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -279,7 +250,6 @@
 "lógica de negocios, y"
 
 #. Tag: para
-#: part1.xml:163
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> allow business concerns to be "
@@ -289,7 +259,6 @@
 "cuestiones de negocios."
 
 #. Tag: para
-#: part1.xml:168
 #, fuzzy, no-c-format
 msgid ""
 "What's even more powerful (and comforting) is that CDI provides all these "
@@ -312,7 +281,6 @@
 "dependencias, los interceptores y decoradores y sus consumidores de evento."
 
 #. Tag: para
-#: part1.xml:177
 #, no-c-format
 msgid ""
 "But CDI isn't a restrictive programming model. It doesn't tell you how you "
@@ -322,7 +290,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:183
 #, fuzzy, no-c-format
 msgid ""
 "CDI even provides a comprehensive SPI, allowing other kinds of object "
@@ -336,7 +303,6 @@
 "Bean."
 
 #. Tag: para
-#: part1.xml:189
 #, fuzzy, no-c-format
 msgid ""
 "CDI was influenced by a number of existing Java frameworks, including Seam, "
@@ -353,7 +319,6 @@
 "en XML que Spring, red y aplicación empresarial más capaz que Guice."
 
 #. Tag: para
-#: part1.xml:197
 #, no-c-format
 msgid ""
 "Finally, CDI is a <ulink url=\"http://jcp.org\">Java Community Process</"

Modified: doc/trunk/reference/es-ES/part2.po
===================================================================
--- doc/trunk/reference/es-ES/part2.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/part2.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part2\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-19 16:41+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,7 +17,6 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: para
-#: part2.xml:5
 #, no-c-format
 msgid ""
 "Weld, the JSR-299 Reference Implementation (RI), is being developed as part "
@@ -29,7 +28,6 @@
 msgstr ""
 
 #. Tag: para
-#: part2.xml:12
 #, no-c-format
 msgid ""
 "Weld provides a complete SPI allowing Java EE containers such as JBoss AS "
@@ -39,7 +37,6 @@
 msgstr ""
 
 #. Tag: para
-#: part2.xml:18
 #, no-c-format
 msgid ""
 "Weld comes with an extensive library of examples, which are a great starting "

Modified: doc/trunk/reference/es-ES/part3.po
===================================================================
--- doc/trunk/reference/es-ES/part3.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/part3.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part3\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-19 16:46+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,7 +17,6 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: para
-#: part3.xml:5
 #, no-c-format
 msgid ""
 "The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've "
@@ -25,19 +24,16 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:12
 #, no-c-format
 msgid "<emphasis>alternatives</emphasis> enable deployment time polymorphism,"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:17
 #, no-c-format
 msgid "<emphasis>producer methods</emphasis> enable runtime polymorphism, and"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:21
 #, no-c-format
 msgid ""
 "<emphasis>contextual lifecycle management</emphasis> decouples bean "
@@ -45,7 +41,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:27
 #, no-c-format
 msgid ""
 "These techniques serve to enable loose coupling of client and server. The "
@@ -55,7 +50,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:33
 #, no-c-format
 msgid ""
 "Loose coupling makes a system more <emphasis>dynamic</emphasis>. The system "
@@ -67,7 +61,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:40
 #, no-c-format
 msgid ""
 "CDI provides three extra important facilities that further the goal of loose "
@@ -75,7 +68,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:46
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -83,7 +75,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:51
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> may be used to decouple some business "
@@ -91,7 +82,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:56
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -99,7 +89,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:62
 #, fuzzy, no-c-format
 msgid ""
 "The second major theme of CDI is <emphasis>strong typing</emphasis>. The "
@@ -114,13 +103,12 @@
 "que pueden ser validadas por el compilador."
 
 #. Tag: para
-#: part3.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "You don't see string-based identifiers in CDI code, not because the "
-"framework is hiding them from you using clever defaulting rules&#8212;so-"
-"called \"configuration by convention\"&#8212;but because there are simply no "
-"strings there to begin with!"
+"framework is hiding them from you using clever defaulting rules—so-called "
+"\"configuration by convention\"—but because there are simply no strings "
+"there to begin with!"
 msgstr ""
 "No necesita ver los identificadores de cadena en código de Web Beans, no "
 "porque el marco los esté escondiendo del uso inteligente de las reglas "
@@ -128,7 +116,6 @@
 "simplemente ¡no hay cadenas con qué comenzar!"
 
 #. Tag: para
-#: part3.xml:74
 #, no-c-format
 msgid ""
 "The obvious benefit of this approach is that <emphasis>any</emphasis> IDE "
@@ -146,7 +133,6 @@
 "la oportunidad de aumentar el nivel semántico de su código."
 
 #. Tag: para
-#: part3.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "CDI encourages you develop annotations that model concepts, for example,"
@@ -155,61 +141,51 @@
 "ejemplo, "
 
 #. Tag: para
-#: part3.xml:87
 #, no-c-format
 msgid "<literal>@Asynchronous</literal>,"
 msgstr "<literal>@Asynchronous</literal>,"
 
 #. Tag: para
-#: part3.xml:90
 #, no-c-format
 msgid "<literal>@Mock</literal>,"
 msgstr "<literal>@Mock</literal>,"
 
 #. Tag: para
-#: part3.xml:93
 #, no-c-format
 msgid "<literal>@Secure</literal> or"
 msgstr "<literal>@Secure</literal> o"
 
 #. Tag: para
-#: part3.xml:96
 #, no-c-format
 msgid "<literal>@Updated</literal>,"
 msgstr "<literal>@Updated</literal>,"
 
 #. Tag: para
-#: part3.xml:100
 #, no-c-format
 msgid "instead of using compound names like"
 msgstr "en lugar de utilizar nombres compuestos como"
 
 #. Tag: para
-#: part3.xml:104
 #, no-c-format
 msgid "<literal>asyncPaymentProcessor</literal>,"
 msgstr "<literal>asyncPaymentProcessor</literal>,"
 
 #. Tag: para
-#: part3.xml:107
 #, no-c-format
 msgid "<literal>mockPaymentProcessor</literal>,"
 msgstr "<literal>mockPaymentProcessor</literal>,"
 
 #. Tag: para
-#: part3.xml:110
 #, no-c-format
 msgid "<literal>SecurityInterceptor</literal> or"
 msgstr "<literal>SecurityInterceptor</literal> o"
 
 #. Tag: para
-#: part3.xml:113
 #, no-c-format
 msgid "<literal>DocumentUpdatedEvent</literal>."
 msgstr "<literal>DocumentUpdatedEvent</literal>."
 
 #. Tag: para
-#: part3.xml:117
 #, no-c-format
 msgid ""
 "The annotations are reusable. They help describe common qualities of "
@@ -223,7 +199,6 @@
 "nuestro código más leíble y entendible."
 
 #. Tag: para
-#: part3.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "CDI <emphasis>stereotypes</emphasis> take this idea a step further. A "
@@ -240,7 +215,6 @@
 "un sólo paquete reutilizable."
 
 #. Tag: para
-#: part3.xml:138
 #, fuzzy, no-c-format
 msgid ""
 "We're now ready to meet some more advanced features of CDI. Bear in mind "

Modified: doc/trunk/reference/es-ES/part4.po
===================================================================
--- doc/trunk/reference/es-ES/part4.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/part4.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-19 16:49+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,7 +17,6 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: para
-#: part4.xml:5
 #, no-c-format
 msgid ""
 "The third theme of CDI is <emphasis>integration</emphasis>. We've already "
@@ -29,7 +28,6 @@
 msgstr ""
 
 #. Tag: para
-#: part4.xml:12
 #, fuzzy, no-c-format
 msgid ""
 "CDI is also designed to work in concert with technologies outside of the "
@@ -56,7 +54,6 @@
 "entorno Java EE."
 
 #. Tag: para
-#: part4.xml:23
 #, fuzzy, no-c-format
 msgid ""
 "We're about to see how to take full advantage of the Java EE platform in an "

Modified: doc/trunk/reference/es-ES/part5.po
===================================================================
--- doc/trunk/reference/es-ES/part5.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/part5.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,7 +15,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part5.xml:5
 #, no-c-format
 msgid ""
 "Weld is the reference implementation of JSR-299, and is used by JBoss AS and "
@@ -27,7 +26,6 @@
 msgstr ""
 
 #. Tag: para
-#: part5.xml:12
 #, no-c-format
 msgid ""
 "Some of the extensions in Weld are portable across JSR-299 implementations "
@@ -37,12 +35,11 @@
 msgstr ""
 
 #. Tag: para
-#: part5.xml:18
 #, no-c-format
 msgid ""
 "If you want to get started quickly using Weld (and, in turn, CDI) with JBoss "
 "AS, GlassFish or Tomcat and experiment with one of the examples, take a look "
-"at <xref linkend=\"gettingstarted\"/>. Otherwise read on for a exhaustive "
+"at <xref linkend=\"gettingstarted\" />. Otherwise read on for a exhaustive "
 "discussion of using Weld in all the environments and application servers it "
 "supports and the Weld extensions."
 msgstr ""

Modified: doc/trunk/reference/es-ES/producermethods.po
===================================================================
--- doc/trunk/reference/es-ES/producermethods.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/producermethods.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: producermethods\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-19 17:00+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: producermethods.xml:5
 #, no-c-format
 msgid "Producer methods"
 msgstr "Métodos de productor"
 
 #. Tag: para
-#: producermethods.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Producer methods let us overcome certain limitations that arise when a "
@@ -38,31 +36,26 @@
 "(Veremos un segundo método en <xref linkend=\"xml\"/>.)"
 
 #. Tag: para
-#: producermethods.xml:14
 #, no-c-format
 msgid "According to the spec:"
 msgstr "Según las especificaciones:"
 
 #. Tag: para
-#: producermethods.xml:18
 #, no-c-format
 msgid "A producer method acts as a source of objects to be injected, where:"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:22
 #, no-c-format
 msgid "the objects to be injected are not required to be instances of beans,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:25
 #, no-c-format
 msgid "the concrete type of the objects to be injected may vary at runtime or"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:28
 #, no-c-format
 msgid ""
 "the objects require some custom initialization that is not performed by the "
@@ -70,25 +63,21 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:36
 #, fuzzy, no-c-format
 msgid "For example, producer methods let us:"
 msgstr "Ámbito de un método de productor"
 
 #. Tag: para
-#: producermethods.xml:40
 #, no-c-format
 msgid "expose a JPA entity as a bean,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:43
 #, no-c-format
 msgid "expose any JDK class as a bean,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:46
 #, no-c-format
 msgid ""
 "define multiple beans, with different scopes or initialization, for the same "
@@ -96,13 +85,11 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:51
 #, no-c-format
 msgid "vary the implementation of a bean type at runtime."
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:55
 #, no-c-format
 msgid ""
 "In particular, producer methods let us use runtime polymorphism with CDI. As "
@@ -111,55 +98,12 @@
 "is fixed. A producer method has no such limitation:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:61
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Preferences implements Serializable {\n"
-"   private PaymentStrategyType paymentStrategy;\n"
-"   ...\n"
-"   @Produces @Preferred \n"
-"   public PaymentStrategy getPaymentStrategy() {\n"
-"       switch (paymentStrategy) {\n"
-"           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
-"           case CHECK: return new CheckPaymentStrategy();\n"
-"           case PAYPAL: return new PayPalPaymentStrategy();\n"
-"           default: return null;\n"
-"       } \n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          ChequePaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:63
 #, no-c-format
 msgid "Consider an injection point:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:65
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"    ...\n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:67
 #, no-c-format
 msgid ""
 "This injection point has the same type and qualifier annotations as the "
@@ -169,13 +113,11 @@
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:74
 #, no-c-format
 msgid "Scope of a producer method"
 msgstr "Ámbito de un método de productor"
 
 #. Tag: para
-#: producermethods.xml:76
 #, fuzzy, no-c-format
 msgid ""
 "The scope of the producer method defaults to <literal>@Dependent</literal>, "
@@ -191,7 +133,6 @@
 "del objeto <literal>PaymentStrategy</literal> para cada sesión de usuario."
 
 #. Tag: para
-#: producermethods.xml:83
 #, no-c-format
 msgid ""
 "To change this behavior, we can add a <literal>@SessionScoped</literal> "
@@ -200,22 +141,7 @@
 "Para cambiar esta conducta, podemos agregar una anotación "
 "<literal>@SessionScoped</literal> a este método."
 
-#. Tag: programlisting
-#: producermethods.xml:87
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"    ...\n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:89
 #, no-c-format
 msgid ""
 "Now, when the producer method is called, the returned "
@@ -227,7 +153,6 @@
 "sesión. El método de productor no será llamado otra vez en la misma sesión."
 
 #. Tag: para
-#: producermethods.xml:95
 #, no-c-format
 msgid ""
 "A producer method does <emphasis>not</emphasis> inherit the scope of the "
@@ -240,13 +165,11 @@
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:107
 #, no-c-format
 msgid "Injection into producer methods"
 msgstr "Inyección dentro de métodos de productor"
 
 #. Tag: para
-#: producermethods.xml:109
 #, no-c-format
 msgid ""
 "There's one potential problem with the code above. The implementations of "
@@ -262,7 +185,6 @@
 "dependencia y no tienen interceptores."
 
 #. Tag: para
-#: producermethods.xml:116
 #, fuzzy, no-c-format
 msgid ""
 "If this isn't what we want, we can use dependency injection into the "
@@ -271,36 +193,7 @@
 "Si esto no es lo que deseamos podemos utilizar la inyección de dependencia "
 "dentro del método del productor para obtener las instancias de Web Bean:"
 
-#. Tag: programlisting
-#: producermethods.xml:121
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          CheckPaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          ChequePaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-"
@@ -323,7 +216,6 @@
 "retornar instancias de Web Bean desde métodos de productor!"
 
 #. Tag: para
-#: producermethods.xml:132
 #, fuzzy, no-c-format
 msgid ""
 "There's at least three ways we could go about fixing this bug. We could "
@@ -339,7 +231,6 @@
 "<literal>@RequestScoped</literal>."
 
 #. Tag: para
-#: producermethods.xml:139
 #, fuzzy, no-c-format
 msgid ""
 "But a more common solution is to use the special <literal>@New</literal> "
@@ -349,51 +240,16 @@
 "<literal>@New</literal>."
 
 #. Tag: title
-#: producermethods.xml:144
 #, no-c-format
 msgid "Use of <literal>@New</literal> with producer methods"
 msgstr "Uso de <literal>@New</literal> con métodos de productor"
 
 #. Tag: para
-#: producermethods.xml:146
 #, no-c-format
 msgid "Consider the following producer method:"
 msgstr "Considere el siguiente método de productor:"
 
-#. Tag: programlisting
-#: producermethods.xml:148
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New CheckPaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New ChequePaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:150
 #, no-c-format
 msgid ""
 "Then a new <emphasis>dependent</emphasis> instance of "
@@ -410,47 +266,25 @@
 "objeto <literal>Preferencias</literal> sea destruido, al final de la sesión."
 
 #. Tag: title
-#: producermethods.xml:160
 #, fuzzy, no-c-format
 msgid "Disposer methods"
 msgstr "Métodos de productor"
 
 #. Tag: para
-#: producermethods.xml:162
 #, no-c-format
 msgid ""
 "Some producer methods return objects that require explicit destruction. For "
 "example, somebody needs to close this JDBC connection:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:167
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @RequestScoped Connection connect(User user) {\n"
-"   return createConnection(user.getId(), user.getPassword());\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:169
 #, no-c-format
 msgid ""
 "Destruction can be performed by a matching <emphasis>disposer method</"
 "emphasis>, defined by the same class as the producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:172
-#, no-c-format
-msgid ""
-"<![CDATA[void close(@Disposes Connection connection) {\n"
-"   connection.close();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:174
 #, no-c-format
 msgid ""
 "The disposer method must have at least one parameter, annotated "
@@ -463,7 +297,116 @@
 "method automatically."
 msgstr ""
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Preferences implements Serializable {\n"
+#~ "   private PaymentStrategyType paymentStrategy;\n"
+#~ "   ...\n"
+#~ "   @Produces @Preferred \n"
+#~ "   public PaymentStrategy getPaymentStrategy() {\n"
+#~ "       switch (paymentStrategy) {\n"
+#~ "           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
+#~ "           case CHECK: return new CheckPaymentStrategy();\n"
+#~ "           case PAYPAL: return new PayPalPaymentStrategy();\n"
+#~ "           default: return null;\n"
+#~ "       } \n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          ChequePaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "    ...\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "    ...\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          CheckPaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          ChequePaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          @New CheckPaymentStrategy cps,\n"
+#~ "                                          @New PayPalPaymentStrategy "
+#~ "ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          @New ChequePaymentStrategy "
+#~ "cps,\n"
+#~ "                                          @New PayPalPaymentStrategy "
+#~ "ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "<blockquote> <para>A Web Beans producer method acts as a source of "
 #~ "objects to be injected, where:</para> <itemizedlist> <listitem> <para>the "
 #~ "objects to be injected are not required to be instances of Web Beans,</"

Modified: doc/trunk/reference/es-ES/resources.po
===================================================================
--- doc/trunk/reference/es-ES/resources.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/resources.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: resources.xml:5
 #, no-c-format
 msgid "Java EE component environment resources"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:7
 #, no-c-format
 msgid ""
 "Java EE 5 already introduced some limited support for dependency injection, "
@@ -30,7 +28,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:13
 #, no-c-format
 msgid ""
 "Naturally, there is now a slight mismatch with the new style of dependency "
@@ -44,7 +41,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:22
 #, no-c-format
 msgid ""
 "Fields have a duality in that they can both be the target of Java EE "
@@ -57,13 +53,11 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:31
 #, no-c-format
 msgid "Defining a resource"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:33
 #, no-c-format
 msgid ""
 "The CDI specification uses the term <emphasis>resource</emphasis> to refer, "
@@ -72,7 +66,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:38
 #, no-c-format
 msgid ""
 "JDBC <literal>Datasource</literal>s, JMS <literal>Queue</literal>s, "
@@ -82,7 +75,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:43
 #, no-c-format
 msgid ""
 "JPA <literal>EntityManager</literal>s and <literal>EntityManagerFactory</"
@@ -90,19 +82,16 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:46
 #, no-c-format
 msgid "remote EJBs, and"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:49
 #, no-c-format
 msgid "web services"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:53
 #, no-c-format
 msgid ""
 "We declare a resource by annotating a producer field with a component "
@@ -111,61 +100,17 @@
 "<literal>@PersistenceUnit</literal> or <literal>@WebServiceRef</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:57
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @WebServiceRef(lookup=\"java:app/service/Catalog\")\n"
-"Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Resource(lookup=\"java:global/env/jdbc/CustomerDatasource"
-"\") \n"
-"@CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceContext(unitName=\"CustomerDatabase\")\n"
-"@CustomerDatabase EntityManager customerDatabasePersistenceContext;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:63
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceUnit(unitName=\"CustomerDatabase\") \n"
-"@CustomerDatabase EntityManagerFactory customerDatabasePersistenceUnit;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @EJB(ejbLink=\"../their.jar#PaymentService\") \n"
-"PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:67
 #, no-c-format
 msgid "The field may be static (but not final)."
 msgstr ""
 
 #. Tag: para
-#: resources.xml:69
 #, no-c-format
 msgid "A resource declaration really contains two pieces of information:"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:73
 #, no-c-format
 msgid ""
 "the JNDI name, EJB link, persistence unit name, or other metadata needed to "
@@ -173,7 +118,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:77
 #, no-c-format
 msgid ""
 "the type and qualifiers that we will use to inject the reference into our "
@@ -181,7 +125,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:82
 #, no-c-format
 msgid ""
 "It might feel strange to be declaring resources in Java code. Isn't this "
@@ -191,53 +134,16 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:90
 #, no-c-format
 msgid "Typesafe resource injection"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:92
 #, no-c-format
 msgid "These resources can now be injected in the usual way."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:96
-#, no-c-format
-msgid "<![CDATA[@Inject Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:97
-#, no-c-format
-msgid "<![CDATA[@Inject @CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:98
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManager "
-"customerDatabaseEntityManager;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManagerFactory "
-"customerDatabaseEntityManagerFactory;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:100
-#, no-c-format
-msgid "<![CDATA[@Inject PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:102
 #, no-c-format
 msgid ""
 "The bean type and qualifiers of the resource are determined by the producer "
@@ -245,7 +151,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:106
 #, no-c-format
 msgid ""
 "It might seem like a pain to have to write these extra producer field "
@@ -256,26 +161,12 @@
 "and more typesafe to write"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:113
-#, no-c-format
-msgid "@Inject @CustomerDatabase EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:115
 #, no-c-format
 msgid "instead of"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:117
-#, no-c-format
-msgid "@PersistenceContext(unitName=\"CustomerDatabase\") EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:119
 #, no-c-format
 msgid "all over the place?"
 msgstr ""

Modified: doc/trunk/reference/es-ES/ri-spi.po
===================================================================
--- doc/trunk/reference/es-ES/ri-spi.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/ri-spi.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ri-spi\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-20 10:15+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: ri-spi.xml:4
 #, fuzzy, no-c-format
 msgid "Integrating Weld into other environments"
 msgstr "Integración de la IR de Web Beans en otros entornos"
 
 #. Tag: para
-#: ri-spi.xml:6
 #, no-c-format
 msgid ""
 "If you want to use Weld in another environment, you will need to provide "
@@ -32,13 +30,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:12
 #, fuzzy, no-c-format
 msgid "Enterprise Services"
 msgstr "Carga de recurso"
 
 #. Tag: para
-#: ri-spi.xml:13
 #, no-c-format
 msgid ""
 "If you just want to use managed beans, and not take advantage of enterprise "
@@ -50,7 +46,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:21
 #, no-c-format
 msgid ""
 "All SPIs and APIs described have extensive JavaDoc, which spell out the "
@@ -58,13 +53,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:27
 #, fuzzy, no-c-format
 msgid "The Weld SPI"
 msgstr "SPI RI de Web Beans"
 
 #. Tag: para
-#: ri-spi.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "The Weld SPI is located in the <literal>weld-spi</literal> module, and "
@@ -78,7 +71,6 @@
 "requerirán otros."
 
 #. Tag: para
-#: ri-spi.xml:35
 #, no-c-format
 msgid ""
 "All interfaces in the SPI support the decorator pattern and provide a "
@@ -89,7 +81,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:41
 #, no-c-format
 msgid ""
 "Weld supports multiple environments. An environment is defined by an "
@@ -103,7 +94,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:50
 #, no-c-format
 msgid ""
 "Weld uses a generic-typed service registry to allow services to be "
@@ -112,18 +102,16 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:56
 #, no-c-format
 msgid "Deployment structure"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:58
 #, no-c-format
 msgid ""
 "An application is often comprised of a number of modules. For example, a "
 "Java EE deployment may contain a number of EJB modules (containing business "
-"logic) and WAR modules (containing the user interface). A container may "
+"logic) and war modules (containing the user interface). A container may "
 "enforce certain <emphasis>accessibility</emphasis> rules which limit the "
 "visibility of classes between modules. CDI allows these same rules to apply "
 "to bean and observer method resolution. As the accessibility rules vary "
@@ -133,13 +121,12 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:67
 #, no-c-format
 msgid ""
 "The CDI specification discusses <emphasis>Bean Deployment Archives</"
-"emphasis> (BDAs)&#8212;archives which are marked as containing beans which "
-"should be deployed to the CDI container, and made available for injection "
-"and resolution. Weld reuses this description of <emphasis>Bean Deployment "
+"emphasis> (BDAs)—archives which are marked as containing beans which should "
+"be deployed to the CDI container, and made available for injection and "
+"resolution. Weld reuses this description of <emphasis>Bean Deployment "
 "Archives</emphasis> in its deployment structure SPI. Each deployment exposes "
 "the BDAs which it contains; each BDA may also reference other which it can "
 "access. Together, the transitive closure of this graph forms the beans which "
@@ -147,7 +134,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:76
 #, no-c-format
 msgid ""
 "To describe the deployment structure to Weld, the container should provide "
@@ -161,7 +147,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:85
 #, no-c-format
 msgid ""
 "As programmatically described beans may result in additional BDAs being "
@@ -171,13 +156,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:92
 #, no-c-format
 msgid "Virtual BDAs"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:93
 #, no-c-format
 msgid ""
 "In a strict container, each BDA might have to explicitly specify which other "
@@ -188,7 +171,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:100
 #, no-c-format
 msgid ""
 "A container, might, for example, use a flat accessibility structure for the "
@@ -197,11 +179,10 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:106
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it's contents to be discovered by Weld&#8212;<literal>BeanDeploymentArchive."
+"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
 "getBeanClasses()</literal> must return all the classes in the BDA, "
 "<literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the "
 "deployment descriptors in the archive, and <literal>BeanDeploymentArchive."
@@ -210,7 +191,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:114
 #, no-c-format
 msgid ""
 "BDA X may also reference another BDA Y whose beans can be resolved by, and "
@@ -221,13 +201,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:122
 #, no-c-format
 msgid "Matching the classloader structure for the deployment"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:124
 #, no-c-format
 msgid ""
 "In practice, you can regard the deployment structure represented by "
@@ -238,7 +216,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:132
 #, no-c-format
 msgid ""
 "To specify the directly accessible BDAs, the container should provide an "
@@ -247,7 +224,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:138
 #, no-c-format
 msgid ""
 "Weld allows the container to describe a circular graph, and will convert a "
@@ -255,7 +231,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:144
 #, no-c-format
 msgid ""
 "Certain services are provided for the whole deployment, whilst some are "
@@ -265,13 +240,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:153
 #, no-c-format
 msgid "EJB descriptors"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:155
 #, no-c-format
 msgid ""
 "Weld delegates EJB 3 bean discovery to the container so that it doesn't "
@@ -280,7 +253,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:160
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>EjbDescriptor</literal> should return the relevant metadata as "
@@ -295,13 +267,11 @@
 "jndi a la búsqueda de una instancia del EJB)."
 
 #. Tag: title
-#: ri-spi.xml:169
 #, no-c-format
 msgid "EE resource injection and resolution services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:171
 #, no-c-format
 msgid ""
 "All the EE resource services are per-BDA services, and may be provided using "
@@ -310,37 +280,33 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:176
 #, no-c-format
 msgid ""
 "The integrator may choose to provide all EE resource injection services "
 "themselves, using another library or framework. In this case the integrator "
 "should use the <literal>EE</literal> environment, and implement the <xref "
-"linkend=\"injection.services\"/> SPI."
+"linkend=\"injection.services\" /> SPI."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:182
 #, no-c-format
 msgid ""
 "Alternatively, the integrator may choose to use CDI to provide EE resource "
 "injection. In this case, the <literal>EE_INJECT</literal> environment should "
 "be used, and the integrator should implement the <xref linkend=\"ejb."
-"services.resolution\"/>, <xref linkend=\"resource.services\"/> and <xref "
-"linkend=\"jpa.services\"/>."
+"services.resolution\" />, <xref linkend=\"resource.services\" /> and <xref "
+"linkend=\"jpa.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:189
 #, no-c-format
 msgid ""
 "CDI only provides annotation-based EE resource injection; if you wish to "
 "provide deployment descriptor (e.g. <literal>ejb-jar.xml</literal>) "
-"injection, you must use <xref linkend=\"injection.services\"/>."
+"injection, you must use <xref linkend=\"injection.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:195
 #, no-c-format
 msgid ""
 "If the container performs EE resource injection, the injected resources must "
@@ -349,7 +315,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:201
 #, no-c-format
 msgid ""
 "If you use a non-EE environment then you may implement any of the EE service "
@@ -358,49 +323,43 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:210
 #, no-c-format
 msgid "EJB services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:212
 #, no-c-format
 msgid "EJB services are split between two interfaces which are both per-BDA."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:216
 #, no-c-format
 msgid ""
 "<literal>EJBServices</literal> is used to resolve local EJBs used to back "
 "session beans, and must always be provided in an EE environment. "
 "<literal>EJBServices.resolveEjb(EjbDescriptor ejbDescriptor)</literal> "
-"returns a wrapper&#8212;<literal>SessionObjectReference</literal>&#8212;"
-"around the EJB reference. This wrapper allows Weld to request a reference "
-"that implements the given business interface, and, in the case of SFSBs, "
-"both request the removal of the EJB from the container and query whether the "
-"EJB has been previously removed."
+"returns a wrapper—<literal>SessionObjectReference</literal>—around the EJB "
+"reference. This wrapper allows Weld to request a reference that implements "
+"the given business interface, and, in the case of SFSBs, both request the "
+"removal of the EJB from the container and query whether the EJB has been "
+"previously removed."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:225
 #, no-c-format
 msgid ""
 "<literal>EJBResolutionServices.resolveEjb(InjectionPoint ij)</literal> "
 "allows the resolution of <literal>@EJB</literal> (for injection into managed "
 "beans). This service is not required if the implementation of <xref linkend="
-"\"injection.services\"/> takes care of <literal>@EJB</literal> injection."
+"\"injection.services\" /> takes care of <literal>@EJB</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:234
 #, no-c-format
 msgid "JPA services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:236
 #, no-c-format
 msgid ""
 "Just as EJB resolution is delegated to the container, resolution of "
@@ -410,23 +369,20 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:242
 #, no-c-format
 msgid ""
 "To allow JPA integration, the <literal>JpaServices</literal> interface "
 "should be implemented. This service is not required if the implementation of "
-"<xref linkend=\"injection.services\"/> takes care of "
+"<xref linkend=\"injection.services\" /> takes care of "
 "<literal>@PersistenceContext</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:251
 #, no-c-format
 msgid "Transaction Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:253
 #, no-c-format
 msgid ""
 "Weld delegates JTA activities to the container. The SPI provides a couple "
@@ -435,7 +391,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:258
 #, no-c-format
 msgid ""
 "Any <literal>javax.transaction.Synchronization</literal> implementation may "
@@ -445,7 +400,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:264
 #, no-c-format
 msgid ""
 "To make it easier to determine whether or not a transaction is currently "
@@ -455,30 +409,26 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:272
 #, fuzzy, no-c-format
 msgid "Resource Services"
 msgstr "Carga de recurso"
 
 #. Tag: para
-#: ri-spi.xml:274
 #, no-c-format
 msgid ""
 "The resolution of <literal>@Resource</literal> (for injection into managed "
 "beans) is delegated to the container. You must provide an implementation of "
 "<literal>ResourceServices</literal> which provides these operations. This "
 "service is not required if the implementation of <xref linkend=\"injection."
-"services\"/> takes care of <literal>@Resource</literal> injection."
+"services\" /> takes care of <literal>@Resource</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:283
 #, fuzzy, no-c-format
 msgid "Injection Services"
 msgstr "Carga de recurso"
 
 #. Tag: para
-#: ri-spi.xml:285
 #, no-c-format
 msgid ""
 "An integrator may wish to use <literal>InjectionServices</literal> to "
@@ -489,7 +439,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:291
 #, no-c-format
 msgid ""
 "<literal>InjectionServices</literal> provides a very simple contract, the "
@@ -500,7 +449,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:298
 #, no-c-format
 msgid ""
 "The <literal>InjectionContext</literal> can be used to discover additional "
@@ -511,13 +459,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:307
 #, fuzzy, no-c-format
 msgid "Security Services"
 msgstr "Carga de recurso"
 
 #. Tag: para
-#: ri-spi.xml:309
 #, no-c-format
 msgid ""
 "In order to obtain the <literal>Principal</literal> representing the current "
@@ -526,13 +472,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:317
 #, no-c-format
 msgid "Bean Validation Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:319
 #, no-c-format
 msgid ""
 "In order to obtain the default <literal>ValidatorFactory</literal> for the "
@@ -541,13 +485,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:327
 #, no-c-format
 msgid "Identifying the BDA being addressed"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:329
 #, no-c-format
 msgid ""
 "When a client makes a request to an application which uses Weld, the request "
@@ -558,43 +500,39 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:337
 #, no-c-format
 msgid ""
-"Most Servlet contains use a classloader-per-WAR, this may provide a good way "
+"Most Servlet contains use a classloader-per-war, this may provide a good way "
 "to identify the BDA in use for web requests."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:343
 #, no-c-format
 msgid ""
 "When Weld needs to identify the BDA, it will use one of these services, "
 "depending on what is servicing the request:"
 msgstr ""
 
-#. Tag: literal
-#: ri-spi.xml:350
+#. Tag: term
 #, no-c-format
-msgid "ServletServices.getBeanDeploymentArchive(ServletContext ctx)"
+msgid ""
+"<literal>ServletServices.getBeanDeploymentArchive(ServletContext ctx)</"
+"literal>"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:352
 #, no-c-format
 msgid ""
-"Identify the WAR in use. The <literal>ServletContext</literal> is provided "
+"Identify the war in use. The <literal>ServletContext</literal> is provided "
 "for additional context."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:362
 #, no-c-format
 msgid "The bean store"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:364
 #, no-c-format
 msgid ""
 "Weld uses a map like structure to store bean instances - <literal>org.jboss."
@@ -603,13 +541,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:372
 #, no-c-format
 msgid "The application context"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:374
 #, no-c-format
 msgid ""
 "Weld expects the Application Server or other container to provide the "
@@ -619,13 +555,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:383
 #, no-c-format
 msgid "Initialization and shutdown"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:384
 #, no-c-format
 msgid ""
 "The <literal>org.jboss.weld.bootstrap.api.Bootstrap</literal> interface "
@@ -636,7 +570,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:391
 #, no-c-format
 msgid ""
 "The bootstrap is split into phases, container initialization, bean "
@@ -647,7 +580,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:398
 #, no-c-format
 msgid ""
 "To initialize the container, you call <literal>Bootstrap.startInitialization"
@@ -659,7 +591,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:405
 #, no-c-format
 msgid ""
 "Having called <literal>startInitialization()</literal>, the "
@@ -668,7 +599,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:410
 #, no-c-format
 msgid ""
 "To deploy the discovered beans, call <literal>Bootstrap.deployBeans()</"
@@ -676,7 +606,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:414
 #, no-c-format
 msgid ""
 "To validate the deployed beans, call <literal>Bootstrap.validateBeans()</"
@@ -684,7 +613,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:418
 #, no-c-format
 msgid ""
 "To place the container into a state where it can service requests, call "
@@ -692,7 +620,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:423
 #, no-c-format
 msgid ""
 "To shutdown the container you call <literal>Bootstrap.shutdown()</literal>. "
@@ -700,13 +627,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:431
 #, no-c-format
 msgid "Resource loading"
 msgstr "Carga de recurso"
 
 #. Tag: para
-#: ri-spi.xml:433
 #, fuzzy, no-c-format
 msgid ""
 "Weld needs to load classes and resources from the classpath at various "
@@ -722,13 +647,11 @@
 "ResourceLoader</literal>:"
 
 #. Tag: title
-#: ri-spi.xml:445
 #, no-c-format
 msgid "The contract with the container"
 msgstr "El contrato con el contenedor"
 
 #. Tag: para
-#: ri-spi.xml:447
 #, fuzzy, no-c-format
 msgid ""
 "There are a number of requirements that Weld places on the container for "
@@ -739,13 +662,11 @@
 "API."
 
 #. Tag: term
-#: ri-spi.xml:454
 #, no-c-format
 msgid "Classloader isolation"
 msgstr "Aislamiento de classloader"
 
 #. Tag: para
-#: ri-spi.xml:458
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into an environment that supports deployment of "
@@ -758,13 +679,11 @@
 "través de la configuración del usuario."
 
 #. Tag: term
-#: ri-spi.xml:466
 #, no-c-format
 msgid "Servlet"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:470
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a Servlet environment you must register "
@@ -778,7 +697,6 @@
 "configuración de usuario, para cada aplicación Web Beans que utiliza Servlet."
 
 #. Tag: para
-#: ri-spi.xml:475
 #, no-c-format
 msgid ""
 "You must ensure that that <literal>WeldListener.contextInitialized()</"
@@ -787,13 +705,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:482
 #, no-c-format
-msgid "<term>JSF</term>"
+msgid "JSF"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:487
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -805,7 +721,6 @@
 "configuración de usuario, para cada aplicación Web Beans que utiliza Servlet."
 
 #. Tag: para
-#: ri-spi.xml:492
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -818,7 +733,6 @@
 "configuración de usuario, para cada aplicación Web Beans que utiliza Servlet."
 
 #. Tag: para
-#: ri-spi.xml:497
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -831,7 +745,6 @@
 "configuración de usuario, para cada aplicación Web Beans que utiliza Servlet."
 
 #. Tag: para
-#: ri-spi.xml:502
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -843,7 +756,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:509
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -853,7 +765,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:516 ri-spi.xml:562
 #, no-c-format
 msgid ""
 "There are a number of ways you can obtain the bean manager for the module. "
@@ -863,7 +774,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:523
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -878,19 +788,16 @@
 "configuración de usuario, para cada aplicación Web Beans que utiliza Servlet."
 
 #. Tag: para
-#: ri-spi.xml:531
 #, no-c-format
 msgid "Weld only supports JSF 1.2 and above."
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:538
 #, no-c-format
-msgid "<term>JSP</term>"
+msgid "JSP"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:543
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must register "
@@ -903,7 +810,6 @@
 "configuración de usuario, para cada aplicación Web Beans que utiliza Servlet."
 
 #. Tag: para
-#: ri-spi.xml:548
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -914,7 +820,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:555
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -924,20 +829,20 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:572
 #, no-c-format
 msgid "Session Bean Interceptor"
 msgstr "Intercepción de sesión de Bean"
 
 #. Tag: para
-#: ri-spi.xml:576
 #, fuzzy, no-c-format
 msgid ""
-"If you are integrating Weld into an EJB environment you must register "
-"<literal>org.jboss.weld.ejb.SessionBeanInterceptor</literal> as a EJB "
-"interceptor for all EJBs in the application, either automatically, or "
-"through user configuration, for each CDI application which uses enterprise "
-"beans."
+"If you are integrating Weld into an EJB environment you must register the "
+"<literal>aroundInvoke</literal> method of <literal>org.jboss.weld.ejb."
+"SessionBeanInterceptor</literal> as a EJB around-invoke interceptor for all "
+"EJBs in the application, either automatically, or through user "
+"configuration, for each CDI application which uses enterprise beans. If you "
+"are running in a EJB 3.1 environment, you should register this as an around-"
+"timeout interceptor as well."
 msgstr ""
 "Si está integrando los Web Beans en un entorno EJB debe registrar "
 "<literal>org.jboss.webbeans.ejb.SessionBeanInterceptor</literal> como un "
@@ -946,7 +851,6 @@
 "Beans empresariales."
 
 #. Tag: para
-#: ri-spi.xml:583
 #, no-c-format
 msgid ""
 "You must register the <literal>SessionBeanInterceptor</literal> as the inner "
@@ -954,13 +858,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:591
 #, fuzzy, no-c-format
 msgid "The <literal>weld-core.jar</literal>"
 msgstr "El <literal>webbeans-ri.jar</literal>"
 
 #. Tag: para
-#: ri-spi.xml:595
 #, no-c-format
 msgid ""
 "Weld can reside on an isolated classloader, or on a shared classloader. If "
@@ -972,7 +874,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:601
 #, no-c-format
 msgid ""
 "You can provide your own implementation of <literal>Singleton</literal> and "
@@ -981,7 +882,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:606
 #, no-c-format
 msgid ""
 "Weld also provides an implementation of Thread Context Classloader per "
@@ -989,13 +889,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:613
 #, no-c-format
 msgid "Binding the manager in JNDI"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:617
 #, no-c-format
 msgid ""
 "You should bind the bean manager for the bean deployment archive into JNDI "
@@ -1006,13 +904,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:627
 #, no-c-format
 msgid "Performing CDI injection on Java EE component classes"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:631
 #, no-c-format
 msgid ""
 "The CDI specification requires the container to provide injection into non-"
@@ -1024,7 +920,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:639
 #, no-c-format
 msgid ""
 "The CDI specification also requires that a <literal>ProcessInjectionTarget</"
@@ -1035,7 +930,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:646
 #, no-c-format
 msgid ""
 "To help the integrator, Weld provides <literal>WeldManager."
@@ -1043,36 +937,7 @@
 "<literal>InjectionTarget</literal> to use."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:651
-#, no-c-format
-msgid ""
-"<![CDATA[// Fire ProcessInjectionTarget, returning the InjectionTarget\n"
-"// to use\n"
-"InjectionTarget it = weldBeanManager.fireProcessInjectionTarget(clazz);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = beanManager.createCreationalContext(null);\n"
-"\n"
-"// Produce the instance, performing any constructor injection required\n"
-"Object instance = it.produce();\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
-
 #. Tag: para
-#: ri-spi.xml:652
 #, no-c-format
 msgid ""
 "The container may intersperse other operations between these calls. Further, "
@@ -1081,7 +946,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:656
 #, no-c-format
 msgid ""
 "When performing injections on EJBs you must use the Weld-defined SPI, "
@@ -1090,42 +954,6 @@
 "EJB."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:661
-#, no-c-format
-msgid ""
-"<![CDATA[// Obtain the EjbDescriptor for the EJB\n"
-"// You may choose to use this utility method to get the descriptor\n"
-"EjbDescriptor<?> ejbDescriptor = beanManager.getEjbDescriptor(ejbName);\n"
-"\n"
-"// Get an the Bean object\n"
-"Bean<?> bean = beanManager.getBean(ejbDescriptor);\n"
-"\n"
-"// Create the injection target\n"
-"InjectionTarget it = deploymentBeanManager.createInjectionTarget"
-"(ejbDescriptor);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = deploymentBeanManager.createCreationalContext"
-"(bean);\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// You may choose to have CDI call the post construct and pre destroy\n"
-"// lifecycle callbacks\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
-
 #, fuzzy
 #~ msgid ""
 #~ "Currently Web Beans only runs in JBoss AS 5; integrating the RI into "

Modified: doc/trunk/reference/es-ES/scopescontexts.po
===================================================================
--- doc/trunk/reference/es-ES/scopescontexts.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/scopescontexts.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: scopescontexts\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-20 11:45+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: scopescontexts.xml:5
 #, no-c-format
 msgid "Scopes and contexts"
 msgstr "Ámbitos y contextos"
 
 #. Tag: para
-#: scopescontexts.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "So far, we've seen a few examples of <emphasis>scope type annotations</"
@@ -38,13 +36,11 @@
 "Beans, un ámbito determina:"
 
 #. Tag: para
-#: scopescontexts.xml:16
 #, fuzzy, no-c-format
 msgid "When a new instance of any bean with that scope is created"
 msgstr "Cuándo se crea una nueva instancia de un Web Bean con ese ámbito"
 
 #. Tag: para
-#: scopescontexts.xml:19
 #, fuzzy, no-c-format
 msgid "When an existing instance of any bean with that scope is destroyed"
 msgstr ""
@@ -52,7 +48,6 @@
 "ámbito"
 
 #. Tag: para
-#: scopescontexts.xml:22
 #, fuzzy, no-c-format
 msgid ""
 "Which injected references refer to any instance of a bean with that scope"
@@ -60,7 +55,6 @@
 "Qué referencias se refieren a una instancia de un Web Bean con ese ámbito"
 
 #. Tag: para
-#: scopescontexts.xml:27
 #, fuzzy, no-c-format
 msgid ""
 "For example, if we have a session-scoped bean, <literal>CurrentUser</"
@@ -78,7 +72,6 @@
 "literal> en esa sesión, y se destruirá automáticamente al terminar la sesión."
 
 #. Tag: para
-#: scopescontexts.xml:35
 #, no-c-format
 msgid ""
 "JPA entities aren't a great fit for this model. Entities have their whole "
@@ -91,13 +84,11 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:45
 #, no-c-format
 msgid "Scope types"
 msgstr "Tipos de ámbito"
 
 #. Tag: para
-#: scopescontexts.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "CDI features an <emphasis>extensible context model</emphasis>. It's possible "
@@ -106,22 +97,7 @@
 "Web Beans ofrece un <emphasis>modelo contextual extensible</emphasis>. Es "
 "posible definir nuevos ámbitos creando una nueva anotación de tipo de ámbito:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ScopeType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"public @interface ClusterScoped {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"@ScopeType\n"
-"public @interface ClusterScoped {}]]>"
-
 #. Tag: para
-#: scopescontexts.xml:54
 #, fuzzy, no-c-format
 msgid ""
 "Of course, that's the easy part of the job. For this scope type to be "
@@ -137,7 +113,6 @@
 "suele ser una tarea muy técnica, únicamente destinada a desarrollo de marco."
 
 #. Tag: para
-#: scopescontexts.xml:61
 #, fuzzy, no-c-format
 msgid ""
 "We can apply a scope type annotation to a bean implementation class to "
@@ -146,67 +121,48 @@
 "Podemos aplicar un tipo de anotación de ámbito a una clase de implementación "
 "de Web Bean para especificar el ámbito del Web Bean:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-msgstr ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:67
 #, fuzzy, no-c-format
 msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr ""
 "Por lo general, se utilizará uno de los ámbitos incorporados de Web Beans."
 
 #. Tag: title
-#: scopescontexts.xml:72
 #, no-c-format
 msgid "Built-in scopes"
 msgstr "Ámbitos incorporados"
 
 #. Tag: para
-#: scopescontexts.xml:74
 #, fuzzy, no-c-format
 msgid "CDI defines four built-in scopes:"
 msgstr "Web Beans define cuatro ámbitos incorporados:"
 
-#. Tag: literal
-#: scopescontexts.xml:78
-#, no-c-format
-msgid "@RequestScoped"
-msgstr "@RequestScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@RequestScoped</literal>"
+msgstr "La anotación <literal>@New</literal>"
 
-#. Tag: literal
-#: scopescontexts.xml:81
-#, no-c-format
-msgid "@SessionScoped"
-msgstr "@SessionScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@SessionScoped</literal>"
+msgstr "La anotación <literal>@New</literal>"
 
-#. Tag: literal
-#: scopescontexts.xml:84
-#, no-c-format
-msgid "@ApplicationScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@ApplicationScoped</literal>"
 msgstr "@ApplicationScoped"
 
-#. Tag: literal
-#: scopescontexts.xml:87
-#, no-c-format
-msgid "@ConversationScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@ConversationScoped</literal>"
 msgstr "@ConversationScoped"
 
 #. Tag: para
-#: scopescontexts.xml:91
 #, fuzzy, no-c-format
 msgid "For a web application that uses CDI:"
 msgstr "Para una aplicación de red que utilice Web Beans:"
 
 #. Tag: para
-#: scopescontexts.xml:95
 #, no-c-format
 msgid ""
 "any servlet request has access to active request, session and application "
@@ -216,14 +172,12 @@
 "ámbitos de aplicación, y adicionalmente,"
 
 #. Tag: para
-#: scopescontexts.xml:100
 #, no-c-format
 msgid "any JSF request has access to an active conversation scope."
 msgstr ""
 "cualquier petición de JSF tiene acceso a un ámbito de conversación activo."
 
 #. Tag: para
-#: scopescontexts.xml:105
 #, no-c-format
 msgid ""
 "A CDI extension can implement support for the conversation scope in other "
@@ -231,49 +185,41 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:108
 #, no-c-format
 msgid "The request and application scopes are also active:"
 msgstr "Los ámbitos de petición y aplicación también están activos:"
 
 #. Tag: para
-#: scopescontexts.xml:112
 #, no-c-format
 msgid "during invocations of EJB remote methods,"
 msgstr "durante invocaciones de métodos remotos EJB,"
 
 #. Tag: para
-#: scopescontexts.xml:115
 #, fuzzy, no-c-format
 msgid "during invocations of EJB asynchronous methods,"
 msgstr "durante invocaciones de métodos remotos EJB,"
 
 #. Tag: para
-#: scopescontexts.xml:118
 #, no-c-format
 msgid "during EJB timeouts,"
 msgstr "durante pausas EJB,"
 
 #. Tag: para
-#: scopescontexts.xml:121
 #, fuzzy, no-c-format
 msgid "during message delivery to a message-driven bean,"
 msgstr "durante la entrega de mensaje a un bean controlado por mensajes, y"
 
 #. Tag: para
-#: scopescontexts.xml:124
 #, fuzzy, no-c-format
 msgid "during message delivery to a <literal>MessageListener</literal>, and"
 msgstr "durante la entrega de mensaje a un bean controlado por mensajes, y"
 
 #. Tag: para
-#: scopescontexts.xml:127
 #, no-c-format
 msgid "during web service invocations."
 msgstr "durante invocaciones de servicio de red."
 
 #. Tag: para
-#: scopescontexts.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "If the application tries to invoke a bean with a scope that does not have an "
@@ -286,7 +232,6 @@
 "ejecución."
 
 #. Tag: para
-#: scopescontexts.xml:136
 #, no-c-format
 msgid ""
 "Managed beans with scope <literal>@SessionScoped</literal> or "
@@ -295,7 +240,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:141
 #, no-c-format
 msgid ""
 "Three of the four built-in scopes should be extremely familiar to every Java "
@@ -307,13 +251,11 @@
 "explicarlos aquí. No obstante, uno de los ámbitos es nuevo."
 
 #. Tag: title
-#: scopescontexts.xml:149
 #, no-c-format
 msgid "The conversation scope"
 msgstr "El ámbito de conversación"
 
 #. Tag: para
-#: scopescontexts.xml:151
 #, fuzzy, no-c-format
 msgid ""
 "The conversation scope is a bit like the traditional session scope in that "
@@ -327,13 +269,11 @@
 "del ámbito de sesión, el ámbito de conversación:"
 
 #. Tag: para
-#: scopescontexts.xml:159
 #, no-c-format
 msgid "is demarcated explicitly by the application, and"
 msgstr "está demarcado explícitamente por la aplicación, y"
 
 #. Tag: para
-#: scopescontexts.xml:162
 #, no-c-format
 msgid ""
 "holds state associated with a particular web browser tab in a JSF "
@@ -342,13 +282,12 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:169
 #, fuzzy, no-c-format
 msgid ""
-"A conversation represents a task&#8212;a unit of work from the point of view "
-"of the user. The conversation context holds state associated with what the "
-"user is currently working on. If the user is doing multiple things at the "
-"same time, there are multiple conversations."
+"A conversation represents a task—a unit of work from the point of view of "
+"the user. The conversation context holds state associated with what the user "
+"is currently working on. If the user is doing multiple things at the same "
+"time, there are multiple conversations."
 msgstr ""
 "Una conversación representa una tarea, una unidad de trabajo desde el punto "
 "de vista del usuario. El contexto de conversación mantiene un estado "
@@ -357,7 +296,6 @@
 "conversaciones."
 
 #. Tag: para
-#: scopescontexts.xml:175
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context is active during any JSF request. Most "
@@ -372,13 +310,11 @@
 "larga</emphasis>."
 
 #. Tag: title
-#: scopescontexts.xml:182
 #, no-c-format
 msgid "Conversation demarcation"
 msgstr "Demarcación de conversación"
 
 #. Tag: para
-#: scopescontexts.xml:184
 #, fuzzy, no-c-format
 msgid ""
 "CDI provides a built-in bean for controlling the lifecycle of conversations "
@@ -388,14 +324,7 @@
 "conversaciones en una aplicación JSF. Dicho Web Bean puede obtenerse por "
 "inyección:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:189
-#, fuzzy, no-c-format
-msgid "@Inject Conversation conversation;"
-msgstr "@Current Conversation conversation;"
-
 #. Tag: para
-#: scopescontexts.xml:191
 #, no-c-format
 msgid ""
 "To promote the conversation associated with the current request to a long-"
@@ -411,7 +340,6 @@
 "literal>."
 
 #. Tag: para
-#: scopescontexts.xml:197
 #, fuzzy, no-c-format
 msgid ""
 "In the following example, a conversation-scoped bean controls the "
@@ -420,72 +348,7 @@
 "En el ejemplo a continuación, un Web Bean de conversación en ámbito controla "
 "la conversación con la que está asociada."
 
-#. Tag: programlisting
-#: scopescontexts.xml:201
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"   private Order order;\n"
-"   private @Inject Conversation conversation;\n"
-"   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
-"   \n"
-"   @Produces public Order getOrder() {\n"
-"      return order;\n"
-"   }\n"
-"\n"
-"   public Order createOrder() {\n"
-"      order = new Order();\n"
-"      conversation.begin();\n"
-"      return order;\n"
-"   }\n"
-"   \n"
-"   public void addLineItem(Product product, int quantity) {\n"
-"      order.add(new LineItem(product, quantity));\n"
-"   }\n"
-"\n"
-"   public void saveOrder(Order order) {\n"
-"      em.persist(order);\n"
-"      conversation.end();\n"
-"   }\n"
-"   \n"
-"   @Remove\n"
-"   public void destroy() {}\n"
-"}]]>"
-msgstr ""
-"@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"\n"
-"    private Order order;\n"
-"    private @Current Conversation conversation;\n"
-"    private @PersistenceContext(type=EXTENDED) EntityManager em;\n"
-"    \n"
-"    @Produces public Order getOrder() {\n"
-"        return order;\n"
-"    }\n"
-"\n"
-"    public Order createOrder() {\n"
-"        order = new Order();\n"
-"        conversation.begin();\n"
-"        return order;\n"
-"    }\n"
-"    \n"
-"    public void addLineItem(Product product, int quantity) {\n"
-"        order.add( new LineItem(product, quantity) );\n"
-"    }\n"
-"\n"
-"    public void saveOrder(Order order) {\n"
-"        em.persist(order);\n"
-"        conversation.end();\n"
-"    }\n"
-"    \n"
-"    @Remove\n"
-"    public void destroy() {}\n"
-"    \n"
-"}"
-
 #. Tag: para
-#: scopescontexts.xml:203
 #, fuzzy, no-c-format
 msgid ""
 "This bean is able to control its own lifecycle through use of the "
@@ -497,13 +360,11 @@
 "un ciclo de vida que depende totalmente de otro objeto."
 
 #. Tag: title
-#: scopescontexts.xml:211
 #, no-c-format
 msgid "Conversation propagation"
 msgstr "Propagación de conversación"
 
 #. Tag: para
-#: scopescontexts.xml:213
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context automatically propagates with any JSF faces request "
@@ -516,7 +377,6 @@
 "mediante un enlace."
 
 #. Tag: para
-#: scopescontexts.xml:218
 #, fuzzy, no-c-format
 msgid ""
 "We can force the conversation to propagate with a non-faces request by "
@@ -534,38 +394,16 @@
 "cual tiene el nombre de Web Beans <literal>conversation</literal>."
 
 #. Tag: para
-#: scopescontexts.xml:225
 #, no-c-format
 msgid "Therefore, the following link propagates the conversation:"
 msgstr "Por consiguiente, el siguiente enlace propaga la conversación:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:229
-#, no-c-format
-msgid ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-msgstr ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-
 #. Tag: para
-#: scopescontexts.xml:231
 #, no-c-format
 msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:235
-#, no-c-format
-msgid ""
-"<![CDATA[<h:link outcome=\"/addProduct.xhtml value=\"Add Product\">\n"
-"   <f:param name=\"cid\" value=\"#{conversation.id}\"/>\n"
-"</h:link>]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:238
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context propagates across redirects, making it very easy to "
@@ -581,21 +419,19 @@
 "automáticamente un parámetro a la URL de redirección."
 
 #. Tag: title
-#: scopescontexts.xml:248
 #, no-c-format
 msgid "Conversation timeout"
 msgstr "Pausa de conversación"
 
 #. Tag: para
-#: scopescontexts.xml:250
 #, fuzzy, no-c-format
 msgid ""
 "The container is permitted to destroy a conversation and all state held in "
 "its context at any time in order to conserve resources. A CDI implementation "
-"will normally do this on the basis of some kind of timeout&#8212;though this "
-"is not required by the specification. The timeout is the period of "
-"inactivity before the conversation is destroyed (as opposed to the amount of "
-"time the conversation is active)."
+"will normally do this on the basis of some kind of timeout—though this is "
+"not required by the specification. The timeout is the period of inactivity "
+"before the conversation is destroyed (as opposed to the amount of time the "
+"conversation is active)."
 msgstr ""
 "Con el fin de preservar recursos, el administrador de Web Bean puede "
 "destruir una conversación y todo el estado en su contexto en cualquier "
@@ -605,7 +441,6 @@
 "la destrucción de la conversación."
 
 #. Tag: para
-#: scopescontexts.xml:257
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Conversation</literal> object provides a method to set the "
@@ -616,20 +451,12 @@
 "configurar el tiempo de espera. Se trata de una ayuda para el administrador "
 "de Web Bean quién tiene la libertad de pasar por alto la configuración."
 
-#. Tag: programlisting
-#: scopescontexts.xml:262
-#, no-c-format
-msgid "conversation.setTimeout(timeoutInMillis);"
-msgstr "conversation.setTimeout(timeoutInMillis);"
-
 #. Tag: title
-#: scopescontexts.xml:269
 #, fuzzy, no-c-format
 msgid "The singleton pseudo-scope"
 msgstr "El seudo ámbito dependiente"
 
 #. Tag: para
-#: scopescontexts.xml:271
 #, fuzzy, no-c-format
 msgid ""
 "In addition to the four built-in scopes, CDI also supports two "
@@ -642,7 +469,6 @@
 "Bean que no declare explícitamente un tipo de ámbito."
 
 #. Tag: para
-#: scopescontexts.xml:277
 #, no-c-format
 msgid ""
 "Unlike the other scopes, which belong to the package <literal>javax."
@@ -651,7 +477,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:283
 #, no-c-format
 msgid ""
 "You can guess what \"singleton\" means here. It means a bean that is "
@@ -666,7 +491,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:292
 #, no-c-format
 msgid ""
 "Now, if the singleton instance is a simple, immutable, serializable object "
@@ -677,7 +501,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:298
 #, no-c-format
 msgid ""
 "There are several ways to ensure that the singleton bean remains a singleton "
@@ -685,7 +508,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:302
 #, no-c-format
 msgid ""
 "have the singleton bean implement <literal>writeResolve()</literal> and "
@@ -694,7 +516,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:308
 #, no-c-format
 msgid ""
 "make sure the client keeps only a transient reference to the singleton bean, "
@@ -702,7 +523,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:313
 #, no-c-format
 msgid ""
 "give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
@@ -710,7 +530,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:320
 #, no-c-format
 msgid ""
 "A fourth, better solution is to instead use <literal>@ApplicationScoped</"
@@ -719,13 +538,11 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:326
 #, no-c-format
 msgid "The dependent pseudo-scope"
 msgstr "El seudo ámbito dependiente"
 
 #. Tag: para
-#: scopescontexts.xml:328
 #, fuzzy, no-c-format
 msgid ""
 "Finally, CDI features the so-called <emphasis>dependent pseudo-scope</"
@@ -737,7 +554,6 @@
 "Bean que no declare explícitamente un tipo de ámbito."
 
 #. Tag: para
-#: scopescontexts.xml:333
 #, fuzzy, no-c-format
 msgid ""
 "For example, this bean has the scope type <literal>@Dependent</literal>:"
@@ -745,14 +561,7 @@
 "Por ejemplo, este Web Bean tiene el ámbito de tipo <literal>@Dependent</"
 "literal>:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:337
-#, no-c-format
-msgid "<![CDATA[public class Calculator { ... }]]>"
-msgstr "<![CDATA[public class Calculator { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:339
 #, no-c-format
 msgid ""
 "An instance of a dependent bean is never shared between different clients or "
@@ -763,7 +572,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:345
 #, no-c-format
 msgid ""
 "If a Unified EL expression refers to a dependent bean by EL name, an "
@@ -772,7 +580,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:351
 #, no-c-format
 msgid ""
 "If you need to access a bean directly by EL name in a JSF page, you probably "
@@ -787,7 +594,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:361
 #, no-c-format
 msgid ""
 "Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
@@ -795,7 +601,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:366
 #, fuzzy, no-c-format
 msgid ""
 "CDI makes it easy to obtain a dependent instance of a bean, even if the bean "
@@ -806,27 +611,18 @@
 "Bean con algún otro tipo de ámbito."
 
 #. Tag: title
-#: scopescontexts.xml:374
 #, fuzzy, no-c-format
 msgid "The <literal>@New</literal> qualifier"
 msgstr "La anotación <literal>@New</literal>"
 
 #. Tag: para
-#: scopescontexts.xml:376
 #, no-c-format
 msgid ""
 "The built-in qualifier <literal>@New</literal> allows us to obtain a "
 "dependent object of a specified class."
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:380
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
-msgstr "<![CDATA[@New Calculator calculator;]]>"
-
 #. Tag: para
-#: scopescontexts.xml:382
 #, no-c-format
 msgid ""
 "The class must be a valid managed bean or session bean, but need not be an "
@@ -834,7 +630,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:384
 #, fuzzy, no-c-format
 msgid ""
 "This works even if <literal>Calculator</literal> is <emphasis>already</"
@@ -843,18 +638,7 @@
 "Esto es cierto incluso si <literal>Calculator</literal> está <emphasis>ya</"
 "emphasis> declarado con un tipo de ámbito diferente, por ejemplo:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-msgstr ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:391
 #, no-c-format
 msgid ""
 "So the following injected attributes each get a different instance of "
@@ -863,24 +647,7 @@
 "Por lo tanto cada uno de los siguientes atributos inyectados obtiene una "
 "instancia diferente a <literal>Calculator</literal>:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:395
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class PaymentCalc {\n"
-"   @Inject Calculator calculator;\n"
-"   @Inject @New Calculator newCalculator;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class PaymentCalc {\n"
-"\n"
-"    @Current Calculator calculator;\n"
-"    @New Calculator newCalculator;\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: scopescontexts.xml:397
 #, no-c-format
 msgid ""
 "The <literal>calculator</literal> field has a conversation-scoped instance "
@@ -895,7 +662,6 @@
 "propietario de <literal>PaymentCalc</literal>."
 
 #. Tag: para
-#: scopescontexts.xml:403
 #, no-c-format
 msgid ""
 "This feature is particularly useful with producer methods, as we'll see in "
@@ -904,7 +670,136 @@
 "La función es particularmente útil con métodos de productor, así como "
 "veremos en el siguiente capítulo."
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@ScopeType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD})\n"
+#~ "public @interface ClusterScoped {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD})\n"
+#~ "@ScopeType\n"
+#~ "public @interface ClusterScoped {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ClusterScoped\n"
+#~ "public class SecondLevelCache { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ClusterScoped\n"
+#~ "public class SecondLevelCache { ... }]]>"
+
+#~ msgid "@RequestScoped"
+#~ msgstr "@RequestScoped"
+
+#~ msgid "@SessionScoped"
+#~ msgstr "@SessionScoped"
+
+#, fuzzy
+#~ msgid "@Inject Conversation conversation;"
+#~ msgstr "@Current Conversation conversation;"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ConversationScoped @Stateful\n"
+#~ "public class OrderBuilder {\n"
+#~ "   private Order order;\n"
+#~ "   private @Inject Conversation conversation;\n"
+#~ "   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
+#~ "   \n"
+#~ "   @Produces public Order getOrder() {\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public Order createOrder() {\n"
+#~ "      order = new Order();\n"
+#~ "      conversation.begin();\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void addLineItem(Product product, int quantity) {\n"
+#~ "      order.add(new LineItem(product, quantity));\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public void saveOrder(Order order) {\n"
+#~ "      em.persist(order);\n"
+#~ "      conversation.end();\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Remove\n"
+#~ "   public void destroy() {}\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@ConversationScoped @Stateful\n"
+#~ "public class OrderBuilder {\n"
+#~ "\n"
+#~ "    private Order order;\n"
+#~ "    private @Current Conversation conversation;\n"
+#~ "    private @PersistenceContext(type=EXTENDED) EntityManager em;\n"
+#~ "    \n"
+#~ "    @Produces public Order getOrder() {\n"
+#~ "        return order;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "    public Order createOrder() {\n"
+#~ "        order = new Order();\n"
+#~ "        conversation.begin();\n"
+#~ "        return order;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void addLineItem(Product product, int quantity) {\n"
+#~ "        order.add( new LineItem(product, quantity) );\n"
+#~ "    }\n"
+#~ "\n"
+#~ "    public void saveOrder(Order order) {\n"
+#~ "        em.persist(order);\n"
+#~ "        conversation.end();\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    @Remove\n"
+#~ "    public void destroy() {}\n"
+#~ "    \n"
+#~ "}"
+
+#~ msgid ""
+#~ "<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</"
+#~ "a>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</"
+#~ "a>]]>"
+
+#~ msgid "conversation.setTimeout(timeoutInMillis);"
+#~ msgstr "conversation.setTimeout(timeoutInMillis);"
+
+#~ msgid "<![CDATA[public class Calculator { ... }]]>"
+#~ msgstr "<![CDATA[public class Calculator { ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
+#~ msgstr "<![CDATA[@New Calculator calculator;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ConversationScoped\n"
+#~ "public class Calculator { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ConversationScoped\n"
+#~ "public class Calculator { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class PaymentCalc {\n"
+#~ "   @Inject Calculator calculator;\n"
+#~ "   @Inject @New Calculator newCalculator;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class PaymentCalc {\n"
+#~ "\n"
+#~ "    @Current Calculator calculator;\n"
+#~ "    @New Calculator newCalculator;\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "holds state associated with a particular web browser tab in a JSF "
 #~ "application."
 #~ msgstr ""

Modified: doc/trunk/reference/es-ES/specialization.po
===================================================================
--- doc/trunk/reference/es-ES/specialization.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/specialization.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: specialization\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-20 11:16+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: specialization.xml:5
 #, no-c-format
 msgid "Specialization, inheritance and alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:7
 #, no-c-format
 msgid ""
 "When you first start developing with CDI, you'll likely be dealing only with "
@@ -38,7 +36,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:16
 #, no-c-format
 msgid ""
 "The CDI specification recognizes two distinct scenarios in which one bean "
@@ -46,7 +43,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:23
 #, no-c-format
 msgid ""
 "The second bean <emphasis>specializes</emphasis> the first bean in certain "
@@ -55,7 +51,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:29
 #, no-c-format
 msgid ""
 "The second bean is simply reusing the Java implementation, and otherwise "
@@ -64,7 +59,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:37
 #, no-c-format
 msgid ""
 "The second case is the default assumed by CDI. It's possible to have two "
@@ -74,7 +68,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:43
 #, no-c-format
 msgid ""
 "The first case is the exception, and also requires more care. In any given "
@@ -86,13 +79,11 @@
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:51
 #, no-c-format
 msgid "Using alternative stereotypes"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:53
 #, fuzzy, no-c-format
 msgid ""
 "CDI lets you <emphasis>override</emphasis> the implementation of a bean type "
@@ -106,23 +97,7 @@
 "provee una implementación del <literal>Procesador de Pago</literal> de API "
 "en producción:"
 
-#. Tag: programlisting
-#: specialization.xml:59
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DefaultPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless\n"
-"public class CreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:61
 #, fuzzy, no-c-format
 msgid ""
 "But in our staging environment, we don't really want to submit payments to "
@@ -132,46 +107,12 @@
 "Pero en nuestro entorno, omitimos esa implementación de "
 "<literal>PaymentProcessor</literal> con un Web Bean diferente:"
 
-#. Tag: programlisting
-#: specialization.xml:66
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless\n"
-"public class CreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:68
 #, no-c-format
-msgid "<para>or</para>"
+msgid "or"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:70
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      extends DefaultPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@Stateless @Staging @Specializes\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        extends CreditCardPaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:72
 #, no-c-format
 msgid ""
 "We've already seen how we can enable this alternative by listing its class "
@@ -179,7 +120,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:77
 #, no-c-format
 msgid ""
 "But suppose we have many alternatives in the staging environment. It would "
@@ -189,67 +129,21 @@
 "this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:84
-#, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Staging {}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:86
 #, no-c-format
 msgid ""
 "Then we replace the <literal>@Alternative</literal> annotation on our bean "
 "with <literal>@Staging</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:90
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Staging\n"
-"public class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless @Staging\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:92
 #, no-c-format
 msgid ""
 "Finally, we activate the <literal>@Staging</literal> stereotype in the "
 "<literal>beans.xml</literal> descriptor:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:96
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <stereotype>org.mycompany.myapp.Staging</stereotype>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:98
 #, no-c-format
 msgid ""
 "Now, no matter how many staging beans we have, they will all be enabled at "
@@ -257,13 +151,11 @@
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:105
 #, no-c-format
 msgid "A minor problem with alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:107
 #, no-c-format
 msgid ""
 "When we enable an alternative, does that mean the default implementation is "
@@ -272,15 +164,7 @@
 "not, you could still inject the default implementation."
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:113
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @LargeTransaction PaymentProcessor paymentProcessor;]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:115
 #, no-c-format
 msgid ""
 "So we haven't completely replaced the default implementation in this "
@@ -293,7 +177,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "CDI provides a special feature, called <emphasis>specialization</emphasis>, "
@@ -308,13 +191,11 @@
 "proporciona."
 
 #. Tag: title
-#: specialization.xml:132
 #, no-c-format
 msgid "Using specialization"
 msgstr "Uso de Specialization"
 
 #. Tag: para
-#: specialization.xml:134
 #, no-c-format
 msgid ""
 "When the goal is to replace one bean implementation with a second, to help "
@@ -322,13 +203,11 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:141
 #, no-c-format
 msgid "directly extend the bean class of the second bean, or"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:146
 #, no-c-format
 msgid ""
 "directly override the producer method, in the case that the second bean is a "
@@ -336,7 +215,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:152
 #, fuzzy, no-c-format
 msgid ""
 "explicitly declare that it <emphasis>specializes</emphasis> the second bean:"
@@ -344,24 +222,7 @@
 "Decimos que el Web Bean de prioridad más alta<emphasis>especializa</"
 "emphasis> su superclase."
 
-#. Tag: programlisting
-#: specialization.xml:154
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Specializes\n"
-"public class MockCreditCardPaymentProcessor \n"
-"      extends CreditCardPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@Stateless @Staging @Specializes\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        extends CreditCardPaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:156
 #, no-c-format
 msgid ""
 "When an enabled bean specializes another bean, the other bean is never "
@@ -370,7 +231,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:161
 #, no-c-format
 msgid ""
 "So why does specialization work, and what does it have to do with "
@@ -378,7 +238,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:165
 #, no-c-format
 msgid ""
 "Since we're informing the container that our alternative bean is meant to "
@@ -390,7 +249,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:172
 #, no-c-format
 msgid ""
 "Furthermore, if the default implementation declares a bean EL name using "
@@ -398,6 +256,75 @@
 "alternative bean."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DefaultPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      extends DefaultPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Stateless @Staging @Specializes\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        extends CreditCardPaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Staging\n"
+#~ "public class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless @Staging\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative @Specializes\n"
+#~ "public class MockCreditCardPaymentProcessor \n"
+#~ "      extends CreditCardPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Stateless @Staging @Specializes\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        extends CreditCardPaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
 #~ msgid "Specialization"
 #~ msgstr "Specialization"
 

Modified: doc/trunk/reference/es-ES/stereotypes.po
===================================================================
--- doc/trunk/reference/es-ES/stereotypes.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/stereotypes.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: stereotypes\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-20 11:23+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,19 +17,16 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: stereotypes.xml:5
 #, no-c-format
 msgid "Stereotypes"
 msgstr "Estereotipos"
 
 #. Tag: para
-#: stereotypes.xml:7
 #, no-c-format
 msgid "The CDI specification defines a stereotype as follows:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:11
 #, fuzzy, no-c-format
 msgid ""
 "In many systems, use of architectural patterns produces a set of recurring "
@@ -43,31 +40,26 @@
 "Beans con ese rol en un lugar central."
 
 #. Tag: para
-#: stereotypes.xml:17
 #, no-c-format
 msgid "A stereotype encapsulates any combination of:"
 msgstr "Un estereotipo encapsula cualquier combinación de:"
 
 #. Tag: para
-#: stereotypes.xml:21
 #, fuzzy, no-c-format
 msgid "a default scope, and"
 msgstr "un tipo de ámbito predeterminado,"
 
 #. Tag: para
-#: stereotypes.xml:24
 #, fuzzy, no-c-format
 msgid "a set of interceptor bindings."
 msgstr "una serie de anotaciones de enlace del interceptor."
 
 #. Tag: para
-#: stereotypes.xml:28
 #, no-c-format
 msgid "A stereotype may also specify that:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:34
 #, fuzzy, no-c-format
 msgid "all beans with the stereotype have defaulted bean EL names, or that"
 msgstr ""
@@ -75,13 +67,11 @@
 "estereotipo tengan nombres de Web Beans predeterminados."
 
 #. Tag: para
-#: stereotypes.xml:37
 #, no-c-format
 msgid "all beans with the stereotype are alternatives."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:41
 #, no-c-format
 msgid ""
 "A bean may declare zero, one or multiple stereotypes. Stereotype annotations "
@@ -89,7 +79,6 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype is an annotation, annotated <literal>@Stereotype</literal>, "
@@ -99,39 +88,12 @@
 "Un estereotipo es un tipo de anotación Java. Dicho estereotipo identifica "
 "clases de acción en algún marco MVC:"
 
-#. Tag: programlisting
-#: stereotypes.xml:53
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"...\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:55
 #, fuzzy, no-c-format
 msgid "We use the stereotype by applying the annotation to a bean."
 msgstr "Utilizamos el estereotipo aplicando la anotación al Web Bean."
 
-#. Tag: programlisting
-#: stereotypes.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-
 #. Tag: para
-#: stereotypes.xml:61
 #, no-c-format
 msgid ""
 "Of course, we need to apply some other annotations to our stereotype or else "
@@ -139,13 +101,11 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:66
 #, fuzzy, no-c-format
 msgid "Default scope for a stereotype"
 msgstr "El ámbito predeterminado y el tipo de despliegue para un estereotipo"
 
 #. Tag: para
-#: stereotypes.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype may specify a default scope for beans annotated with the "
@@ -154,41 +114,14 @@
 "Un estereotipo puede también especificar que todos los Web Beans con el "
 "estereotipo tengan nombres de Web Beans predeterminados."
 
-#. Tag: programlisting
-#: stereotypes.xml:72
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:74
 #, fuzzy, no-c-format
 msgid "A particular action may still override this default if necessary:"
 msgstr ""
 "Obviamente, una acción particular aún puede omitir estos valores "
 "predeterminados si es necesario:"
 
-#. Tag: programlisting
-#: stereotypes.xml:78
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Dependent @Action \n"
-"public class DependentScopedLoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Dependent @Mock @Action \n"
-"public class MockLoginAction { ... }]]>"
-
 #. Tag: para
-#: stereotypes.xml:80
 #, no-c-format
 msgid ""
 "Naturally, overriding a single default isn't much use. But remember, "
@@ -196,13 +129,11 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:88
 #, no-c-format
 msgid "Interceptor bindings for stereotypes"
 msgstr "Enlaces de interceptor para esterotipos"
 
 #. Tag: para
-#: stereotypes.xml:90
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype may specify a set of interceptor bindings to be inherited by "
@@ -211,29 +142,7 @@
 "Un estereotipo puede especificar una serie de enlaces de interceptor para "
 "que sean heredados por todos los Web Beans con ese estereotipo."
 
-#. Tag: programlisting
-#: stereotypes.xml:94
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@WebTier\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "This helps us get technical concerns, like transactions and security, even "
@@ -243,13 +152,11 @@
 "negocios!"
 
 #. Tag: title
-#: stereotypes.xml:103
 #, no-c-format
 msgid "Name defaulting with stereotypes"
 msgstr "Predeterminación de nombre con estereotipos"
 
 #. Tag: para
-#: stereotypes.xml:105
 #, fuzzy, no-c-format
 msgid ""
 "We can specify that all beans with a certain stereotype have a defaulted EL "
@@ -262,31 +169,7 @@
 "páginas JSP, así que son un caso de uso perfecto para esta función. Todo lo "
 "que necesitamos es agregar una anotación vacía a <literal>@Named</literal>."
 
-#. Tag: programlisting
-#: stereotypes.xml:110
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@WebTier\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:112
 #, fuzzy, no-c-format
 msgid ""
 "Now, the <literal>LoginAction</literal> bean will have the defaulted name "
@@ -296,13 +179,11 @@
 "literal>."
 
 #. Tag: title
-#: stereotypes.xml:119
 #, fuzzy, no-c-format
 msgid "Alternative stereotypes"
 msgstr "Estereotipos estándar"
 
 #. Tag: para
-#: stereotypes.xml:121
 #, no-c-format
 msgid ""
 "A stereotype can indicate that all beans to which it is applied are "
@@ -310,47 +191,19 @@
 "emphasis> lets us classify beans by deployment scenario."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:126
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Mock {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:128
 #, no-c-format
 msgid ""
 "We can apply an alternative stereotype to a whole set of beans, and activate "
 "them all with one line of code in <literal>beans.xml</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:133
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Mock\n"
-"public class MockLoginAction extends LoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-
 #. Tag: title
-#: stereotypes.xml:141
 #, fuzzy, no-c-format
 msgid "Stereotype stacking"
 msgstr "Estereotipos"
 
 #. Tag: para
-#: stereotypes.xml:143
 #, no-c-format
 msgid ""
 "This may blow your mind a bit, but stereotypes may declare other "
@@ -361,39 +214,18 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:150
 #, no-c-format
 msgid ""
 "Here's an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:155
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Auditable\n"
-"@Action\n"
-"@Stereotype\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface AuditableAction {}]]>"
-msgstr ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {} ]]>"
-
 #. Tag: title
-#: stereotypes.xml:160
 #, fuzzy, no-c-format
 msgid "Built-in stereotypes"
 msgstr "Estereotipos estándar"
 
 #. Tag: para
-#: stereotypes.xml:162
 #, fuzzy, no-c-format
 msgid ""
 "We've already met two standard stereotypes defined by the CDI specification: "
@@ -403,33 +235,13 @@
 "Web Beans: <literal>@Interceptor</literal> y <literal>@Decorator</literal>."
 
 #. Tag: para
-#: stereotypes.xml:167
 #, no-c-format
 msgid ""
 "CDI defines one further standard stereotype, <literal>@Model</literal>, "
 "which is expected to be used frequently in web applications:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:172
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {}]]>"
-msgstr ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {} ]]>"
-
 #. Tag: para
-#: stereotypes.xml:174
 #, fuzzy, no-c-format
 msgid ""
 "Instead of using JSF managed beans, just annotate a bean <literal>@Model</"
@@ -439,6 +251,140 @@
 "beans JSF administrados, solamente anote un Web Bean <literal>@Model</"
 "literal>, y utilícelo directamente en su página JSF."
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "...\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Dependent @Action \n"
+#~ "public class DependentScopedLoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Dependent @Mock @Action \n"
+#~ "public class MockLoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@WebTier\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Named\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Named\n"
+#~ "@WebTier\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Mock {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Mock\n"
+#~ "public class MockLoginAction extends LoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Auditable\n"
+#~ "@Action\n"
+#~ "@Stereotype\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface AuditableAction {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {} ]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {} ]]>"
+
 #~ msgid "According to the Web Beans specification:"
 #~ msgstr "Según la especificación de Web Beans:"
 

Modified: doc/trunk/reference/es-ES/viewlayers.po
===================================================================
--- doc/trunk/reference/es-ES/viewlayers.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/viewlayers.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-04-19 20:36+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,19 +15,16 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: viewlayers.xml:5
 #, no-c-format
 msgid "Alternative view layers"
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:8
 #, no-c-format
 msgid "Wicket CDI integration"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:10
 #, no-c-format
 msgid ""
 "Weld provides integration between the Apache Wicket web framework and CDI. "
@@ -37,7 +34,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:16
 #, no-c-format
 msgid ""
 "This section describes some of the utilities provided by the Wicket "
@@ -45,13 +41,11 @@
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:22
 #, no-c-format
 msgid "The <literal>WebApplication</literal> class"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:24
 #, no-c-format
 msgid ""
 "Each wicket application must have a <literal>WebApplication</literal> "
@@ -61,7 +55,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:31
 #, no-c-format
 msgid ""
 "If you would prefer not to subclass <literal>WeldApplication</literal>, you "
@@ -71,31 +64,16 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:38
 #, no-c-format
 msgid "For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: viewlayers.xml:41
-#, no-c-format
-msgid ""
-"<![CDATA[public class SampleApplication extends WeldApplication {\n"
-"   @Override\n"
-"   public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: viewlayers.xml:45
 #, no-c-format
 msgid "Conversations with Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:46
 #, no-c-format
 msgid ""
 "Wicket can also take advantage of the conversation scope from CDI, provided "
@@ -103,7 +81,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:52
 #, no-c-format
 msgid ""
 "Setting up the conversation context at the beginning of a Wicket request, "
@@ -111,7 +88,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:58
 #, no-c-format
 msgid ""
 "Storing the id of any long-running conversation in Wicket's metadata when "
@@ -119,7 +95,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:64
 #, no-c-format
 msgid ""
 "Activating the correct long-running conversation based upon which page is "
@@ -127,7 +102,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:69
 #, no-c-format
 msgid ""
 "Propagating the conversation context for any long-running conversation to "
@@ -135,13 +109,11 @@
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:76
 #, no-c-format
 msgid "Starting and stopping conversations in Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:77
 #, no-c-format
 msgid ""
 "As in JSF applications, a conversation <emphasis>always</emphasis> exists "
@@ -153,27 +125,12 @@
 "</literal> methods:"
 msgstr ""
 
-#. Tag: programlisting
-#: viewlayers.xml:86
-#, no-c-format
-msgid ""
-"<![CDATA[private @Inject Conversation conversation;\n"
-"...\n"
-"// begin a conversation\n"
-"conversation.begin();\n"
-"...\n"
-"// end a conversation\n"
-"conversation.end();]]>"
-msgstr ""
-
 #. Tag: title
-#: viewlayers.xml:91
 #, no-c-format
 msgid "Long running conversation propagation in Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:92
 #, no-c-format
 msgid ""
 "When a conversation is marked as long-running, the id of that conversation "

Modified: doc/trunk/reference/es-ES/weldexamples.po
===================================================================
--- doc/trunk/reference/es-ES/weldexamples.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/weldexamples.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: weldexamples.xml:5
 #, no-c-format
 msgid "Diving into the Weld examples"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:7
 #, no-c-format
 msgid ""
 "It's time to pull the covers back and dive into the internals of Weld "
@@ -29,13 +27,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:13
 #, no-c-format
 msgid "The numberguess example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:15
 #, no-c-format
 msgid ""
 "In the numberguess application you get 10 attempts to guess a number between "
@@ -44,16 +40,14 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:20
 #, no-c-format
 msgid ""
 "The numberguess example is comprised of a number of beans, configuration "
-"files and Facelets (JSF) views, packaged as a WAR module. Let's start by "
+"files and Facelets (JSF) views, packaged as a war module. Let's start by "
 "examining the configuration files."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:25
 #, no-c-format
 msgid ""
 "All the configuration files for this example are located in <literal>WEB-INF/"
@@ -64,21 +58,7 @@
 "to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:33
-#, no-c-format
-msgid ""
-"<![CDATA[<faces-config version=\"2.0\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd\">\n"
-"</faces-config>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:35
 #, no-c-format
 msgid ""
 "There's also an empty <literal>beans.xml</literal> file, which tells the "
@@ -87,212 +67,120 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:40
 #, no-c-format
 msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:42
+#. Tag: para
 #, no-c-format
+msgid "Enable and initialize the JSF servlet"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"faces.servlet\" coords=\"10\"/> "
-"<area id=\"faces.servlet.mapping\" coords=\"16\"/> <area id=\"faces.default."
-"suffix\" coords=\"21\"/> <area id=\"session.timeout\" coords=\"26\"/> </"
-"areaspec> <programlisting role=\"XML\"><![CDATA[<web-app version=\"2.5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n"
-"   \n"
-"   <display-name>weld-jsf-numberguess-war</display-name>\n"
-"   <description>Weld JSF numberguess example (WAR)</description>\n"
-"\n"
-"   <servlet>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>\n"
-"      <load-on-startup>1</load-on-startup>\n"
-"   </servlet>\n"
-"\n"
-"   <servlet-mapping>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <url-pattern>*.jsf</url-pattern>\n"
-"   </servlet-mapping>\n"
-"   \n"
-"   <context-param>\n"
-"      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>\n"
-"      <param-value>.xhtml</param-value>\n"
-"   </context-param>\n"
-"\n"
-"   <session-config>\n"
-"      <session-timeout>10</session-timeout>\n"
-"   </session-config>\n"
-"\n"
-"</web-app>]]></programlisting> <calloutlist> <callout arearefs=\"faces."
-"servlet\"> <para> Enable and initialize the JSF servlet </para> </callout> "
-"<callout arearefs=\"faces.servlet.mapping\"> <para> Configure requests for "
-"URLs ending in <literal>.jsf</literal> to be handled by JSF </para> </"
-"callout> <callout arearefs=\"faces.default.suffix\"> <para> Tell JSF that we "
-"will be giving our JSF views (Facelets templates) an extension of <literal>."
-"xhtml</literal> </para> </callout> <callout arearefs=\"session.timeout\"> "
-"<para> Configure a session timeout of 10 minutes </para> </callout> </"
-"calloutlist> </programlistingco> <note> <para> This demo uses JSF 2 as the "
-"view framework, but you can use Weld with any servlet-based web framework, "
-"such as JSF 1.2 or Wicket. </para> </note> <para> Let's take a look at the "
-"main JSF view, <literal>src/main/webapp/home.xhtml</literal>. </para> "
-"<programlistingco> <areaspec> <area id=\"template\" coords=\"8\"/> <area id="
-"\"statusMessages\" coords=\"12\"/> <area id=\"instructions\" coords=\"20\"/> "
-"<area id=\"guess\" coords=\"27\"/> <area id=\"validator\" coords=\"29\"/> "
-"<area id=\"submit\" coords=\"30\"/> </areaspec> <programlisting role=\"XML"
-"\"><![CDATA[<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN"
-"\"\n"
-"   \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
-"<html xmlns=\"http://www.w3.org/1999/xhtml\"\n"
-"   xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n"
-"   xmlns:h=\"http://java.sun.com/jsf/html\"\n"
-"   xmlns:f=\"http://java.sun.com/jsf/core\">\n"
-"\n"
-"   <ui:composition template=\"/template.xhtml\">\n"
-"      <ui:define name=\"content\">\n"
-"         <h1>Guess a number...</h1>\n"
-"         <h:form id=\"numberGuess\">\n"
-"            <div style=\"color: red\">\n"
-"               <h:messages id=\"messages\" globalOnly=\"false\"/>\n"
-"               <h:outputText id=\"Higher\" value=\"Higher!\"\n"
-"                  rendered=\"#{game.number gt game.guess and game.guess ne 0}"
-"\"/>\n"
-"               <h:outputText id=\"Lower\" value=\"Lower!\"\n"
-"                  rendered=\"#{game.number lt game.guess and game.guess ne 0}"
-"\"/>\n"
-"            </div>\n"
-"    \n"
-"            <div>\n"
-"               I'm thinking of a number between #{game.smallest} and #{game."
-"biggest}.\n"
-"               You have #{game.remainingGuesses} guesses remaining.\n"
-"            </div>\n"
-"       \n"
-"            <div>\n"
-"               Your guess: \n"
-"               <h:inputText id=\"inputGuess\" value=\"#{game.guess}\"\n"
-"                  size=\"3\" required=\"true\" disabled=\"#{game.number eq "
-"game.guess}\"\n"
-"                  validator=\"#{game.validateNumberRange}\"/>\n"
-"               <h:commandButton id=\"guessButton\" value=\"Guess\" \n"
-"                  action=\"#{game.check}\" disabled=\"#{game.number eq game."
-"guess}\"/>\n"
-"            </div>\n"
-"            <div>\n"
-"              <h:commandButton id=\"restartButton\" value=\"Reset\" action="
-"\"#{game.reset}\" immediate=\"true\"/>\n"
-"            </div>\n"
-"         </h:form>\n"
-"      </ui:define>\n"
-"   </ui:composition>\n"
-"</html>]]></programlisting> <calloutlist> <callout arearefs=\"template\"> "
-"<para> Facelets is the built-in templating language for JSF. Here we are "
-"wrapping our page in a template which defines the layout. </para> </callout> "
-"<callout arearefs=\"statusMessages\"> <para> There are a number of messages "
-"which can be sent to the user, \"Higher!\", \"Lower!\" and \"Correct!\" </"
-"para> </callout> <callout arearefs=\"instructions\"> <para> As the user "
-"guesses, the range of numbers they can guess gets smaller - this sentence "
-"changes to make sure they know the number range of a valid guess. </para> </"
-"callout> <callout arearefs=\"guess\"> <para> This input field is bound to a "
-"bean property using a value expression. </para> </callout> <callout arearefs="
-"\"validator\"> <para> A validator binding is used to make sure the user "
-"doesn't accidentally input a number outside of the range in which they can "
-"guess - if the validator wasn't here, the user might use up a guess on an "
-"out of bounds number. </para> </callout> <callout arearefs=\"submit\"> "
-"<para> And, of course, there must be a way for the user to send their guess "
-"to the server. Here we bind to an action method on the bean. </para> </"
-"callout> </calloutlist> </programlistingco>"
+"Configure requests for URLs ending in <literal>.jsf</literal> to be handled "
+"by JSF"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:142
 #, no-c-format
 msgid ""
-"The example exists of 4 classes, the first two of which are qualifiers. "
-"First, there is the <literal>@Random</literal> qualifier, used for injecting "
-"a random number:"
+"Tell JSF that we will be giving our JSF views (Facelets templates) an "
+"extension of <literal>.xhtml</literal>"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:147
+#. Tag: para
 #, no-c-format
+msgid "Configure a session timeout of 10 minutes"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Random {}]]>"
+"This demo uses JSF 2 as the view framework, but you can use Weld with any "
+"servlet-based web framework, such as JSF 1.2 or Wicket."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:149
 #, no-c-format
 msgid ""
-"There is also the <literal>@MaxNumber</literal> qualifier, used for "
-"injecting the maximum number that can be injected:"
+"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
+"literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:154
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface MaxNumber {}\n"
-"]]>"
+"Facelets is the built-in templating language for JSF. Here we are wrapping "
+"our page in a template which defines the layout."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:156
 #, no-c-format
 msgid ""
-"The application-scoped <literal>Generator</literal> class is responsible for "
-"creating the random number, via a producer method. It also exposes the "
-"maximum possible number via a producer method:"
+"There are a number of messages which can be sent to the user, \"Higher!\", "
+"\"Lower!\" and \"Correct!\""
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:161
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class Generator implements Serializable {\n"
-"\n"
-"   private java.util.Random random = new java.util.Random(System."
-"currentTimeMillis());\n"
-"   \n"
-"   private int maxNumber = 100;\n"
-"   \n"
-"   java.util.Random getRandom() {\n"
-"      return random;\n"
-"   }\n"
-"   \n"
-"   @Produces @Random int next() { \n"
-"      return getRandom().nextInt(maxNumber); \n"
-"   }\n"
-"   \n"
-"   @Produces @MaxNumber int getMaxNumber() {\n"
-"      return maxNumber;\n"
-"   }\n"
-"\n"
-"}]]>"
+"As the user guesses, the range of numbers they can guess gets smaller - this "
+"sentence changes to make sure they know the number range of a valid guess."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:163
 #, no-c-format
+msgid "This input field is bound to a bean property using a value expression."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
+"A validator binding is used to make sure the user doesn't accidentally input "
+"a number outside of the range in which they can guess - if the validator "
+"wasn't here, the user might use up a guess on an out of bounds number."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"And, of course, there must be a way for the user to send their guess to the "
+"server. Here we bind to an action method on the bean."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The example exists of 4 classes, the first two of which are qualifiers. "
+"First, there is the <literal>@Random</literal> qualifier, used for injecting "
+"a random number:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"There is also the <literal>@MaxNumber</literal> qualifier, used for "
+"injecting the maximum number that can be injected:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The application-scoped <literal>Generator</literal> class is responsible for "
+"creating the random number, via a producer method. It also exposes the "
+"maximum possible number via a producer method:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The <literal>Generator</literal> is application scoped, so we don't get a "
 "different random each time."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:168
 #, no-c-format
 msgid ""
 "The package declaration and imports have been excluded from these listings. "
@@ -300,7 +188,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:174
 #, no-c-format
 msgid ""
 "The final bean in the application is the session-scoped <literal>Game</"
@@ -313,7 +200,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:182
 #, no-c-format
 msgid ""
 "You'll notice that we've also added the <literal>@Named</literal> annotation "
@@ -321,123 +207,32 @@
 "bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:187
-#, no-c-format
-msgid ""
-"<![CDATA[@Named\n"
-"@SessionScoped\n"
-"public class Game implements Serializable {\n"
-"\n"
-"   private int number;\n"
-"   private int guess;\n"
-"   private int smallest;\n"
-"   private int biggest;\n"
-"   private int remainingGuesses;\n"
-"\n"
-"   @Inject @MaxNumber private int maxNumber;\n"
-"   @Inject @Random Instance<Integer> randomNumber;\n"
-"   \n"
-"   public Game() {}\n"
-"   \n"
-"   public void check() {\n"
-"      if (guess > number) {\n"
-"         biggest = guess - 1;\n"
-"      }\n"
-"      else if (guess < number) {\n"
-"         smallest = guess + 1;\n"
-"      }\n"
-"      else if (guess == number) {\n"
-"         FacesContext.getCurrentInstance().addMessage(null, new FacesMessage"
-"(\"Correct!\"));\n"
-"      }\n"
-"      remainingGuesses--;\n"
-"   }\n"
-"   \n"
-"   @PostConstruct\n"
-"   public void reset() {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = randomNumber.get();\n"
-"   }\n"
-"   \n"
-"   public void validateNumberRange(FacesContext context,  UIComponent "
-"toValidate, Object value) {\n"
-"      if (remainingGuesses <= 0) {\n"
-"         FacesMessage message = new FacesMessage(\"No guesses left!\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"         return;\n"
-"      }\n"
-"      int input = (Integer) value;\n"
-"\n"
-"      if (input < smallest || input > biggest) {\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"\n"
-"         FacesMessage message = new FacesMessage(\"Invalid guess\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"      }\n"
-"   }\n"
-"\n"
-"   public int getNumber() {\n"
-"      return number;\n"
-"   }\n"
-"   \n"
-"   public int getGuess() {\n"
-"      return guess;\n"
-"   }\n"
-"   \n"
-"   public void setGuess(int guess) {\n"
-"      this.guess = guess;\n"
-"   }\n"
-"   \n"
-"   public int getSmallest() {\n"
-"      return smallest;\n"
-"   }\n"
-"   \n"
-"   public int getBiggest() {\n"
-"      return biggest;\n"
-"   }\n"
-"   \n"
-"   public int getRemainingGuesses() {\n"
-"      return remainingGuesses;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: weldexamples.xml:190
 #, no-c-format
 msgid "The numberguess example in Apache Tomcat or Jetty"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:192
 #, no-c-format
 msgid ""
 "A couple of modifications must be made to the numberguess artifact in order "
 "to deploy it to Tomcat or Jetty. First, Weld must be deployed as a Web "
 "Application library under <literal>WEB-INF/lib</literal> since the servlet "
 "container does not provide the CDI services. For your convenience we provide "
-"a single JAR suitable for running Weld in any servlet container (including "
+"a single jar suitable for running Weld in any servlet container (including "
 "Jetty), <literal>weld-servlet.jar</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:200
 #, no-c-format
 msgid ""
-"You must also include the JARs for JSF, EL, and the common annotations "
+"You must also include the jars for JSF, EL, and the common annotations "
 "(<literal>jsr250-api.jar</literal>), all of which are provided by the Java "
 "EE platform (a Java EE application server). Are you starting to appreciate "
 "why a Java EE platform is worth using?"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:207
 #, no-c-format
 msgid ""
 "Second, we need to explicitly specify the servlet listener in <literal>web."
@@ -445,18 +240,7 @@
 "The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:213
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:215
 #, no-c-format
 msgid ""
 "When Weld boots, it places the <literal>javax.enterprise.inject.spi."
@@ -467,13 +251,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:226
 #, no-c-format
 msgid "The numberguess example for Apache Wicket"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:227
 #, no-c-format
 msgid ""
 "Weld includes a number of portable extensions for JSR-299, including an "
@@ -483,7 +265,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:234
 #, no-c-format
 msgid ""
 "You may want to review the Wicket documentation at <ulink url=\"http://"
@@ -492,7 +273,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:241
 #, no-c-format
 msgid ""
 "Wicket is another environment that relies on the Weld servlet extension. The "
@@ -503,7 +283,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:249
 #, no-c-format
 msgid ""
 "We'll also be using the Eclipse IDE in these examples. Instructions are "
@@ -513,13 +292,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:257
 #, no-c-format
 msgid "Creating the Eclipse project"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:259
 #, no-c-format
 msgid ""
 "To use the Wicket example in Eclipse, you have one of two choices. You can "
@@ -531,17 +308,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:267
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -> Import... -> Maven Projects</"
-"emphasis>. Then, browse to the location of the Wicket numberguess example. "
-"You should see that Eclipse recognizes the existence of a Maven project."
+"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
+"Projects</emphasis>. Then, browse to the location of the Wicket numberguess "
+"example. You should see that Eclipse recognizes the existence of a Maven "
+"project."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:279
 #, no-c-format
 msgid ""
 "This will create a project in your workspace called <literal>weld-wicket-"
@@ -549,7 +325,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:283
 #, no-c-format
 msgid ""
 "You'll notice after importing, the project has a build error. That's because "
@@ -557,21 +332,24 @@
 "<emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> "
 "tab in the window that appears. In the form field labeled \"Active Maven "
 "Profiles (comma separated):\", type <literal>jetty</literal>. That will "
-"enable some extra dependencies that allow the project to compile. You're now "
-"ready to develop!"
+"enable some extra dependencies that allow the project to compile. "
+"Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven "
+"compile plugin when processing resources (recommended)\". That solves an "
+"incompatiblity between the m2eclipse plugin and the Maven enforcer plugin "
+"that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:292
 #, no-c-format
 msgid ""
-"You are also advised to uncheck the box \"Skip Maven compiler when "
-"processing resources\" in the Maven properties screen because of conflicts "
-"with the Maven enforcer plugin."
+"Be sure to uncheck the box \"Skip Maven compile plugin when processing "
+"resources (recommended)\" in the Maven properties screen or else the example "
+"might not run in Eclipse because beans.xml will be missing from the "
+"classpath! See the <ulink url=\"https://issues.sonatype.org/browse/"
+"MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:298
 #, no-c-format
 msgid ""
 "If you are not using the m2eclipse plugin, you have to follow different "
@@ -580,38 +358,26 @@
 "activated, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:304
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/wicket/numberguess\n"
-"mvn -Pjetty eclipse:eclipse]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:306
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -> Import... -> General -> "
-"Existing Projects into Workspace</emphasis>, select the root directory of "
-"the numberguess example, and click Finish. This will create a project in "
+"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
+"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
+"of the numberguess example, and click Finish. This will create a project in "
 "your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:318
 #, no-c-format
 msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:325
 #, no-c-format
 msgid "Running the example from Eclipse"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:327
 #, no-c-format
 msgid ""
 "This project follows the <literal>wicket-quickstart</literal> approach of "
@@ -626,13 +392,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:338
 #, no-c-format
 msgid "Running the example from the command line in JBoss AS or Tomcat"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:340
 #, no-c-format
 msgid ""
 "This example can also be deployed from the command line in a (similar to the "
@@ -642,26 +406,12 @@
 "run:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:346
-#, no-c-format
-msgid "<![CDATA[$> ant deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:348
 #, no-c-format
 msgid "to deploy the example to JBoss AS, and:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:350
-#, no-c-format
-msgid "<![CDATA[$> ant tomcat.deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:352
 #, no-c-format
 msgid ""
 "to deploy the example to Tomcat. You can then access application at <ulink "
@@ -670,33 +420,23 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:357
 #, no-c-format
 msgid ""
 "Alternatively, you can run the application in place on an embedded Jetty "
 "container using the following Maven command:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:362
-#, no-c-format
-msgid "<![CDATA[$> mvn jetty:run -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:364
 #, no-c-format
 msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:371
 #, no-c-format
 msgid "Understanding the code"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:373
 #, no-c-format
 msgid ""
 "The code in the wicket numberguess example is very similar to the JSF-based "
@@ -710,7 +450,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:382
 #, no-c-format
 msgid ""
 "The integration of Weld with Wicket takes advantage of the same qualifier "
@@ -720,13 +459,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:388
 #, no-c-format
 msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:394
 #, no-c-format
 msgid ""
 "Each wicket application must have a <literal>WeldApplication</literal> "
@@ -734,19 +471,7 @@
 "<literal>NumberGuessApplication</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:398
-#, no-c-format
-msgid ""
-"<![CDATA[public class NumberGuessApplication extends WeldApplication {\n"
-"   @Override public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:399
 #, no-c-format
 msgid ""
 "This class specifies which page Wicket should treat as our home page, in our "
@@ -754,7 +479,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:405
 #, no-c-format
 msgid ""
 "In <literal>HomePage</literal>, we see typical Wicket code to set up page "
@@ -762,52 +486,14 @@
 "literal> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:410
-#, no-c-format
-msgid "<![CDATA[@Inject Game game;]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:412
 #, no-c-format
 msgid ""
 "The <literal>Game</literal> bean is can then be used, for example, by the "
 "code for submitting a guess:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:417
-#, no-c-format
-msgid ""
-"<![CDATA[final Component guessButton = new AjaxButton(\"GuessButton\") {\n"
-"   protected void onSubmit(AjaxRequestTarget target, Form form) {\n"
-"      if (game.check()) {\n"
-"         info(\"Correct!\");\n"
-"         setVisible(false);\n"
-"         prompt.setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == 0) {\n"
-"         info(\"Sorry, the answer was \" + game.getNumber());\n"
-"         setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getNumber() > game.getGuess()) {\n"
-"         info(\"Higher!\");\n"
-"      }\n"
-"      else if (game.getNumber() < game.getGuess()) {\n"
-"         info(\"Lower\");\n"
-"      }\n"
-"      target.addComponent(form);\n"
-"   } \n"
-"};      ]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:420
 #, no-c-format
 msgid ""
 "All injections may be serialized; actual storage of the bean is managed by "
@@ -816,7 +502,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:425
 #, no-c-format
 msgid ""
 "Wicket components allow injection, but they <emphasis>cannot</emphasis> use "
@@ -826,7 +511,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:433
 #, no-c-format
 msgid ""
 "The example uses AJAX for processing of button events, and dynamically hides "
@@ -835,7 +519,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:440
 #, no-c-format
 msgid ""
 "In order to activate Wicket for this webapp, the Wicket filter is added to "
@@ -843,29 +526,7 @@
 "<literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:445
-#, no-c-format
-msgid ""
-"<![CDATA[<filter>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-"
-"class>\n"
-"   <init-param>\n"
-"      <param-name>applicationClassName</param-name>\n"
-"      <param-value>org.jboss.weld.examples.wicket.NumberGuessApplication</"
-"param-value>\n"
-"   </init-param>\n"
-"</filter>\n"
-"\n"
-"<filter-mapping>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <url-pattern>/*</url-pattern>\n"
-"</filter-mapping>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:447
 #, no-c-format
 msgid ""
 "The servlet listener is still required, as in the Tomcat example, to "
@@ -876,26 +537,12 @@
 "descriptor to be appended to the <literal>web.xml</literal> configuration."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:455
-#, no-c-format
-msgid ""
-"<![CDATA[<web-app version=\"2.4\" ...>\n"
-"   <listener>\n"
-"      <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"   </listener>\n"
-"</web-app>]]>"
-msgstr ""
-
 #. Tag: title
-#: weldexamples.xml:464
 #, no-c-format
 msgid "The numberguess example for Java SE with Swing"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:466
 #, no-c-format
 msgid ""
 "This example shows how to use the Weld SE extension to in a Java SE based "
@@ -905,19 +552,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:473
 #, no-c-format
 msgid "To run the example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:479
 #, no-c-format
 msgid "Ensure that Maven 2 (version 2.0.10+) is installed and in your PATH"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:484
 #, no-c-format
 msgid ""
 "Ensure that the <literal>JAVA_HOME</literal> environment variable is "
@@ -925,7 +569,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:490
 #, no-c-format
 msgid ""
 "Open a command line or terminal window in the <literal>examples/se/"
@@ -933,19 +576,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:496
 #, no-c-format
 msgid "Execute the following command"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:499
-#, no-c-format
-msgid "mvn -Drun"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:503
 #, no-c-format
 msgid ""
 "Let's have a look at the significant code and configuration files that make "
@@ -953,7 +588,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:508
 #, no-c-format
 msgid ""
 "As usual, there is an empty <literal>beans.xml</literal> file in the root "
@@ -962,7 +596,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:514
 #, no-c-format
 msgid ""
 "The game's main logic is located in <literal>Game.java</literal>. Here is "
@@ -970,293 +603,170 @@
 "the web application version:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:518
+#. Tag: para
 #, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"scope\" coords=\"1\"/> <area id="
-"\"name\" coords=\"2\"/> <area id=\"messages1\" coords=\"26\"/> <area id="
-"\"validation\" coords=\"41\"/> <area id=\"reset\" coords=\"73\"/> </"
-"areaspec> <programlisting role=\"JAVA\"><![CDATA[@ApplicationScoped\n"
-"public class Game\n"
-"{\n"
-"\n"
-"   public static final int MAX_NUM_GUESSES = 10;\n"
-"\n"
-"   private Integer number;\n"
-"   private int guess = 0;\n"
-"   private int smallest = 0;\n"
-"\n"
-"   @Inject\n"
-"   @MaxNumber\n"
-"   private int maxNumber;\n"
-"\n"
-"   private int biggest;\n"
-"   private int remainingGuesses = MAX_NUM_GUESSES;\n"
-"   private boolean validNumberRange = true;\n"
-"\n"
-"   @Inject\n"
-"   Generator rndGenerator;\n"
-"\n"
-"   public Game()\n"
-"   {\n"
-"   }\n"
-"\n"
-"   ...\n"
-"\n"
-"   public boolean isValidNumberRange()\n"
-"   {\n"
-"      return validNumberRange;\n"
-"   }\n"
-"\n"
-"   public boolean isGameWon()\n"
-"   {\n"
-"      return guess == number;\n"
-"   }\n"
-"\n"
-"   public boolean isGameLost()\n"
-"   {\n"
-"      return guess != number && remainingGuesses <= 0;\n"
-"   }\n"
-"\n"
-"   public boolean check()\n"
-"   {\n"
-"      boolean result = false;\n"
-"\n"
-"      if (checkNewNumberRangeIsValid())\n"
-"      {\n"
-"         if (guess > number)\n"
-"         {\n"
-"            biggest = guess - 1;\n"
-"         }\n"
-"\n"
-"         if (guess < number)\n"
-"         {\n"
-"            smallest = guess + 1;\n"
-"         }\n"
-"\n"
-"         if (guess == number)\n"
-"         {\n"
-"            result = true;\n"
-"         }\n"
-"\n"
-"         remainingGuesses--;\n"
-"      }\n"
-"\n"
-"      return result;\n"
-"   }\n"
-"\n"
-"   private boolean checkNewNumberRangeIsValid()\n"
-"   {\n"
-"      return validNumberRange = ((guess >= smallest) && (guess <= "
-"biggest));\n"
-"   }\n"
-"\n"
-"   @PostConstruct\n"
-"   public void reset()\n"
-"   {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = rndGenerator.next();\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"scope\"> <para> The "
-"bean is application scoped rather than session scoped, since an instance of "
-"a Swing application typically represents a single 'session'. </para> </"
-"callout> <callout arearefs=\"name\"> <para> Notice that the bean is not "
-"named, since it doesn't need to be accessed via EL. </para> </callout> "
-"<callout arearefs=\"messages1\"> <para> In Java SE there is no JSF "
-"<literal>FacesContext</literal> to which messages can be added. Instead the "
-"<literal>Game</literal> class provides additional information about the "
-"state of the current game including: </para> <itemizedlist> <listitem> "
-"<para> If the game has been won or lost </para> </listitem> <listitem> "
-"<para> If the most recent guess was invalid </para> </listitem> </"
-"itemizedlist> <para> This allows the Swing UI to query the state of the "
-"game, which it does indirectly via a class called <literal>MessageGenerator</"
-"literal>, in order to determine the appropriate messages to display to the "
-"user during the game. </para> </callout> <callout arearefs=\"validation\"> "
-"<para> Since there is no dedicated validation phase, validation of user "
-"input is performed during the <literal>check()</literal> method. </para> </"
-"callout> <callout arearefs=\"reset\"> <para> The <literal>reset()</literal> "
-"method makes a call to the injected <literal>rndGenerator</literal> in order "
-"to get the random number at the start of each game. Note that it can't use "
-"<literal>Instance.get()</literal> like the JSF example does because there "
-"will not be any active contexts like there are during a JSF request. </para> "
-"</callout> </calloutlist> </programlistingco> <para> The "
-"<literal>MessageGenerator</literal> class depends on the current instance of "
-"<literal>Game</literal> and queries its state in order to determine the "
-"appropriate messages to provide as the prompt for the user's next guess and "
-"the response to the previous guess. The code for <literal>MessageGenerator</"
-"literal> is as follows: </para> <programlistingco> <areaspec> <area id=\"game"
-"\" coords=\"3\"/> <area id=\"challenge\" coords=\"6\"/> <area id=\"result\" "
-"coords=\"17\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA[public "
-"class MessageGenerator\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   public String getChallengeMessage()\n"
-"   {\n"
-"      StringBuilder challengeMsg = new StringBuilder(\"I'm thinking of a "
-"number between \");\n"
-"      challengeMsg.append(game.getSmallest());\n"
-"      challengeMsg.append(\" and \");\n"
-"      challengeMsg.append(game.getBiggest());\n"
-"      challengeMsg.append(\". Can you guess what it is?\");\n"
-"\n"
-"      return challengeMsg.toString();\n"
-"   }\n"
-"\n"
-"   public String getResultMessage()\n"
-"   {\n"
-"      if (game.isGameWon())\n"
-"      {\n"
-"         return \"You guessed it! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (game.isGameLost())\n"
-"      {\n"
-"         return \"You are fail! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (!game.isValidNumberRange())\n"
-"      {\n"
-"         return \"Invalid number range!\";\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == Game.MAX_NUM_GUESSES)\n"
-"      {\n"
-"         return \"What is your first guess?\";\n"
-"      }\n"
-"      else\n"
-"      {\n"
-"         String direction = null;\n"
-"\n"
-"         if (game.getGuess() < game.getNumber())\n"
-"         {\n"
-"            direction = \"Higher\";\n"
-"         }\n"
-"         else\n"
-"         {\n"
-"            direction = \"Lower\";\n"
-"         }\n"
-"\n"
-"         return direction + \"! You have \" + game.getRemainingGuesses() + "
-"\" guesses left.\";\n"
-"      }\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"game\"> <para> The "
-"instance of <literal>Game</literal> for the application is injected here. </"
-"para> </callout> <callout arearefs=\"challenge\"> <para> The <literal>Game</"
-"literal>'s state is interrogated to determine the appropriate challenge "
-"message ... </para> </callout> <callout arearefs=\"result\"> <para> ... and "
-"again to determine whether to congratulate, console or encourage the user to "
-"continue. </para> </callout> </calloutlist> </programlistingco> <para> "
+"The bean is application scoped rather than session scoped, since an instance "
+"of a Swing application typically represents a single 'session'."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Notice that the bean is not named, since it doesn't need to be accessed via "
+"EL."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"In Java SE there is no JSF <literal>FacesContext</literal> to which messages "
+"can be added. Instead the <literal>Game</literal> class provides additional "
+"information about the state of the current game including:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the game has been won or lost"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the most recent guess was invalid"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This allows the Swing UI to query the state of the game, which it does "
+"indirectly via a class called <literal>MessageGenerator</literal>, in order "
+"to determine the appropriate messages to display to the user during the game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Since there is no dedicated validation phase, validation of user input is "
+"performed during the <literal>check()</literal> method."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>reset()</literal> method makes a call to the injected "
+"<literal>rndGenerator</literal> in order to get the random number at the "
+"start of each game. Note that it can't use <literal>Instance.get()</literal> "
+"like the JSF example does because there will not be any active contexts like "
+"there are during a JSF request."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>MessageGenerator</literal> class depends on the current "
+"instance of <literal>Game</literal> and queries its state in order to "
+"determine the appropriate messages to provide as the prompt for the user's "
+"next guess and the response to the previous guess. The code for "
+"<literal>MessageGenerator</literal> is as follows:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The instance of <literal>Game</literal> for the application is injected here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>Game</literal>'s state is interrogated to determine the "
+"appropriate challenge message ..."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"... and again to determine whether to congratulate, console or encourage the "
+"user to continue."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "Finally we come to the <literal>NumberGuessFrame</literal> class which "
-"provides the Swing front end to our guessing game. </para> "
-"<programlistingco> <areaspec> <area id=\"gameIn\" coords=\"3\"/> <area id="
-"\"messagesIn\" coords=\"6\"/> <area id=\"start\" coords=\"9\"/> <area id="
-"\"init\" coords=\"21\"/> <area id=\"guess1\" coords=\"38\"/> <area id="
-"\"replay\" coords=\"48\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA"
-"[public class NumberGuessFrame extends javax.swing.JFrame\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   @Inject\n"
-"   private MessageGenerator msgGenerator;\n"
-"\n"
-"   public void start(@Observes ContainerInitialized event)\n"
-"   {\n"
-"      java.awt.EventQueue.invokeLater(new Runnable()\n"
-"      {\n"
-"         public void run()\n"
-"         {\n"
-"            initComponents();\n"
-"            setVisible(true);\n"
-"         }\n"
-"      });\n"
-"   }\n"
-"\n"
-"   private void initComponents()\n"
-"   {\n"
-"\n"
-"      buttonPanel = new javax.swing.JPanel();\n"
-"      mainMsgPanel = new javax.swing.JPanel();\n"
-"      mainLabel = new javax.swing.JLabel();\n"
-"      messageLabel = new javax.swing.JLabel();\n"
-"      guessText = new javax.swing.JTextField();\n"
-"      ...\n"
-"      mainLabel.setText(msgGenerator.getChallengeMessage());\n"
-"      mainMsgPanel.add(mainLabel);\n"
-"\n"
-"      messageLabel.setText(msgGenerator.getResultMessage());\n"
-"      mainMsgPanel.add(messageLabel);\n"
-"      ...\n"
-"   }\n"
-"\n"
-"   private void guessButtonActionPerformed( java.awt.event.ActionEvent "
-"evt )\n"
-"   {\n"
-"      int guess =  Integer.parseInt(guessText.getText());\n"
-"      game.setGuess( guess );\n"
-"      game.check();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void replayBtnActionPerformed(java.awt.event.ActionEvent evt)\n"
-"   {\n"
-"      game.reset();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void refreshUI() {\n"
-"      mainLabel.setText( msgGenerator.getChallengeMessage() );\n"
-"      messageLabel.setText( msgGenerator.getResultMessage() );\n"
-"      guessText.setText( \"\" );\n"
-"      guessesLeftBar.setValue( game.getRemainingGuesses() );\n"
-"      guessText.requestFocus();\n"
-"   }\n"
-"\n"
-"   // swing components\n"
-"   private javax.swing.JPanel borderPanel;\n"
-"   ...\n"
-"   private javax.swing.JButton replayBtn;\n"
-"\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"gameIn\"> <para> The "
-"injected instance of the game (logic and state). </para> </callout> <callout "
-"arearefs=\"messagesIn\"> <para> The injected message generator for UI "
-"messages. </para> </callout> <callout arearefs=\"start\"> <para> This "
-"application is started in the prescribed Weld SE way, by observing the "
-"<literal>ContainerInitialized</literal> event. </para> </callout> <callout "
-"arearefs=\"init\"> <para> This method initializes all of the Swing "
-"components. Note the use of the <literal>msgGenerator</literal> here. </"
-"para> </callout> <callout arearefs=\"guess1\"> <para> "
+"provides the Swing front end to our guessing game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected instance of the game (logic and state)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected message generator for UI messages."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This application is started in the prescribed Weld SE way, by observing the "
+"<literal>ContainerInitialized</literal> event."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This method initializes all of the Swing components. Note the use of the "
+"<literal>msgGenerator</literal> here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
-"button is clicked, and it does the following: </para> <itemizedlist> "
-"<listitem> <para> Gets the guess entered by the user and sets it as the "
-"current guess in the <literal>Game</literal> </para> </listitem> <listitem> "
-"<para> Calls <literal>game.check()</literal> to validate and perform one "
-"'turn' of the game </para> </listitem> <listitem> <para> Calls "
-"<literal>refreshUI</literal>. If there were validation errors with the "
+"button is clicked, and it does the following:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Gets the guess entered by the user and sets it as the current guess in the "
+"<literal>Game</literal>"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
+"the game"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>refreshUI</literal>. If there were validation errors with the "
 "input, this will have been captured during <literal>game.check()</literal> "
 "and as such will be reflected in the messages returned by "
 "<literal>MessageGenerator</literal> and subsequently presented to the user. "
 "If there are no validation errors then the user will be told to guess again "
 "(higher or lower) or that the game has ended either in a win (correct guess) "
-"or a loss (ran out of guesses). </para> </listitem> </itemizedlist> </"
-"callout> <callout arearefs=\"replay\"> <para> "
+"or a loss (ran out of guesses)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>replayBtnActionPerformed</literal> simply calls <literal>game.reset"
-"()</literal> to start a new game and refreshes the messages in the UI. </"
-"para> </callout> </calloutlist> </programlistingco>"
+"()</literal> to start a new game and refreshes the messages in the UI."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:716
 #, no-c-format
 msgid "The translator example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:718
 #, no-c-format
 msgid ""
 "The translator example will take any sentences you enter, and translate them "
@@ -1265,52 +775,29 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:723
 #, no-c-format
 msgid ""
-"The translator example is built as an EAR and contains EJBs. As a result, "
+"The translator example is built as an ear and contains EJBs. As a result, "
 "it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:729
 #, no-c-format
 msgid ""
-"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a WAR, which "
+"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a war, which "
 "will make this structure much simpler! Still, there are other advantages of "
-"using an EAR."
+"using an ear."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:735
 #, no-c-format
 msgid ""
-"First, let's take a look at the EAR aggregator, which is located in the "
+"First, let's take a look at the ear aggregator, which is located in the "
 "example's <literal>ear</literal> directory. Maven automatically generates "
 "the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:740
-#, no-c-format
-msgid ""
-"<![CDATA[<plugin>\n"
-"   <groupId>org.apache.maven.plugins</groupId>\n"
-"   <artifactId>maven-ear-plugin</artifactId>\n"
-"   <configuration>\n"
-"      <modules>\n"
-"         <webModule>\n"
-"            <groupId>org.jboss.weld.examples.jsf.translator</groupId>\n"
-"            <artifactId>weld-jsf-translator-war</artifactId>\n"
-"            <contextRoot>/weld-translator</contextRoot>\n"
-"         </webModule>\n"
-"      </modules>\n"
-"   </configuration>\n"
-"</plugin>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:742
 #, no-c-format
 msgid ""
 "This configuration overrides the web context path, resulting in this "
@@ -1319,44 +806,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:748
 #, no-c-format
 msgid ""
 "If you weren't using Maven to generate these files, you would need "
 "<literal>META-INF/application.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:753
-#, no-c-format
-msgid ""
-"<![CDATA[<application version=\"5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/application_5.xsd\">\n"
-"\n"
-"  <display-name>weld-jsf-translator-ear</display-name>\n"
-"  <description>The Weld JSF translator example (EAR)</description>\n"
-"  \n"
-"  <module>\n"
-"    <web>\n"
-"      <web-uri>weld-translator.war</web-uri>\n"
-"      <context-root>/weld-translator</context-root>\n"
-"    </web>\n"
-"  </module>\n"
-"  <module>\n"
-"    <ejb>weld-translator.jar</ejb>\n"
-"  </module>\n"
-"</application>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:756
 #, no-c-format
 msgid ""
-"Next, lets look at the WAR, which is located in the example's <literal>war</"
+"Next, lets look at the war, which is located in the example's <literal>war</"
 "literal> directory. Just as in the numberguess example, we have a "
 "<literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</"
 "literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/"
@@ -1364,7 +823,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:762
 #, no-c-format
 msgid ""
 "More interesting is the JSF view used to translate text. Just as in the "
@@ -1372,41 +830,7 @@
 "here for brevity):"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:767
-#, no-c-format
-msgid ""
-"<![CDATA[<h:form id=\"translator\">\n"
-"\n"
-"   <table>\n"
-"      <tr align=\"center\" style=\"font-weight: bold\">\n"
-"         <td>\n"
-"            Your text\n"
-"         </td>\n"
-"         <td>\n"
-"            Translation\n"
-"         </td>\n"
-"      </tr>\n"
-"      <tr>\n"
-"         <td>\n"
-"            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
-"required=\"true\" rows=\"5\" cols=\"80\"/>\n"
-"         </td>\n"
-"         <td>\n"
-"            <h:outputText value=\"#{translator.translatedText}\"/>\n"
-"         </td>\n"
-"      </tr>\n"
-"   </table>\n"
-"   <div>\n"
-"      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
-"{translator.translate}\"/>\n"
-"   </div>\n"
-"   \n"
-"</h:form>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:769
 #, no-c-format
 msgid ""
 "The user can enter some text in the left-hand textarea, and hit the "
@@ -1414,7 +838,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:774
 #, no-c-format
 msgid ""
 "Finally, let's look at the EJB module, which is located in the example's "
@@ -1424,7 +847,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:780
 #, no-c-format
 msgid ""
 "We've saved the most interesting bit to last, the code! The project has two "
@@ -1436,7 +858,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:787
 #, no-c-format
 msgid ""
 "Both <literal>SentenceParser</literal> and <literal>TextTranslator</literal> "
@@ -1444,33 +865,7 @@
 "injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:792
-#, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator implements Serializable { \n"
-"\n"
-"   private SentenceParser sentenceParser; \n"
-"\n"
-"   @EJB private Translator translator; \n"
-"   \n"
-"   @Inject public TextTranslator(SentenceParser sentenceParser) { \n"
-"      this.sentenceParser = sentenceParser; \n"
-"   }\n"
-"   \n"
-"   public String translate(String text) { \n"
-"      StringBuilder sb = new StringBuilder(); \n"
-"      for (String sentence: sentenceParser.parse(text)) { \n"
-"         sb.append(translator.translate(sentence)).append(\". \"); \n"
-"      } \n"
-"      return sb.toString().trim(); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:794
 #, no-c-format
 msgid ""
 "<literal>TextTranslator</literal> uses the simple bean (really just a plain "
@@ -1481,22 +876,7 @@
 "convincing enough to anyone who doesn't understand Latin!"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:802
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator { \n"
-"\n"
-"   public String translate(String sentence) { \n"
-"      return \"Lorem ipsum dolor sit amet\"; \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:804
 #, no-c-format
 msgid ""
 "Finally, there is UI orientated controller. This is a request scoped, named, "
@@ -1505,44 +885,7 @@
 "and setters for all the fields on the page."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:810
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"@RequestScoped\n"
-"@Named(\"translator\")\n"
-"public class TranslatorControllerBean implements TranslatorController {\n"
-"\n"
-"   @Inject private TextTranslator translator;\n"
-"   \n"
-"   private String inputText;\n"
-"   \n"
-"   private String translatedText;\n"
-"   \n"
-"   public void translate() {\n"
-"      translatedText = translator.translate(inputText);\n"
-"   }\n"
-"   \n"
-"   public String getText() {\n"
-"      return inputText;\n"
-"   }\n"
-"   \n"
-"   public void setText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"   \n"
-"   public String getTranslatedText() {\n"
-"      return translatedText;\n"
-"   }\n"
-"   \n"
-"   @Remove public void remove() {}\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:814
 #, no-c-format
 msgid ""
 "That concludes our short tour of the Weld starter examples. For more "

Modified: doc/trunk/reference/es-ES/xml.po
===================================================================
--- doc/trunk/reference/es-ES/xml.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/es-ES/xml.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-20 11:40+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: xml.xml:5
 #, fuzzy, no-c-format
 msgid "Defining beans using XML"
 msgstr "Definición de Web Beans utilizando XML"
 
 #. Tag: para
-#: xml.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "So far, we've seen plenty of examples of beans declared using annotations. "
@@ -35,21 +33,18 @@
 "anotaciones para definir el Web Bean."
 
 #. Tag: para
-#: xml.xml:14
 #, no-c-format
 msgid "when the implementation class comes from some preexisting library, or"
 msgstr ""
 "cuando la clase de implementación viene de alguna biblioteca preexistente, o"
 
 #. Tag: para
-#: xml.xml:19
 #, fuzzy, no-c-format
 msgid "when there should be multiple beans with the same implementation class."
 msgstr ""
 "cuando debe haber múltiples Web Beans con la misma clase de implementación."
 
 #. Tag: para
-#: xml.xml:25
 #, no-c-format
 msgid ""
 "One way to address these problems is to write a producer method. Weld offers "
@@ -59,7 +54,6 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:31
 #, fuzzy, no-c-format
 msgid ""
 "Many frameworks use XML to provide metadata relating to Java classes. "
@@ -76,7 +70,6 @@
 "utilizar el nombre de clase o miembro como el nombre del elemento XML."
 
 #. Tag: para
-#: xml.xml:38
 #, no-c-format
 msgid ""
 "The advantage of this approach is that you can write an XML schema that "
@@ -93,13 +86,11 @@
 "explícita."
 
 #. Tag: title
-#: xml.xml:46
 #, fuzzy, no-c-format
 msgid "Declaring beans"
 msgstr "Declaración de clases de Web Bean"
 
 #. Tag: para
-#: xml.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "For each Java package, Weld defines a corresponding XML namespace. The "
@@ -114,7 +105,6 @@
 "mydomain.myapp</literal>."
 
 #. Tag: para
-#: xml.xml:54
 #, no-c-format
 msgid ""
 "Java types belonging to a package are referred to using an XML element in "
@@ -130,7 +120,6 @@
 "anotación, los miembros son especificados por atributos del elemento."
 
 #. Tag: para
-#: xml.xml:61
 #, no-c-format
 msgid ""
 "For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
@@ -140,24 +129,7 @@
 "siguiente fragmento XML se refiere a la clase <literal>java.util.Date</"
 "literal>:"
 
-#. Tag: programlisting
-#: xml.xml:66
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:util=\"urn:java:java.util\">\n"
-"   <util:Date/>\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
-"          xmlns:util=\"urn:java:java.util\">\n"
-"\n"
-"    <util:Date/>\n"
-"\n"
-"</WebBeans>]]>"
-
 #. Tag: para
-#: xml.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "And this is all the code we need to declare that <literal>Date</literal> is "
@@ -168,20 +140,12 @@
 "literal> es un Web Bean sencillo! Una instancia de <literal>Date</literal> "
 "puede ahora ser inyectada por cualquier otro Web Bean:"
 
-#. Tag: programlisting
-#: xml.xml:73
-#, fuzzy, no-c-format
-msgid "<![CDATA[private @Inject Date date;]]>"
-msgstr "<![CDATA[@Current Date date]]>"
-
 #. Tag: title
-#: xml.xml:78
 #, fuzzy, no-c-format
 msgid "Declaring bean metadata"
 msgstr "Declaración de metadatos de Web Bean"
 
 #. Tag: para
-#: xml.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "We can declare the scope, deployment type and interceptor binding types "
@@ -191,68 +155,14 @@
 "interceptor mediante elementos directos secundarios de la declaración del "
 "Web Bean:"
 
-#. Tag: programlisting
-#: xml.xml:85
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"   <SessionScoped/>\n"
-"   <myfwk:Transactional requiresNew=\"true\"/>\n"
-"   <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
-msgstr ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"    <SessionScoped/>\n"
-"    <myfwk:Transactional requiresNew=\"true\"/>\n"
-"    <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
-
 #. Tag: para
-#: xml.xml:87
 #, fuzzy, no-c-format
 msgid "We use exactly the same approach to specify names and qualifiers:"
 msgstr ""
 "Utilizamos exactamente el mismo método para especificar nombres y tipo de "
 "enlace:"
 
-#. Tag: programlisting
-#: xml.xml:89
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<util:Date>\n"
-"   <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <SessionScoped/>\n"
-"   <myapp:Login/>\n"
-"   <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:SystemStart/>\n"
-"   <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
-msgstr ""
-"<![CDATA[<util:Date>\n"
-"    <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"    <SessionScoped/>\n"
-"    <myapp:Login/>\n"
-"    <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"    <ApplicationScoped/>\n"
-"    <myapp:SystemStart/>\n"
-"    <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
-
 #. Tag: para
-#: xml.xml:91
 #, fuzzy, no-c-format
 msgid ""
 "Where <literal>@Login</literal> and <literal>@SystemStart</literal> are "
@@ -261,40 +171,12 @@
 "Donde <literal>@Login</literal> y <literal>@SystemStart</literal> son tipos "
 "de anotaciones de enlace."
 
-#. Tag: programlisting
-#: xml.xml:95
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[private @Inject Date currentTime;\n"
-"private @Login Date loginTime;\n"
-"private @SystemStart Date systemStartTime;]]>"
-msgstr ""
-"<![CDATA[@Current Date currentTime;\n"
-"@Login Date loginTime;\n"
-"@SystemStart Date systemStartTime;]]>"
-
 #. Tag: para
-#: xml.xml:97
 #, fuzzy, no-c-format
 msgid "As usual, a bean may support multiple qualifier types:"
 msgstr "Como es usual, un Web Bean puede soportar múltiples tipos de enlace:"
 
-#. Tag: programlisting
-#: xml.xml:99
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"   <myapp:PayByCheque/>\n"
-"   <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
-msgstr ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"    <myapp:PayByCheque/>\n"
-"    <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
-
 #. Tag: para
-#: xml.xml:101
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors and decorators are beans as well, so they may be declared just "
@@ -303,74 +185,29 @@
 "Los interceptores y decoradores son sólo Web Beans sencillos, por "
 "consiguiente, pueden ser declarados como cualquier otro Web Bean sencillo:"
 
-#. Tag: programlisting
-#: xml.xml:105
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"   <Interceptor/>\n"
-"   <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
-msgstr ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"    <Interceptor/>\n"
-"    <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
-
 #. Tag: title
-#: xml.xml:110
 #, fuzzy, no-c-format
 msgid "Declaring bean members"
 msgstr "Declaración de miembros de Web Bean"
 
 #. Tag: para
-#: xml.xml:112
 #, no-c-format
 msgid "TODO!"
 msgstr "¡TODO!"
 
 #. Tag: title
-#: xml.xml:119
 #, fuzzy, no-c-format
 msgid "Declaring inline beans"
 msgstr "Declaración de Web Beans en línea"
 
 #. Tag: para
-#: xml.xml:121
 #, fuzzy, no-c-format
 msgid "Weld lets us define a bean at an injection point. For example:"
 msgstr ""
 "Web Beans nos permite definir un Web Bean en el punto de inyección. Por "
 "ejemplo:"
 
-#. Tag: programlisting
-#: xml.xml:123
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:System>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:admin>\n"
-"      <myapp:Name>\n"
-"         <myapp:firstname>Gavin</myapp:firstname>\n"
-"         <myapp:lastname>King</myapp:lastname>\n"
-"         <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"      </myapp:Name>\n"
-"   </myapp:admin>\n"
-"</myapp:System>]]>"
-msgstr ""
-"<![CDATA[<myapp:System>\n"
-"    <ApplicationScoped/>\n"
-"    <myapp:admin>\n"
-"        <myapp:Name>\n"
-"            <myapp:firstname>Gavin</myapp:firstname>\n"
-"            <myapp:lastname>King</myapp:lastname>\n"
-"            <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"        </myapp:Name>\n"
-"    </myapp:admin>\n"
-"</myapp:System>]]>"
-
 #. Tag: para
-#: xml.xml:125
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
@@ -386,7 +223,6 @@
 "inyección en el cual es declarado."
 
 #. Tag: para
-#: xml.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "This simple but powerful feature allows the Weld XML format to be used to "
@@ -398,13 +234,11 @@
 "del todo una solución para enlazar datos, pero ¡está cerca!"
 
 #. Tag: title
-#: xml.xml:139
 #, no-c-format
 msgid "Using a schema"
 msgstr "Uso de un esquema"
 
 #. Tag: para
-#: xml.xml:141
 #, fuzzy, no-c-format
 msgid ""
 "If we want our XML document format to be authored by people who aren't Java "
@@ -416,39 +250,7 @@
 "necesitamos proporcionar un esquema. No hay nada específico de Web Beans "
 "sobre escribir o utilizar el esquema."
 
-#. Tag: programlisting
-#: xml.xml:147
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/beans-"
-"1.0.xsd\n"
-"   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"   <myapp:System>\n"
-"      ...\n"
-"   </myapp:System>\n"
-"\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
-"          xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"          xsi:schemaLocation=\"urn:java:javax.webbeans http://java.sun.com/"
-"jee/web-beans-1.0.xsd\n"
-"                              urn:java:com.mydomain.myapp http://mydomain."
-"com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"    <myapp:System>\n"
-"        ...\n"
-"    </myapp:System>\n"
-"\n"
-"</WebBeans>]]>"
-
 #. Tag: para
-#: xml.xml:149
 #, fuzzy, no-c-format
 msgid ""
 "Writing an XML schema is quite tedious. Therefore, the Weld project will "
@@ -459,6 +261,159 @@
 "proyecto de la IR de Web Beans proporcionará una herramienta que genere "
 "automáticamente el esquema de XML desde el código de Java compilado."
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:util=\"urn:java:java.util\">\n"
+#~ "   <util:Date/>\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
+#~ "          xmlns:util=\"urn:java:java.util\">\n"
+#~ "\n"
+#~ "    <util:Date/>\n"
+#~ "\n"
+#~ "</WebBeans>]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[private @Inject Date date;]]>"
+#~ msgstr "<![CDATA[@Current Date date]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "   <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "    <SessionScoped/>\n"
+#~ "    <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "    <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "   <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myapp:Login/>\n"
+#~ "   <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:SystemStart/>\n"
+#~ "   <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "    <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "    <SessionScoped/>\n"
+#~ "    <myapp:Login/>\n"
+#~ "    <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "    <ApplicationScoped/>\n"
+#~ "    <myapp:SystemStart/>\n"
+#~ "    <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[private @Inject Date currentTime;\n"
+#~ "private @Login Date loginTime;\n"
+#~ "private @SystemStart Date systemStartTime;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Current Date currentTime;\n"
+#~ "@Login Date loginTime;\n"
+#~ "@SystemStart Date systemStartTime;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "   <myapp:PayByCheque/>\n"
+#~ "   <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "    <myapp:PayByCheque/>\n"
+#~ "    <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "   <Interceptor/>\n"
+#~ "   <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "    <Interceptor/>\n"
+#~ "    <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:admin>\n"
+#~ "      <myapp:Name>\n"
+#~ "         <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "         <myapp:lastname>King</myapp:lastname>\n"
+#~ "         <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "      </myapp:Name>\n"
+#~ "   </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "    <ApplicationScoped/>\n"
+#~ "    <myapp:admin>\n"
+#~ "        <myapp:Name>\n"
+#~ "            <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "            <myapp:lastname>King</myapp:lastname>\n"
+#~ "            <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "        </myapp:Name>\n"
+#~ "    </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/"
+#~ "beans-1.0.xsd\n"
+#~ "   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "   <myapp:System>\n"
+#~ "      ...\n"
+#~ "   </myapp:System>\n"
+#~ "\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
+#~ "          xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "          xsi:schemaLocation=\"urn:java:javax.webbeans http://java.sun."
+#~ "com/jee/web-beans-1.0.xsd\n"
+#~ "                              urn:java:com.mydomain.myapp http://mydomain."
+#~ "com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "    <myapp:System>\n"
+#~ "        ...\n"
+#~ "    </myapp:System>\n"
+#~ "\n"
+#~ "</WebBeans>]]>"
+
 #~ msgid "In either of these cases, Web Beans gives us two options:"
 #~ msgstr "En estos casos, Web Beans nos ofrece dos opciones:"
 

Modified: doc/trunk/reference/fr-FR/Author_Group.po
===================================================================
--- doc/trunk/reference/fr-FR/Author_Group.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/Author_Group.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-02 22:03+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -13,108 +13,124 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Tag: author
-#: Author_Group.xml:5
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Gavin</firstname> <surname>King</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+msgid "Gavin"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:8
 #, no-c-format
 msgid "JSR-299: Contexts and Dependency Injection Lead"
 msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:14
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+msgid "Pete"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:17
 #, no-c-format
 msgid "Weld (JSR-299 RI) Lead"
 msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:24
-#, fuzzy, no-c-format
-msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Dan"
+msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:31
-#, fuzzy, no-c-format
-msgid "<firstname>David</firstname> <surname>Allen</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "David"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:35
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
-msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+msgid "Nicola"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:38 Author_Group.xml:67
 #, no-c-format
 msgid "Italian Translation"
 msgstr "Traduction italienne"
 
-#. Tag: othercredit
-#: Author_Group.xml:40
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
-msgstr "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+msgid "Gladys"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:43
 #, no-c-format
 msgid "Spanish Translation"
 msgstr "Traduction espagnole"
 
-#. Tag: othercredit
-#: Author_Group.xml:48
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
-msgstr "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+msgid "Eun-Ju"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:51
 #, no-c-format
 msgid "Korean Translation"
 msgstr "Traduction coréenne"
 
-#. Tag: othercredit
-#: Author_Group.xml:56
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
-msgstr "<firstname>Terry</firstname> <surname>Chuang</surname>"
+msgid "Terry"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:59
 #, no-c-format
 msgid "Traditional Chinese Translation"
 msgstr "Traduction en chinois traditionnel"
 
-#. Tag: othercredit
-#: Author_Group.xml:64
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
-msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+msgid "Francesco"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:69
-#, fuzzy, no-c-format
-msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Sean"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:72
 #, fuzzy, no-c-format
 msgid "Simplified Chinese Translation"
 msgstr "Traduction en chinois traditionnel"
 
+#~ msgid "<firstname>Gavin</firstname> <surname>King</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#~ msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>David</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#~ msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+#~ msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+
+#~ msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+#~ msgstr "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+
+#~ msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+#~ msgstr "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+
+#~ msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
+#~ msgstr "<firstname>Terry</firstname> <surname>Chuang</surname>"
+
+#~ msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+#~ msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
 #~ msgid ""
 #~ "<jobtitle>JSR-299 specification lead</jobtitle> <orgname>Red Hat "
 #~ "Middleware LLC</orgname>"

Modified: doc/trunk/reference/fr-FR/Book_Info.po
===================================================================
--- doc/trunk/reference/fr-FR/Book_Info.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/Book_Info.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-02 22:05+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: Book_Info.xml:4
 #, no-c-format
 msgid "Weld - JSR-299 Reference Implementation"
 msgstr ""
 
 #. Tag: subtitle
-#: Book_Info.xml:5
 #, fuzzy, no-c-format
 msgid ""
 "JSR-299: The new Java standard for dependency injection and contextual "

Modified: doc/trunk/reference/fr-FR/beans.po
===================================================================
--- doc/trunk/reference/fr-FR/beans.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/beans.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: beans.xml:4
 #, no-c-format
 msgid "More about beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:6
 #, no-c-format
 msgid ""
 "A bean is usually an application class that contains business logic. It may "
@@ -32,7 +30,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:13
 #, no-c-format
 msgid ""
 "Let's back up a second. What does it really mean to be <emphasis>contextual</"
@@ -45,7 +42,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:21
 #, no-c-format
 msgid ""
 "However, like a stateless or singleton model, but <emphasis>unlike</"
@@ -55,19 +51,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:29
 #, no-c-format
 msgid "the lifecycle of each instance of the bean and"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:32
 #, no-c-format
 msgid "which clients share a reference to a particular instance of the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:36
 #, no-c-format
 msgid ""
 "For a given thread in a CDI application, there may be an <emphasis>active "
@@ -78,7 +71,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:43
 #, no-c-format
 msgid ""
 "Clients (for example, other beans) executing in the same context will see "
@@ -87,7 +79,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:49
 #, no-c-format
 msgid ""
 "One great advantage of the contextual model is that it allows stateful beans "
@@ -99,46 +90,39 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:58
 #, no-c-format
 msgid "they interact via well-defined public APIs"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:61
 #, no-c-format
 msgid "their lifecycles are completely decoupled"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:65
 #, no-c-format
 msgid ""
 "We can replace one bean with another different bean that implements the same "
 "interface and has a different lifecycle (a different scope) without "
 "affecting the other bean implementation. In fact, CDI defines a simple "
 "facility for overriding bean implementations at deployment time, as we will "
-"see in <xref linkend=\"alternatives\"/>."
+"see in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:71
 #, no-c-format
 msgid ""
 "Note that not all clients of a bean are beans themselves. Other objects such "
-"as servlets or message-driven beans&#8212;which are by nature not "
-"injectable, contextual objects&#8212;may also obtain references to beans by "
-"injection."
+"as servlets or message-driven beans—which are by nature not injectable, "
+"contextual objects—may also obtain references to beans by injection."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:78
 #, no-c-format
 msgid "The anatomy of a bean"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:80
 #, no-c-format
 msgid ""
 "Enough hand-waving. More formally, the anatomy of a bean, according to the "
@@ -146,67 +130,56 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:84
 #, no-c-format
 msgid "A bean comprises the following attributes:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:87
 #, no-c-format
 msgid "A (nonempty) set of bean types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:88
 #, no-c-format
 msgid "A (nonempty) set of qualifiers"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:89
 #, no-c-format
 msgid "A scope"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:90
 #, no-c-format
 msgid "Optionally, a bean EL name"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:91
 #, no-c-format
 msgid "A set of interceptor bindings"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:92
 #, no-c-format
 msgid "A bean implementation"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:95
 #, no-c-format
 msgid "Furthermore, a bean may or may not be an alternative."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:99
 #, no-c-format
 msgid "Let's see what all this new terminology means."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:102
 #, no-c-format
 msgid "Bean types, qualifiers and dependency injection"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:104
 #, no-c-format
 msgid ""
 "Beans usually acquire references to other beans via dependency injection. "
@@ -215,19 +188,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:110
 #, no-c-format
 msgid "a bean type, together with"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:111
 #, no-c-format
 msgid "a set of qualifiers."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:114
 #, no-c-format
 msgid ""
 "A bean type is a user-defined class or interface; a type that is client-"
@@ -237,19 +207,7 @@
 "types:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:120
-#, no-c-format
-msgid ""
-"<![CDATA[public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:122
 #, no-c-format
 msgid ""
 "The bean types are <literal>BookShop</literal>, <literal>Business</literal> "
@@ -259,7 +217,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:128
 #, no-c-format
 msgid ""
 "Meanwhile, this session bean has only the local interfaces "
@@ -268,29 +225,17 @@
 "<literal>BookShopBean</literal> is not a client-visible type."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"public class BookShopBean \n"
-"      extends Business \n"
-"      implements BookShop, Auditable {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:137
 #, no-c-format
 msgid ""
-"Most bean types you can probably figure out. One gotcha is primitive types. "
-"All primitive types are assumed to be identical to their corresponding "
-"wrapper types in <literal>java.lang</literal>."
+"The bean types of a session bean include local interfaces and the bean class "
+"local view (if any). EJB remote interfaces are not considered bean types of "
+"a session bean. You can't inject an EJB using its remote interface unless "
+"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
+"linkend=\"resources\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:143
 #, no-c-format
 msgid ""
 "Bean types may be restricted to an explicit set by annotating the bean with "
@@ -300,20 +245,7 @@
 "<literal>java.lang.Object</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:149
-#, no-c-format
-msgid ""
-"<![CDATA[@Typed(Shop.class)\n"
-"public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:151
 #, no-c-format
 msgid ""
 "Sometimes, a bean type alone does not provide enough information for the "
@@ -328,7 +260,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:160
 #, no-c-format
 msgid ""
 "A qualifier is a user-defined annotation that is itself annotated "
@@ -337,18 +268,7 @@
 "string-based names. Here's an example of a qualifier annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:166
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface CreditCard {}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:168
 #, no-c-format
 msgid ""
 "You may not be used to seeing the definition of an annotation. In fact, this "
@@ -358,7 +278,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:175
 #, no-c-format
 msgid ""
 "Pay attention to the names of the built-in annotations in CDI and EJB. "
@@ -368,7 +287,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:182
 #, no-c-format
 msgid ""
 "Now that we have defined a qualifier annotation, we can use it to "
@@ -377,14 +295,7 @@
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:188
-#, no-c-format
-msgid "<![CDATA[@Inject @CreditCard PaymentProcessor paymentProcessor]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:191
 #, no-c-format
 msgid ""
 "If an injection point does not explicitly specify a qualifier, it has the "
@@ -392,7 +303,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:197
 #, no-c-format
 msgid ""
 "For each injection point, the container searches for a bean which satisfies "
@@ -402,7 +312,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:203
 #, no-c-format
 msgid ""
 "How do we specify that qualifiers of a bean? By annotating the bean class, "
@@ -411,17 +320,7 @@
 "Therefore, it satisfies our qualified injection point:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:209
-#, no-c-format
-msgid ""
-"<![CDATA[@CreditCard\n"
-"public class CreditCardPaymentProcessor \n"
-"    implements PaymentProcessor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:212
 #, no-c-format
 msgid ""
 "If a bean does not explicitly specify a qualifier, it has the default "
@@ -429,23 +328,20 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:225
 #, no-c-format
 msgid ""
 "That's not quite the end of the story. CDI also defines a simple "
 "<emphasis>resolution rule</emphasis> that helps the container decide what to "
 "do if there is more than one bean that satisfies a particular contract. "
-"We'll get into the details in <xref linkend=\"injection\"/>."
+"We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:245
 #, no-c-format
 msgid "Scope"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:248
 #, no-c-format
 msgid ""
 "The <emphasis>scope</emphasis> of a bean defines the lifecycle and "
@@ -456,23 +352,13 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:255
 #, no-c-format
 msgid ""
 "For example, any web application may have <emphasis>session scoped</"
 "emphasis> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:259
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:261
 #, no-c-format
 msgid ""
 "An instance of a session-scoped bean is bound to a user session and is "
@@ -480,7 +366,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:265
 #, no-c-format
 msgid ""
 "Keep in mind that once a bean is bound to a context, it remains in that "
@@ -491,7 +376,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:273
 #, no-c-format
 msgid ""
 "If a scope is not explicitly specified, then the bean belongs to a special "
@@ -501,19 +385,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:279
 #, no-c-format
-msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\"/>."
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:284
 #, no-c-format
 msgid "EL name"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:286
 #, no-c-format
 msgid ""
 "If you want to reference a bean in non-Java code that supports Unified EL "
@@ -522,38 +403,18 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:291
 #, no-c-format
 msgid ""
 "The EL name is specified using the <literal>@Named</literal> annotation, as "
 "shown here:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:295
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named(\"cart\")\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:297
 #, no-c-format
 msgid "Now we can easily use the bean in any JSF or JSP page:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:299
-#, no-c-format
-msgid ""
-"<![CDATA[<h:dataTable value=\"#{cart.lineItems}\" var=\"item\">\n"
-"   ...\n"
-"</h:dataTable>]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:302
 #, no-c-format
 msgid ""
 "The <literal>@Named</literal> annotation is not what makes the class a bean. "
@@ -563,23 +424,13 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:309
 #, no-c-format
 msgid ""
 "We can let CDI choose a name for us by leaving off the value of the "
 "<literal>@Named</literal> annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:313
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:315
 #, no-c-format
 msgid ""
 "The name defaults to the unqualified class name, decapitalized; in this "
@@ -587,13 +438,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:325
 #, no-c-format
 msgid "Alternatives"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:327
 #, no-c-format
 msgid ""
 "We've already seen how qualifiers let us choose between multiple "
@@ -605,42 +454,30 @@
 "literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:335
-#, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class MockPaymentProcessor extends PaymentProcessorImpl { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:337
 #, no-c-format
 msgid ""
 "We normally annotate a bean <literal>@Alternative</literal> only when there "
 "is some other implementation of an interface it implements (or of any of its "
 "bean types). We can choose between alternatives at deployment time by "
 "<emphasis>selecting</emphasis> an alternative in the CDI deployment "
-"descriptor <literal>META-INF/beans.xml</literal> of the JAR or Java EE "
+"descriptor <literal>META-INF/beans.xml</literal> of the jar or Java EE "
 "module that uses it. Different modules can specify that they use different "
 "alternatives."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:345
 #, no-c-format
 msgid ""
-"We cover alternatives in more detail in <xref linkend=\"alternatives\"/>."
+"We cover alternatives in more detail in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:352
 #, no-c-format
 msgid "Interceptor binding types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:354
 #, no-c-format
 msgid ""
 "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, "
@@ -651,7 +488,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:361
 #, no-c-format
 msgid ""
 "The way that interceptors were defined in Java EE 5 was counter-intuitive. "
@@ -668,7 +504,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:372
 #, no-c-format
 msgid ""
 "CDI provides a new approach to binding interceptors to beans that introduces "
@@ -678,7 +513,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:378
 #, no-c-format
 msgid ""
 "An interceptor binding type is a user-defined annotation that is itself "
@@ -687,51 +521,21 @@
 "two classes."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:383
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Inherited\n"
-"@Target( { TYPE, METHOD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:385
 #, no-c-format
 msgid ""
 "The interceptor that implements transaction management declares this "
 "annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[public @Transactional @Interceptor\n"
-"class TransactionInterceptor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:391
 #, no-c-format
 msgid ""
 "We can apply the interceptor to a bean by annotating the bean class with the "
 "same interceptor binding type:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:395
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Transactional\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:397
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
@@ -740,32 +544,28 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:402
 #, no-c-format
 msgid ""
 "Interceptors are deployment-specific. (We don't need a "
 "<literal>TransactionInterceptor</literal> in our unit tests!) By default, an "
 "interceptor is disabled. We can enable an interceptor using the CDI "
-"deployment descriptor <literal>META-INF/beans.xml</literal> of the JAR or "
+"deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or "
 "Java EE module. This is also where we specify the interceptor ordering."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:409
 #, no-c-format
 msgid ""
 "We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
-"\"interceptors\"/> and <xref linkend=\"decorators\"/>."
+"\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:419
 #, no-c-format
 msgid "What kinds of classes are beans?"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:421
 #, no-c-format
 msgid ""
 "We've already seen two types of beans: JavaBeans and EJB session beans. Is "
@@ -774,13 +574,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:428
 #, no-c-format
 msgid "Managed beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:430
 #, no-c-format
 msgid ""
 "A managed bean is a Java class. The basic lifecycle and semantics of a "
@@ -792,19 +590,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:441
 #, no-c-format
 msgid "It is not a non-static inner class."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:444
 #, no-c-format
 msgid "It is a concrete class, or is annotated <literal>@Decorator</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:447
 #, no-c-format
 msgid ""
 "It is not annotated with an EJB component-defining annotation or declared as "
@@ -812,7 +607,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:453
 #, no-c-format
 msgid ""
 "It does not implement <literal>javax.enterprise.inject.spi.Extension</"
@@ -820,34 +614,41 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:456
 #, no-c-format
-msgid "It has an appropriate constructor&#8212;either:"
+msgid "It has an appropriate constructor—either:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:461
 #, no-c-format
 msgid "the class has a constructor with no parameters, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:464
 #, no-c-format
 msgid "the class declares a constructor annotated <literal>@Inject</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:472
 #, no-c-format
 msgid ""
+"According to this definition, JPA entities are technically managed beans. "
+"However, entities have their own special lifecycle, state and identity model "
+"and are usually instantiated by JPA or using <literal>new</literal>. "
+"Therefore we don't recommend directly injecting an entity class. We "
+"especially recommend against assigning a scope other than "
+"<literal>@Dependent</literal> to an entity class, since JPA is not able to "
+"persist injected CDI proxies."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The unrestricted set of bean types for a managed bean contains the bean "
 "class, every superclass and all interfaces it implements directly or "
 "indirectly."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:475
 #, no-c-format
 msgid ""
 "If a managed bean has a public field, it must have the default scope "
@@ -855,7 +656,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:477
 #, no-c-format
 msgid ""
 "Managed beans support the <literal>@PostConstruct</literal> and "
@@ -863,7 +663,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:480
 #, no-c-format
 msgid ""
 "Session beans are also, technically, managed beans. However, since they have "
@@ -873,13 +672,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:489
 #, no-c-format
 msgid "Session beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:491
 #, no-c-format
 msgid ""
 "Session beans belong to the EJB specification. They have a special "
@@ -892,7 +689,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:500
 #, no-c-format
 msgid ""
 "Message-driven and entity beans are by nature non-contextual objects and may "
@@ -904,7 +700,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:508
 #, no-c-format
 msgid ""
 "The unrestricted set of bean types for a session bean contains all local "
@@ -916,7 +711,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:516
 #, no-c-format
 msgid ""
 "There's no reason to explicitly declare the scope of a stateless session "
@@ -927,20 +721,18 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:520
 #, no-c-format
 msgid ""
 "Stateful session beans may define a <emphasis>remove method</emphasis>, "
 "annotated <literal>@Remove</literal>, that is used by the application to "
 "indicate that an instance should be destroyed. However, for a contextual "
-"instance of the bean&#8212;an instance under the control of CDI&#8212;this "
-"method may only be called by the application if the bean has scope "
-"<literal>@Dependent</literal>. For beans with other scopes, the application "
-"must let the container destroy the bean."
+"instance of the bean—an instance under the control of CDI—this method may "
+"only be called by the application if the bean has scope <literal>@Dependent</"
+"literal>. For beans with other scopes, the application must let the "
+"container destroy the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:528
 #, no-c-format
 msgid ""
 "So, when should we use a session bean instead of a plain managed bean? "
@@ -948,19 +740,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:535
 #, no-c-format
 msgid "method-level transaction management and security,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:538
 #, no-c-format
 msgid "concurrency management,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:541
 #, no-c-format
 msgid ""
 "instance-level passivation for stateful session beans and instance-pooling "
@@ -968,19 +757,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:545
 #, no-c-format
 msgid "remote or web service invocation, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:548
 #, no-c-format
 msgid "timers and asynchronous methods,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:552
 #, no-c-format
 msgid ""
 "When we don't need any of these things, an ordinary managed bean will serve "
@@ -988,7 +774,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:554
 #, no-c-format
 msgid ""
 "Many beans (including any <literal>@SessionScoped</literal> or "
@@ -998,7 +783,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:560
 #, no-c-format
 msgid ""
 "Beans which hold references to heavy-weight resources, or hold a lot of "
@@ -1008,7 +792,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:566
 #, no-c-format
 msgid ""
 "Finally, it's usually obvious when method-level transaction management, "
@@ -1017,7 +800,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:571
 #, no-c-format
 msgid ""
 "The point we're trying to make is: use a session bean when you need the "
@@ -1030,7 +812,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:579
 #, no-c-format
 msgid ""
 "On the other hand, don't be scared to use session beans just because you've "
@@ -1043,13 +824,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:590
 #, no-c-format
 msgid "Producer methods"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:592
 #, no-c-format
 msgid ""
 "Not everything that needs to be injected can be boiled down to a bean class "
@@ -1061,7 +840,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:600
 #, no-c-format
 msgid ""
 "A <emphasis>producer method</emphasis> is a method that acts as a source of "
@@ -1072,64 +850,31 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:607
 #, no-c-format
 msgid ""
 "A producer method is declared by annotating a method of a bean class with "
 "the <literal>@Produces</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:612
-#, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class RandomNumberGenerator {\n"
-"   \n"
-"   private Random random = new Random(System.currentTimeMillis());\n"
-"       \n"
-"   @Produces @Named @Random int getRandomNumber() {\n"
-"      return random.nextInt(100);\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:614
 #, no-c-format
 msgid ""
 "We can't write a bean class that is itself a random number. But we can "
 "certainly write a method that returns a random number. By making the method "
-"a producer method, we allow the return value of the method&#8212;in this "
-"case an <literal>Integer</literal>&#8212;to be injected. We can even specify "
-"a qualifier&#8212;in this case <literal>@Random</literal>, a scope&#8212;"
-"which in this case defaults to <literal>@Dependent</literal>, and an EL "
-"name&#8212;which in this case defaults to <literal>randomNumber</literal> "
-"according to the JavaBeans property name convention. Now we can get a random "
-"number anywhere:"
+"a producer method, we allow the return value of the method—in this case an "
+"<literal>Integer</literal>—to be injected. We can even specify a qualifier—"
+"in this case <literal>@Random</literal>, a scope—which in this case defaults "
+"to <literal>@Dependent</literal>, and an EL name—which in this case defaults "
+"to <literal>randomNumber</literal> according to the JavaBeans property name "
+"convention. Now we can get a random number anywhere:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:623
-#, no-c-format
-msgid "<![CDATA[@Inject @Random int randomNumber;]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:625
 #, no-c-format
 msgid "Even in a Unified EL expression:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:629
-#, no-c-format
-msgid "<![CDATA[<p>Your raffle number is #{randomNumber}.</p>]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:631
 #, no-c-format
 msgid ""
 "A producer method must be a non-abstract method of a managed bean class or "
@@ -1139,13 +884,11 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:637
 #, no-c-format
 msgid "The bean types of a producer method depend upon the method return type:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:643
 #, no-c-format
 msgid ""
 "If the return type is an interface, the unrestricted set of bean types "
@@ -1154,7 +897,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:649
 #, no-c-format
 msgid ""
 "If a return type is primitive or is a Java array type, the unrestricted set "
@@ -1163,7 +905,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:655
 #, no-c-format
 msgid ""
 "If the return type is a class, the unrestricted set of bean types contains "
@@ -1172,59 +913,43 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:662
 #, no-c-format
 msgid ""
-"If the producer method has method parameters, the container will look for a "
-"bean that satisfies the type and qualifiers of each parameter and pass it to "
-"the method automatically&#8212;another form of dependency injection."
+"Producer methods and fields may have a primitive bean type. For the purpose "
+"of resolving dependencies, primitive types are considered to be identical to "
+"their corresponding wrapper types in <literal>java.lang</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:668
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Produces Set<Roles> getRoles(User user) {\n"
-"   return user.getRoles();\n"
-"}]]>"
+"If the producer method has method parameters, the container will look for a "
+"bean that satisfies the type and qualifiers of each parameter and pass it to "
+"the method automatically—another form of dependency injection."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:670
 #, no-c-format
 msgid ""
 "We'll talk much more about producer methods in <xref linkend="
-"\"producermethods\"/>."
+"\"producermethods\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:675
 #, no-c-format
 msgid "Producer fields"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:677
 #, no-c-format
 msgid ""
 "A <emphasis>producer field</emphasis> is a simpler alternative to a producer "
 "method. A producer field is declared by annotating a field of a bean class "
-"with the <literal>@Produces</literal> annotation&#8212;the same annotation "
-"used for producer methods."
+"with the <literal>@Produces</literal> annotation—the same annotation used "
+"for producer methods."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:683
-#, no-c-format
-msgid ""
-"<![CDATA[public class Shop {\n"
-"   @Produces PaymentProcessor paymentProcessor = ....;\n"
-"   @Produces @Catalog List<Product> products = ....;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:685
 #, no-c-format
 msgid ""
 "The rules for determining the bean types of a producer field parallel the "
@@ -1232,415 +957,12 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:689
 #, no-c-format
 msgid ""
 "A producer field is really just a shortcut that lets us avoid writing a "
 "useless getter method. However, in addition to convenience, producer fields "
 "serve a specific purpose as an adaptor for Java EE component environment "
 "injection, but to learn more about that, you'll have to wait until <xref "
-"linkend=\"resources\"/>. Because we can't wait to get to work on some "
+"linkend=\"resources\" />. Because we can't wait to get to work on some "
 "examples."
 msgstr ""
-
-#. Tag: title
-#: beans.xml:701
-#, no-c-format
-msgid "The (minimal) bean descriptor"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:703
-#, no-c-format
-msgid ""
-"First, it's important to understand that the XML bean descriptor in CDI "
-"(beans.xml) is not there to define beans in XML, like in other popular bean "
-"containers. Rather, you use this file to enable CDI services for the current "
-"bean archive that is difficult to define consistently in Java or which you "
-"don't want to define in Java (e.g., to accomodate testing)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:710
-#, no-c-format
-msgid ""
-"For example, the XML is used to enable interceptors (which are disabled by "
-"default) and define interceptor ordering. So the bean descriptor "
-"<emphasis>complements</emphasis> the metadata that is provided in the Java "
-"language syntax. (You may still want to define beans in XML for other "
-"reasons, but that is the concern of an extension)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:717
-#, no-c-format
-msgid ""
-"Let's first ask why the beans.xml is required, then look at what services it "
-"is used used to enable."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:722
-#, no-c-format
-msgid "Why is beans.xml required?"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:724
-#, no-c-format
-msgid ""
-"You may be wondering, if beans are not described using XML, why do we need "
-"beans.xml at all, particularly if you don't have anything that you would "
-"need the bean descriptor to enable (alternatives, interceptors or "
-"decorators)?"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:730
-#, no-c-format
-msgid "There are two things about CDI that we need to keep in mind:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:736
-#, no-c-format
-msgid ""
-"CDI does not require any special declaration for a Java class to be injected "
-"- that's right, no annotation or XML declaration at all!"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:742
-#, no-c-format
-msgid ""
-"CDI does not define any special kind of module - CDI beans can be deployed "
-"in a library JAR, EJB JAR, WAR, RAR, or JVM classpath directory."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:749
-#, no-c-format
-msgid ""
-"The CDI specification calls the process of identifying beans in modules "
-"<emphasis>bean discovery</emphasis>."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:753
-#, no-c-format
-msgid ""
-"So there are potentially a lot of classes in the classpath which might be "
-"beans! We don't want to force the container to scan every one of those "
-"classes at startup and build its internal metamodel for each of them. This "
-"really could make bean discovery very slow."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:759
-#, no-c-format
-msgid ""
-"But there's another reason we need to give the user some control over which "
-"classes are available for injection. We don't want every class in the "
-"classpath to potentially match an injection point, including classes that "
-"were never intended to be injected into things. This would force the "
-"developer to have to use qualifiers much more often to disambiguate "
-"injection points."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:766
-#, no-c-format
-msgid "So we have two choices. We could have the developer:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:772
-#, no-c-format
-msgid "explicitly exclude modules which do not contain beans, or"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:775
-#, no-c-format
-msgid "explicitly declare modules which do contain beans."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:779
-#, no-c-format
-msgid ""
-"It should be clear that the second option is a much better way to go. Thus, "
-"CDI has the notion of a bean archive. A bean archive is just a module that "
-"has a file named beans.xml in the META-INF directory. The container looks "
-"for beans in bean archives. It ignores other modules."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:785
-#, no-c-format
-msgid ""
-"Now, you might be wondering if we've got the granularity wrong here. Why "
-"should module be the right criteria to use for including/excluding a class. "
-"Why not consider:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:792
-#, no-c-format
-msgid "a class-level annotation,"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:795
-#, no-c-format
-msgid "the package,"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:798
-#, no-c-format
-msgid "some type it implements or extends, or"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:801
-#, no-c-format
-msgid "some naming convention."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:805
-#, no-c-format
-msgid ""
-"We've got the first option covered. Annotate a bean <literal>@Alternative</"
-"literal>, or with an alternative stereotype, and it will be considered "
-"disabled by CDI, as long as you don't explicitly enable it in beans.xml. "
-"That's not quite the same thing as excluding the class from scanning "
-"altogether, but it's close. (One difference is that a portable extension "
-"with still get a <literal>ProcessAnnotatedType</literal> event for that "
-"class)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:813
-#, no-c-format
-msgid ""
-"A future version of CDI might allow you to declare excluded packages in "
-"beans.xml. Excluding a bean by type or naming convention isn't really that "
-"appealing. In the world of CDI, we use stereotypes for identifying "
-"architectural roles. We don't use marker interfaces or naming conventions. "
-"Names really shouldn't affect functionality as it is too fragile."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:820
-#, no-c-format
-msgid "Enough theory, what elements are available in beans.xml?"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:826
-#, no-c-format
-msgid "Bean descriptor schema"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:828
-#, no-c-format
-msgid ""
-"If you don't need to activate any interceptors, decorators or alternatives "
-"(you just have plain beans that you need to use in an archive), the beans."
-"xml file can be <emphasis>empty</emphasis>. If you do have one of these "
-"requirements, then you need to start popularing the descriptor."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:834
-#, no-c-format
-msgid ""
-"The root element of a beans.xml file is <literal>beans</literal>, with the "
-"following <ulink url=\"http://anonsvn.jboss.org/repos/weld/api/trunk/cdi/src/"
-"main/resources/beans.xsd\">schema</ulink>:"
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:839
-#, no-c-format
-msgid ""
-"<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<beans xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee \n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"</beans>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:841
-#, no-c-format
-msgid ""
-"The <literal>beans</literal> element can have one or more of each of the "
-"following children:"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:847
-#, no-c-format
-msgid "interceptors"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:850
-#, no-c-format
-msgid "decorators"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:853
-#, no-c-format
-msgid "alternatives"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:857
-#, no-c-format
-msgid "Let's look at each element in detail."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:862
-#, no-c-format
-msgid "&lt;interceptors&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:864
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled interceptors bound via interceptor "
-"bindings. An interceptor must be explicitly enabled by listing the fully "
-"qualified class name in a child &lt;class&gt; element of &lt;"
-"interceptors&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:870
-#, no-c-format
-msgid ""
-"There may be zero or more interceptor class elements. The order of the class "
-"declarations determines the interceptor ordering. Interceptors which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an interceptor "
-"class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:877
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.intercept.SecurityInterceptor</class>\n"
-"   <class>com.acme.intercept.TransactionInterceptor</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:883
-#, no-c-format
-msgid "&lt;decorators&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:885
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled decorators. A decorator must be "
-"explicitly enabled by listing the fully qualified class name in a child &lt;"
-"class&gt; element of &lt;decorators&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:891
-#, no-c-format
-msgid ""
-"There may be zero or more decorator class elements. The order of the class "
-"declarations determines the decorator ordering. Decorators which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an decorator class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:898
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.decorate.BigAccountDecorator</class>\n"
-"   <class>com.acme.decorate.SpecialGiftDecorator</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:903
-#, no-c-format
-msgid "&lt;alternatives&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:905
-#, no-c-format
-msgid ""
-"An alternative is a bean that must be explicitly declared in the beans.xml "
-"file if it should be available for lookup, injection or EL resolution. By "
-"default, a bean archive has no active alternatives. An alternative must be "
-"explicitly declared using the fully qualified bean class name or stereotype "
-"class name in either a child &lt;class&gt; or &lt;stereotype&gt; element of "
-"&lt;alternatives&gt;, respectively."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:913
-#, no-c-format
-msgid ""
-"An alternative is selected for the bean archive if either: the alternative "
-"is a managed bean or session bean and the bean class of the bean is listed, "
-"or the alternative is a producer method, field or resource, and the bean "
-"class that declares the method or field is listed, or any "
-"<literal>@Alternative</literal> stereotype of the alternative is listed."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:920
-#, no-c-format
-msgid ""
-"There may be zero or more alternative bean class elements. The same class "
-"may not be listed twice. And of course, the class must exist and it must be "
-"an alternative bean class."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:925
-#, no-c-format
-msgid ""
-"There may also be zero or more <literal>@Alternative</literal> stereotype "
-"elements. The same stereotype may not be listed twice. And of course, the "
-"stereotype class must exist and it must be an stereotype annotation."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:931
-#, no-c-format
-msgid ""
-"<![CDATA[<stereotypes>\n"
-"   <class>com.acme.business.MockPaymentProcessor</class>\n"
-"   <stereotype>com.acme.stereotype.Mock</stereotype>\n"
-"</stereotypes>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:935
-#, no-c-format
-msgid ""
-"And that's it! A very simple schema, used only to activate and order CDI "
-"services."
-msgstr ""

Modified: doc/trunk/reference/fr-FR/decorators.po
===================================================================
--- doc/trunk/reference/fr-FR/decorators.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/decorators.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-02 22:25+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: decorators.xml:5
 #, no-c-format
 msgid "Decorators"
 msgstr "Décorateurs"
 
 #. Tag: para
-#: decorators.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors are a powerful way to capture and separate concerns which are "
@@ -41,7 +39,6 @@
 "approprié pour séparer problèmes <emphasis>métiers<emphasis>."
 
 #. Tag: para
-#: decorators.xml:15
 #, fuzzy, no-c-format
 msgid ""
 "The reverse is true of <emphasis>decorators</emphasis>. A decorator "
@@ -63,31 +60,11 @@
 "problèmes techniques qui peuvent toucher des types très disparates."
 
 #. Tag: para
-#: decorators.xml:24
 #, no-c-format
 msgid "Suppose we have an interface that represents accounts:"
 msgstr "Supposez que nous ayons une interfaces représentant des comptes:"
 
-#. Tag: programlisting
-#: decorators.xml:26
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface Account {\n"
-"   public BigDecimal getBalance();\n"
-"   public User getOwner();\n"
-"   public void withdraw(BigDecimal amount);\n"
-"   public void deposit(BigDecimal amount);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface Account {\n"
-"    public BigDecimal getBalance();\n"
-"    public User getOwner();\n"
-"    public void withdraw(BigDecimal amount);\n"
-"    public void deposit(BigDecimal amount);\n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:28
 #, fuzzy, no-c-format
 msgid ""
 "Several different beans in our system implement the <literal>Account</"
@@ -102,7 +79,6 @@
 "d'utilisation idéal d'un décorateur."
 
 #. Tag: para
-#: decorators.xml:34
 #, fuzzy, no-c-format
 msgid ""
 "A decorator is a bean (possibly even an abstract class) that implements the "
@@ -111,74 +87,14 @@
 "Un décorateur est un simple Web Bean qui implémente le type qu'il décore, et "
 "qui est annoté <literal>@Decorator</literal>."
 
-#. Tag: programlisting
-#: decorators.xml:39
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[<Decorators>\n"
-"    <myapp:LargeTransactionDecorator/>\n"
-"</Decorators>]]>"
-
 #. Tag: para
-#: decorators.xml:41
 #, no-c-format
 msgid ""
 "The decorator implements the methods of the decorated type that it wants to "
 "intercept."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:45
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      ...\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator \n"
-"        implements Account {\n"
-"    \n"
-"    @Decorates Account account;\n"
-"    \n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    public void withdraw(BigDecimal amount) {\n"
-"        account.withdraw(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedWithdrawl(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"    public void deposit(BigDecimal amount);\n"
-"        account.deposit(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedDeposit(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "Unlike other beans, a decorator may be an abstract class. Therefore, if "
@@ -191,7 +107,6 @@
 "d'implémenter cette méthode."
 
 #. Tag: para
-#: decorators.xml:52
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors for a method are called before decorators that apply to the "
@@ -201,13 +116,11 @@
 "s'appliquent à cette méthode."
 
 #. Tag: title
-#: decorators.xml:57
 #, fuzzy, no-c-format
 msgid "Delegate object"
 msgstr "Attributs de délégation"
 
 #. Tag: para
-#: decorators.xml:59
 #, no-c-format
 msgid ""
 "Decorators have a special injection point, called the <emphasis>delegate "
@@ -217,39 +130,23 @@
 "method parameter or injected field."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:67
 #, fuzzy, no-c-format
 msgid "A decorator is bound to any bean which:"
 msgstr "Un décorateur est lié à tout Web Bean qui:"
 
 #. Tag: para
-#: decorators.xml:71
 #, fuzzy, no-c-format
 msgid "has the type of the delegate injection point as a bean type, and"
 msgstr "a le type de l'attribut de délégation comme type d'API, et"
 
 #. Tag: para
-#: decorators.xml:74
 #, fuzzy, no-c-format
 msgid "has all qualifiers that are declared at the delegate injection point."
 msgstr ""
 "a tous les types de liaison qui sont déclarés par l'attribut de délégation."
 
 #. Tag: para
-#: decorators.xml:78
 #, fuzzy, no-c-format
 msgid ""
 "This delegate injection point specifies that the decorator is bound to all "
@@ -258,14 +155,7 @@
 "L'attribut de délégation spécifie que le décorateur est lié à tous les Web "
 "Beans qui impémentent <literal>Account</literal>:"
 
-#. Tag: programlisting
-#: decorators.xml:83
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
-msgstr "<![CDATA[@Decorates Account account;]]>"
-
 #. Tag: para
-#: decorators.xml:85
 #, fuzzy, no-c-format
 msgid ""
 "A delegate injection point may specify any number of qualifier annotations. "
@@ -274,14 +164,7 @@
 "Un attribut de délégation peut spécifier une annotation de liaison. Alors, "
 "le décorateur sera seulement lié à tous les Web Beans ayant la même liaison."
 
-#. Tag: programlisting
-#: decorators.xml:90
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
-msgstr "<![CDATA[@Decorates @Foreign Account account;]]>"
-
 #. Tag: para
-#: decorators.xml:92
 #, fuzzy, no-c-format
 msgid ""
 "The decorator may invoke the delegate object, which has much the same effect "
@@ -293,64 +176,12 @@
 "que d'appeler <literal>InvocationContext.proceed()</literal> à partir d'un "
 "intercepteur."
 
-#. Tag: programlisting
-#: decorators.xml:98
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      account.withdraw(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedWithdrawl(amount) );\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      account.deposit(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedDeposit(amount) );\n"
-"      }\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator \n"
-"        implements Account {\n"
-"    \n"
-"    @Decorates Account account;\n"
-"    \n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    public void withdraw(BigDecimal amount) {\n"
-"        account.withdraw(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedWithdrawl(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"    public void deposit(BigDecimal amount);\n"
-"        account.deposit(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedDeposit(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: title
-#: decorators.xml:103
 #, no-c-format
 msgid "Enabling decorators"
 msgstr "Activation des décorateurs"
 
 #. Tag: para
-#: decorators.xml:105
 #, no-c-format
 msgid ""
 "By default, all decorators are disabled. We need to <emphasis>enable</"
@@ -358,24 +189,7 @@
 "bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:111
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <decorators>\n"
-"         <class>org.mycompany.myapp.LargeTransactionDecorator</class>\n"
-"   </decorators>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:113
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
@@ -385,7 +199,6 @@
 "<literal>&lt;Interceptors&gt;</literal> pour les intercepteurs:"
 
 #. Tag: para
-#: decorators.xml:120
 #, no-c-format
 msgid ""
 "it enables us to specify a total ordering for all decorators in our system, "
@@ -395,14 +208,139 @@
 "notre système, assurant un comportement déterministe, et"
 
 #. Tag: para
-#: decorators.xml:126
 #, no-c-format
 msgid "it lets us enable or disable decorator classes at deployment time."
 msgstr ""
 "cela nous permet d'activer ou désactiver les classes de décorateurs au "
 "moment du déploiement."
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "   public BigDecimal getBalance();\n"
+#~ "   public User getOwner();\n"
+#~ "   public void withdraw(BigDecimal amount);\n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "    public BigDecimal getBalance();\n"
+#~ "    public User getOwner();\n"
+#~ "    public void withdraw(BigDecimal amount);\n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[<Decorators>\n"
+#~ "    <myapp:LargeTransactionDecorator/>\n"
+#~ "</Decorators>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator \n"
+#~ "        implements Account {\n"
+#~ "    \n"
+#~ "    @Decorates Account account;\n"
+#~ "    \n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    public void withdraw(BigDecimal amount) {\n"
+#~ "        account.withdraw(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "        account.deposit(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedDeposit(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
+#~ msgstr "<![CDATA[@Decorates Account account;]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
+#~ msgstr "<![CDATA[@Decorates @Foreign Account account;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      account.withdraw(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      account.deposit(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedDeposit(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator \n"
+#~ "        implements Account {\n"
+#~ "    \n"
+#~ "    @Decorates Account account;\n"
+#~ "    \n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    public void withdraw(BigDecimal amount) {\n"
+#~ "        account.withdraw(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "        account.deposit(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedDeposit(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "All decorators have a <emphasis>delegate attribute</emphasis>. The type "
 #~ "and binding types of the delegate attribute determine which Web Beans the "
 #~ "decorator is bound to. The delegate attribute type must implement or "

Modified: doc/trunk/reference/fr-FR/dependencies.po
===================================================================
--- doc/trunk/reference/fr-FR/dependencies.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/dependencies.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: dependencies.xml:5
 #, no-c-format
 msgid "Weld project dependencies"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:7
 #, no-c-format
 msgid ""
 "This section lists compile-time and runtime dependencies for Weld. This list "
@@ -30,105 +28,88 @@
 msgstr ""
 
 #. Tag: title
-#: dependencies.xml:13
 #, no-c-format
 msgid "Artifacts coming from Sun"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:21 dependencies.xml:110
 #, no-c-format
 msgid "Artifact"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:24 dependencies.xml:113
 #, no-c-format
 msgid "Scope"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:33
+#. Tag: para
 #, no-c-format
-msgid "javax.ejb:ejb-api:3.1"
+msgid "<literal>javax.ejb:ejb-api:3.1</literal>"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:36 dependencies.xml:44 dependencies.xml:52
-#: dependencies.xml:60 dependencies.xml:68 dependencies.xml:76
-#: dependencies.xml:128
 #, no-c-format
 msgid "compile"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:41
+#. Tag: para
 #, no-c-format
-msgid "javax.faces:jsf-api:2.0"
+msgid "<literal>javax.faces:jsf-api:2.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:49
+#. Tag: para
 #, no-c-format
-msgid "javax.el:el-api:2.1"
+msgid "<literal>javax.el:el-api:2.1</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:57
+#. Tag: para
 #, no-c-format
-msgid "javax.persistence:persistence-api:2.0"
+msgid "<literal>javax.persistence:persistence-api:2.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:65
+#. Tag: para
 #, no-c-format
-msgid "javax.servlet:servlet-api:3.0"
+msgid "<literal>javax.servlet:servlet-api:3.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:73
+#. Tag: para
 #, no-c-format
-msgid "javax.interceptor:interceptor-api:1.1"
+msgid "<literal>javax.interceptor:interceptor-api:1.1</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:81
+#. Tag: para
 #, no-c-format
-msgid "org.glasfish.web:el-impl:2.1.2"
+msgid "<literal>org.glasfish.web:el-impl:2.1.2</literal>"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:84 dependencies.xml:92
 #, no-c-format
 msgid "runtime"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:89
+#. Tag: para
 #, no-c-format
-msgid "javax.faces:jsf-impl:2.0.x"
+msgid "<literal>javax.faces:jsf-impl:2.0.x</literal>"
 msgstr ""
 
 #. Tag: title
-#: dependencies.xml:101
 #, no-c-format
 msgid "Artifacts coming from Hibernate"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:116
 #, no-c-format
 msgid "Notes"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:125
+#. Tag: para
 #, no-c-format
-msgid "javax.validation:validation-api"
+msgid "<literal>javax.validation:validation-api</literal>"
 msgstr ""
 
-#. Tag: ulink
-#: dependencies.xml:131
+#. Tag: para
 #, no-c-format
-msgid "BVAL-193"
+msgid ""
+"<ulink url=\"http://opensource.atlassian.com/projects/hibernate/browse/BVAL-"
+"193\">BVAL-193</ulink>"
 msgstr ""

Modified: doc/trunk/reference/fr-FR/ee.po
===================================================================
--- doc/trunk/reference/fr-FR/ee.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/ee.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-02 22:49+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: ee.xml:4
 #, no-c-format
 msgid "Java EE integration"
 msgstr "Intégration dans Java EE"
 
 #. Tag: para
-#: ee.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "CDI is fully integrated into the Java EE environment. Beans have access to "
@@ -36,13 +34,11 @@
 "les Servlets et les Message-Driven Beans, qui ne sont pas des Web Beans."
 
 #. Tag: title
-#: ee.xml:13
 #, no-c-format
 msgid "Built-in beans"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:15
 #, no-c-format
 msgid ""
 "In the Java EE environment, the container provides the following built-in "
@@ -50,20 +46,17 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:22
 #, no-c-format
 msgid "the current JTA <literal>UserTransaction</literal>,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:27
 #, no-c-format
 msgid ""
 "a <literal>Principal</literal> representing the current caller identity,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:32
 #, no-c-format
 msgid ""
 "the default <ulink url=\"http://jcp.org/en/jsr/detail?id=303\">Bean "
@@ -71,7 +64,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:38
 #, no-c-format
 msgid ""
 "a <literal>Validator</literal> for the default <literal>ValidationFactory</"
@@ -79,7 +71,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:45
 #, no-c-format
 msgid ""
 "The CDI specification does not require the servlet context objects, "
@@ -95,32 +86,18 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:57
 #, no-c-format
 msgid ""
 "Oh, you <emphasis>really</emphasis> want to inject the "
 "<literal>FacesContext</literal>? Alright then, try this producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[class FacesContextProducer {\n"
-"   @Produces @RequestScoped FacesContext getFacesContext() {\n"
-"      return FacesContext.getCurrentInstance();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: ee.xml:67
 #, fuzzy, no-c-format
 msgid "Injecting Java EE resources into a bean"
 msgstr "Injecter des ressources Java EE dans un Web Bean"
 
 #. Tag: para
-#: ee.xml:69
 #, fuzzy, no-c-format
 msgid ""
 "All managed beans may take advantage of Java EE component environment "
@@ -135,51 +112,7 @@
 "Nous avons déjà vu quelques exemples de cela, bien que nous n'y ayons pas "
 "fait attention sur le moment:"
 
-#. Tag: programlisting
-#: ee.xml:76
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @Resource UserTransaction transaction;\n"
-"\n"
-"   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"throws Exception { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource Transaction transaction;\n"
-"\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"    \n"
-"}]]>"
-
-#. Tag: programlisting
-#: ee.xml:78
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Login implements Serializable {\n"
-"   @Inject Credentials credentials;\n"
-"   @PersistenceContext EntityManager userDatabase;\n"
-"    ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped\n"
-"public class Login {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @PersistenceContext EntityManager userDatabase;\n"
-"    \n"
-"    ...\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: ee.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "The Java EE <literal>@PostConstruct</literal> and <literal>@PreDestroy</"
@@ -193,7 +126,6 @@
 "est appelée après que <emphasis>toute</emphasis> injection ait été effectuée."
 
 #. Tag: para
-#: ee.xml:86
 #, no-c-format
 msgid ""
 "Of course, we advise that component environment injection be used to define "
@@ -201,13 +133,11 @@
 msgstr ""
 
 #. Tag: title
-#: ee.xml:94
 #, fuzzy, no-c-format
 msgid "Calling a bean from a servlet"
 msgstr "Appeler un Web Bean à partir d'un Servlet"
 
 #. Tag: para
-#: ee.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
@@ -217,55 +147,7 @@
 "Injectez simplement le Web Bean en utilisant les méthodes d'injection de "
 "champs ou de méthode d'initialisation."
 
-#. Tag: programlisting
-#: ee.xml:101
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Login extends HttpServlet {\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject Login login;\n"
-"\n"
-"   @Override\n"
-"   public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"      throws ServletException, IOException {\n"
-"      credentials.setUsername(request.getParameter(\"username\")):\n"
-"      credentials.setPassword(request.getParameter(\"password\")):\n"
-"      login.login();\n"
-"      if ( login.isLoggedIn() ) {\n"
-"         response.sendRedirect(\"/home.jsp\");\n"
-"      }\n"
-"      else {\n"
-"         response.sendRedirect(\"/loginError.jsp\");\n"
-"      }\n"
-"   }\n"
-"            \n"
-"}]]>"
-msgstr ""
-"public class Login extends HttpServlet {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @Current Login login;\n"
-"\n"
-"    @Override\n"
-"    public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"        throws ServletException, IOException {\n"
-"        credentials.setUsername( request.getAttribute(\"username\") ):\n"
-"        credentials.setPassword( request.getAttribute(\"password\") ):\n"
-"        login.login();\n"
-"        if ( login.isLoggedIn() ) {\n"
-"            response.sendRedirect(\"/home.jsp\");\n"
-"        }\n"
-"        else {\n"
-"            response.sendRedirect(\"/loginError.jsp\");\n"
-"        }\n"
-"    }\n"
-"            \n"
-"}"
-
 #. Tag: para
-#: ee.xml:103
 #, fuzzy, no-c-format
 msgid ""
 "Since instances of servlets are shared across all incoming threads, the bean "
@@ -278,13 +160,11 @@
 "<literal>Login</literal> pour la requête courante et la session HTTP."
 
 #. Tag: title
-#: ee.xml:112
 #, fuzzy, no-c-format
 msgid "Calling a bean from a message-driven bean"
 msgstr "Appeler un Web Bean à partir d'un Message-Driven Bean"
 
 #. Tag: para
-#: ee.xml:114
 #, no-c-format
 msgid ""
 "CDI injection applies to all EJBs, even when they aren't managed beans. In "
@@ -293,41 +173,13 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:119
 #, fuzzy, no-c-format
 msgid "You can even use CDI interceptor bindings for message-driven Beans."
 msgstr ""
 "Vous pouvez même utiliser des liaisons d'intercepteurs de Web Beans avec des "
 "Message-Driven Beans."
 
-#. Tag: programlisting
-#: ee.xml:121
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"   @Inject Inventory inventory;\n"
-"   @PersistenceContext EntityManager em;\n"
-"\n"
-"   public void onMessage(Message message) {\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"\n"
-"    @Current Inventory inventory;\n"
-"    @PersistenceContext EntityManager em;\n"
-"\n"
-"    public void onMessage(Message message) {\n"
-"        ...\n"
-"    }\n"
-"            \n"
-"}"
-
 #. Tag: para
-#: ee.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "Please note that there is no session or conversation context available when "
@@ -342,19 +194,16 @@
 "<literal>@ApplicationScoped</literal> sont disponibles."
 
 #. Tag: para
-#: ee.xml:129
 #, no-c-format
 msgid "But how about beans which <emphasis>send</emphasis> JMS messages?"
 msgstr ""
 
 #. Tag: title
-#: ee.xml:136
 #, no-c-format
 msgid "JMS endpoints"
 msgstr "Terminaisons JMS"
 
 #. Tag: para
-#: ee.xml:138
 #, no-c-format
 msgid ""
 "Sending messages using JMS can be quite complex, because of the number of "
@@ -378,96 +227,20 @@
 "de vie et son modèle de threads dont nous devons nous soucier."
 
 #. Tag: para
-#: ee.xml:147
 #, no-c-format
 msgid ""
 "You can use producer fields and methods to prepare all of these resources "
 "for injection into a bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[public class OrderResources {\n"
-"   @Resource(name=\"jms/ConnectionFactory\")\n"
-"   private ConnectionFactory connectionFactory;\n"
-"  \n"
-"   @Resource(name=\"jms/OrderQueue\")\n"
-"   private Queue orderQueue;\n"
-"  \n"
-"   @Produces @OrderConnection\n"
-"   public Connection createOrderConnection() throws JMSException {\n"
-"    return connectionFactory.createConnection();\n"
-"   }\n"
-"  \n"
-"   public void closeOrderConnection(@Disposes @OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      connection.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderSession\n"
-"   public Session createOrderSession(@OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      return connection.createSession(true, Session.AUTO_ACKNOWLEDGE);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderSession(@Disposes @OrderSession Session session)\n"
-"         throws JMSException {\n"
-"      session.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderMessageProducer\n"
-"   public MessageProducer createOrderMessageProducer(@OrderSession Session "
-"session)\n"
-"         throws JMSException {\n"
-"      return session.createProducer(orderQueue);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderMessageProducer(@Disposes @OrderMessageProducer "
-"MessageProducer producer)\n"
-"         throws JMSException {\n"
-"      producer.close();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: ee.xml:153
 #, no-c-format
 msgid ""
 "In this example, we can just inject the prepared <literal>MessageProducer</"
 "literal>, <literal>Connection</literal> or <literal>QueueSession</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:158
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject Order order;\n"
-"@Inject @OrderMessageProducer MessageProducer producer;\n"
-"@Inject @OrderSession QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"   MapMessage msg = orderSession.createMapMessage();\n"
-"   msg.setLong(\"orderId\", order.getId());\n"
-"   ...\n"
-"   producer.send(msg);\n"
-"}]]>"
-msgstr ""
-"@OrderProcessor QueueSender orderSender;\n"
-"@OrderProcessor QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"    MapMessage msg = orderSession.createMapMessage();\n"
-"    ...\n"
-"    orderSender.send(msg);\n"
-"}"
-
 #. Tag: para
-#: ee.xml:164
 #, fuzzy, no-c-format
 msgid ""
 "The lifecycle of the injected JMS objects is completely controlled by the "
@@ -477,22 +250,20 @@
 "gestionnaire de Web Beans."
 
 #. Tag: title
-#: ee.xml:171
 #, no-c-format
 msgid "Packaging and deployment"
 msgstr "Paquetage et déploiement"
 
 #. Tag: para
-#: ee.xml:173
 #, fuzzy, no-c-format
 msgid ""
 "CDI doesn't define any special deployment archive. You can package beans in "
-"JARs, EJB-JARs or WARs&#8212;any deployment location in the application "
-"classpath. However, the archive must be a \"bean archive\". That means each "
-"archive that contains beans <emphasis>must</emphasis> include a file named "
+"jars, ejb jars or wars—any deployment location in the application classpath. "
+"However, the archive must be a \"bean archive\". That means each archive "
+"that contains beans <emphasis>must</emphasis> include a file named "
 "<literal>beans.xml</literal> in the <literal>META-INF</literal> directory of "
 "the classpath or <literal>WEB-INF</literal> directory of the web root (for "
-"WAR archives). The file may be empty. Beans deployed in archives that do not "
+"war archives). The file may be empty. Beans deployed in archives that do not "
 "have a <literal>beans.xml</literal> file will not be available for use in "
 "the application."
 msgstr ""
@@ -506,7 +277,6 @@
 "xml</literal> ne seront pas disponibles pour utilisation dans l'application."
 
 #. Tag: para
-#: ee.xml:182
 #, fuzzy, no-c-format
 msgid ""
 "In an embeddable EJB container, beans may be deployed in any location in "
@@ -518,7 +288,137 @@
 "conteneur d'EJB lite. De nouveau, chaque emplacement doit contenir un "
 "fichier <literal>web-beans.xml</literal>."
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "throws Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource Transaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login implements Serializable {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @PersistenceContext EntityManager userDatabase;\n"
+#~ "    ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @PersistenceContext EntityManager userDatabase;\n"
+#~ "    \n"
+#~ "    ...\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Login extends HttpServlet {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject Login login;\n"
+#~ "\n"
+#~ "   @Override\n"
+#~ "   public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "      throws ServletException, IOException {\n"
+#~ "      credentials.setUsername(request.getParameter(\"username\")):\n"
+#~ "      credentials.setPassword(request.getParameter(\"password\")):\n"
+#~ "      login.login();\n"
+#~ "      if ( login.isLoggedIn() ) {\n"
+#~ "         response.sendRedirect(\"/home.jsp\");\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "            \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "public class Login extends HttpServlet {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @Current Login login;\n"
+#~ "\n"
+#~ "    @Override\n"
+#~ "    public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "        throws ServletException, IOException {\n"
+#~ "        credentials.setUsername( request.getAttribute(\"username\") ):\n"
+#~ "        credentials.setPassword( request.getAttribute(\"password\") ):\n"
+#~ "        login.login();\n"
+#~ "        if ( login.isLoggedIn() ) {\n"
+#~ "            response.sendRedirect(\"/home.jsp\");\n"
+#~ "        }\n"
+#~ "        else {\n"
+#~ "            response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "            \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "   @Inject Inventory inventory;\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "   public void onMessage(Message message) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "\n"
+#~ "    @Current Inventory inventory;\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "    public void onMessage(Message message) {\n"
+#~ "        ...\n"
+#~ "    }\n"
+#~ "            \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Order order;\n"
+#~ "@Inject @OrderMessageProducer MessageProducer producer;\n"
+#~ "@Inject @OrderSession QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "   MapMessage msg = orderSession.createMapMessage();\n"
+#~ "   msg.setLong(\"orderId\", order.getId());\n"
+#~ "   ...\n"
+#~ "   producer.send(msg);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@OrderProcessor QueueSender orderSender;\n"
+#~ "@OrderProcessor QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "    MapMessage msg = orderSession.createMapMessage();\n"
+#~ "    ...\n"
+#~ "    orderSender.send(msg);\n"
+#~ "}"
+
+#~ msgid ""
 #~ "There is one restriction to be aware of here: <literal>@PersistenceContext"
 #~ "(type=EXTENDED)</literal> is not supported for simple Web Beans."
 #~ msgstr ""

Modified: doc/trunk/reference/fr-FR/environments.po
===================================================================
--- doc/trunk/reference/fr-FR/environments.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/environments.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,22 +15,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: environments.xml:4
 #, no-c-format
 msgid "Application servers and environments supported by Weld"
 msgstr ""
 
 #. Tag: title
-#: environments.xml:7
 #, no-c-format
 msgid "Using Weld with JBoss AS"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:9
 #, no-c-format
 msgid ""
-"If you are using JBoss AS 5.2, no additional configuration is required to "
+"If you are using JBoss AS 6.0, no additional configuration is required to "
 "use Weld (or CDI for that matter). All you need to do is make your "
 "application a bean bean archive by adding <literal>META-INF/beans.xml</"
 "literal> to the classpath or <literal>WEB-INF/beans.xml</literal> to the web "
@@ -38,50 +35,39 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:15
 #, no-c-format
 msgid ""
 "Unfortunately, you can't use Weld with earlier versions of JBoss AS since "
 "they are missing key libraries. If you want to learn how to upgrade the "
-"built-in support on JBoss AS 5.2, then read on."
+"built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:20
 #, no-c-format
 msgid ""
-"Upgrading the Weld add-on is easy. The Weld distribution has a build that "
-"can take care of this task for you in a single command. First, we need to "
-"tell Weld where JBoss AS is located. Create a new file named <literal>local."
-"build.properties</literal> in the examples directory of the Weld "
-"distribution and assign the path of your JBoss AS installation to the "
-"property key <literal>jboss.home</literal>, as follows:"
+"If there is a newer release of Weld than what is included in the latest "
+"JBoss AS 6 release, upgrading the Weld add-on is easy. The Weld distribution "
+"includes a build script that can take care of this task for you in a single "
+"command."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:27
+#. Tag: para
 #, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"
+msgid ""
+"First, we need to tell Weld where JBoss AS is located. This information is "
+"communicated by assigning the <literal>JBOSS_HOME</literal> environment "
+"variable. In a bash shell, you can assign the environment variable as "
+"follows:"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:29
 #, no-c-format
 msgid ""
 "Now we can install the Weld deployer from the <literal>jboss-as</literal> "
 "directory of the Weld distribution:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:33
-#, no-c-format
-msgid ""
-"$> cd jboss-as\n"
-"$> ant update"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:36
 #, no-c-format
 msgid ""
 "A new deployer, <literal>weld.deployer</literal> is added to JBoss AS. This "
@@ -92,13 +78,11 @@
 msgstr ""
 
 #. Tag: title
-#: environments.xml:46
 #, no-c-format
 msgid "GlassFish"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:48
 #, no-c-format
 msgid ""
 "Weld is also built into GlassFish from V3 onwards. Since GlassFish V3 is the "
@@ -109,13 +93,11 @@
 msgstr ""
 
 #. Tag: title
-#: environments.xml:56
 #, no-c-format
 msgid "Servlet containers (such as Tomcat or Jetty)"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:58
 #, no-c-format
 msgid ""
 "While JSR-299 does not require support for servlet environments, Weld can be "
@@ -123,7 +105,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:64
 #, no-c-format
 msgid ""
 "There is a major limitation to using a servlet container. Weld doesn't "
@@ -134,7 +115,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:72
 #, no-c-format
 msgid ""
 "Weld should be used as a web application library in a servlet container. You "
@@ -145,62 +125,52 @@
 "could use its component jars:"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:84
+#. Tag: para
 #, no-c-format
-msgid "jsr299-api.jar"
+msgid "<literal>jsr299-api.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:89
+#. Tag: para
 #, no-c-format
-msgid "weld-api.jar"
+msgid "<literal>weld-api.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:94
+#. Tag: para
 #, no-c-format
-msgid "weld-spi.jar"
+msgid "<literal>weld-spi.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:99
+#. Tag: para
 #, no-c-format
-msgid "weld-core.jar"
+msgid "<literal>weld-core.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:104
+#. Tag: para
 #, no-c-format
-msgid "weld-logging.jar"
+msgid "<literal>weld-logging.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:109
+#. Tag: para
 #, no-c-format
-msgid "weld-servlet-int.jar"
+msgid "<literal>weld-servlet-int.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:114
+#. Tag: para
 #, no-c-format
-msgid "javassist.jar"
+msgid "<literal>javassist.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:119
+#. Tag: para
 #, no-c-format
-msgid "dom4j.jar"
+msgid "<literal>dom4j.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:124
+#. Tag: para
 #, no-c-format
-msgid "google-collections.jar"
+msgid "<literal>google-collections.jar</literal>"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:129
 #, no-c-format
 msgid ""
 "You also need to explicitly specify the servlet listener (used to boot Weld, "
@@ -208,24 +178,12 @@
 "literal> in the web root:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:137
 #, no-c-format
 msgid "Tomcat"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:139
 #, no-c-format
 msgid ""
 "Tomcat has a read-only JNDI, so Weld can't automatically bind the "
@@ -234,40 +192,14 @@
 "following contents:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:145
-#, no-c-format
-msgid ""
-"<![CDATA[<Context>\n"
-"   <Resource name=\"BeanManager\" \n"
-"      auth=\"Container\"\n"
-"      type=\"javax.enterprise.inject.spi.BeanManager\"\n"
-"      factory=\"org.jboss.weld.resources.ManagerObjectFactory\"/>\n"
-"</Context>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:147
 #, no-c-format
 msgid ""
 "and make it available to your deployment by adding this to the bottom of "
 "<literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[<resource-env-ref>\n"
-"   <resource-env-ref-name>BeanManager</resource-env-ref-name>\n"
-"   <resource-env-ref-type>\n"
-"      javax.enterprise.inject.spi.BeanManager\n"
-"   </resource-env-ref-type>\n"
-"</resource-env-ref>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:153
 #, no-c-format
 msgid ""
 "Tomcat only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -276,7 +208,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:158
 #, no-c-format
 msgid ""
 "Weld also supports Servlet injection in Tomcat. To enable this, place the "
@@ -284,22 +215,12 @@
 "literal>, and add the following to <literal>META-INF/context.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:164
-#, no-c-format
-msgid ""
-"<![CDATA[<Listener className=\"org.jboss.weld.environment.tomcat."
-"WeldLifecycleListener\"/>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:169
 #, no-c-format
 msgid "Jetty"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:171
 #, no-c-format
 msgid ""
 "Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind "
@@ -307,32 +228,7 @@
 "INF/jetty-env.xml</literal> with the following contents:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:176
-#, no-c-format
-msgid ""
-"<![CDATA[<!DOCTYPE Configure PUBLIC \"-//Mort Bay Consulting//DTD Configure//"
-"EN\"\n"
-"   \"http://jetty.mortbay.org/configure.dtd\">\n"
-"<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext"
-"\">\n"
-"   <New id=\"BeanManager\" class=\"org.mortbay.jetty.plus.naming.Resource"
-"\">\n"
-"      <Arg><Ref id=\"webAppCtx\"/></Arg> \n"
-"      <Arg>BeanManager</Arg>\n"
-"      <Arg>\n"
-"         <New class=\"javax.naming.Reference\">\n"
-"            <Arg>javax.enterprise.inject.spi.BeanManager</Arg> \n"
-"            <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>\n"
-"            <Arg/>\n"
-"         </New>\n"
-"      </Arg>\n"
-"   </New>\n"
-"</Configure>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:178
 #, no-c-format
 msgid ""
 "Notice that Jetty doesn't not have built-in support for an <literal>javax."
@@ -342,7 +238,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:184
 #, no-c-format
 msgid ""
 "Jetty only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -351,19 +246,16 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:189
 #, no-c-format
 msgid "Weld does not currently support Servlet injection in Jetty."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:198
 #, no-c-format
 msgid "Java SE"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:200
 #, no-c-format
 msgid ""
 "In addition to improved integration of the Enterprise Java stack, the "
@@ -376,7 +268,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:208
 #, no-c-format
 msgid ""
 "When executing in the SE environment the following features of Weld are "
@@ -384,7 +275,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:214
 #, no-c-format
 msgid ""
 "Managed beans with <literal>@PostConstruct</literal> and "
@@ -392,13 +282,11 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:220
 #, no-c-format
 msgid "Dependency injection with qualifiers and alternatives"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:225
 #, no-c-format
 msgid ""
 "<literal>@Application</literal>, <literal>@Dependent</literal> and "
@@ -406,43 +294,36 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:231
 #, no-c-format
 msgid "Interceptors and decorators"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:236
 #, no-c-format
 msgid "Stereotypes"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:241
 #, no-c-format
 msgid "Events"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:246
 #, no-c-format
 msgid "Portable extension support"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:252
 #, no-c-format
 msgid "EJB beans are not supported."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:257
 #, no-c-format
 msgid "CDI SE Module"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:259
 #, no-c-format
 msgid ""
 "Weld provides an extension which will boot a CDI bean manager in Java SE, "
@@ -450,26 +331,12 @@
 "command line parameters can be injected using either of the following:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:264
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters List<String> params;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: environments.xml:266
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters String[] paramsArray;]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:268
 #, no-c-format
 msgid "The second form is useful for compatibility with existing classes."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:273
 #, no-c-format
 msgid ""
 "The command line parameters do not become available for injection until the "
@@ -480,45 +347,26 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:282
 #, no-c-format
 msgid "Here's an example of a simple CDI SE application:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:286
-#, no-c-format
-msgid ""
-"<![CDATA[@Singleton\n"
-"public class HelloWorld\n"
-"{\n"
-"   public void printHello(@Observes ContainerInitialized event, @Parameters "
-"List<String> parameters) {\n"
-"       System.out.println(\"Hello \" + parameters.get(0));\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:292
 #, no-c-format
 msgid "Bootstrapping CDI SE"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:294
 #, no-c-format
 msgid "CDI SE applications can be bootstrapped in the following ways."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:300
 #, no-c-format
 msgid "The ContainerInitialized Event"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:302
 #, no-c-format
 msgid ""
 "Thanks to the power of CDI's typesafe event model, application developers "
@@ -530,27 +378,18 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:310
 #, no-c-format
 msgid ""
 "In this case your application can be started by calling the provided main "
 "method like so:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:313
-#, no-c-format
-msgid "<![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:319
 #, no-c-format
 msgid "Programatic Bootstrap API"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:321
 #, no-c-format
 msgid ""
 "For added flexibility, CDI SE also comes with a bootstrap API which can be "
@@ -559,90 +398,65 @@
 "classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:327
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class Weld\n"
-"{\n"
-"\n"
-"   /** Boots Weld and creates and returns a WeldContainer instance, through "
-"which\n"
-"    * beans and events can be accesed. */\n"
-"   public WeldContainer initialize() {...}\n"
-"\n"
-"   /** Convenience method for shutting down the container. */\n"
-"   public void shutdown() {...}\n"
-"\n"
-"}]]>"
+"Here's an example application main method which uses this API to initialize "
+"a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:329
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class WeldContainer\n"
-"{\n"
-"\n"
-"   /** Provides access to all beans within the application. */\n"
-"   public Instance<Object> instance() {...}\n"
-"\n"
-"   /** Provides access to all events within the application. */\n"
-"   public Event<Object> event() {...}\n"
-"\n"
-"   /** Provides direct access to the BeanManager. */\n"
-"   public BeanManager getBeanManager() {...}\n"
-"\n"
-"}]]>"
+"Alternatively the application could be started by firing a custom event "
+"which would then be observed by another simple bean. The following example "
+"fires <literal>MyEvent</literal> on startup."
 msgstr ""
 
-#. Tag: para
-#: environments.xml:331
+#. Tag: title
 #, no-c-format
-msgid ""
-"Here's an example application main method which uses this API to initialize "
-"a bean of type <literal>MyApplicationBean</literal>."
+msgid "Thread Context"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:334
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.instance().select(MyApplicationBean.class).get();\n"
-"   weld.shutdown();\n"
-"}]]>"
+"In contrast to Java EE applications, Java SE applications place no "
+"restrictions on developers regarding the creation and usage of threads. "
+"Therefore Weld SE provides a custom scope annotation, "
+"<literal>@ThreadScoped</literal>, and corresponding context implementation "
+"which can be used to bind bean instances to the current thread. It is "
+"intended to be used in scenarios where you might otherwise use "
+"<literal>ThreadLocal</literal>, and does in fact use <literal>ThreadLocal</"
+"literal> under the hood."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:336
 #, no-c-format
 msgid ""
-"Alternatively the application could be started by firing a custom event "
-"which would then be observed by another simple bean. The following example "
-"fires <literal>MyEvent</literal> on startup."
+"To use the @ThreadScoped annotation you need to enable the "
+"<literal>RunnableDecorator</literal> which 'listens' for all executions of "
+"<literal>Runnable.run()</literal> and decorates them by setting up the "
+"thread context beforehand, bound to the current thread, and destroying the "
+"context afterwards."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:340
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.event().select(MyEvent.class).fire( new MyEvent() );\n"
-"   weld.shutdown();\n"
-"}]]>"
+"It is not necessary to use @ThreadScoped in all multithreaded applications. "
+"The thread context is not intended as a replacement for defining your own "
+"application-specific contexts. It is generally only useful in situtations "
+"where you would otherwise have used ThreadLocal directly, which are "
+"typically rare."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:348
 #, no-c-format
 msgid "Setting the Classpath"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:350
 #, no-c-format
 msgid ""
 "Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld "

Modified: doc/trunk/reference/fr-FR/events.po
===================================================================
--- doc/trunk/reference/fr-FR/events.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/events.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-02 23:28+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: events.xml:4
 #, no-c-format
 msgid "Events"
 msgstr "Evènements"
 
 #. Tag: para
-#: events.xml:6
 #, no-c-format
 msgid ""
 "Dependency injection enables loose-coupling by allowing the implementation "
@@ -31,7 +29,6 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:13
 #, no-c-format
 msgid ""
 "This basic schema might sound like the familiar observer/observable pattern, "
@@ -39,7 +36,6 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:18
 #, no-c-format
 msgid ""
 "not only are event producers decoupled from observers; observers are "
@@ -49,7 +45,6 @@
 "mais les les observateurs sont complèment découplés des producteurs,"
 
 #. Tag: para
-#: events.xml:22
 #, no-c-format
 msgid ""
 "observers can specify a combination of \"selectors\" to narrow the set of "
@@ -59,7 +54,6 @@
 "limiter le nobmre de notifications d'évènemtns qu'ils vont recevoir, et"
 
 #. Tag: para
-#: events.xml:28
 #, fuzzy, no-c-format
 msgid ""
 "observers can be notified immediately, or can specify that delivery of the "
@@ -70,7 +64,6 @@
 "transaction courante"
 
 #. Tag: para
-#: events.xml:35
 #, no-c-format
 msgid ""
 "The CDI event notification facility uses more or less the same typesafe "
@@ -78,13 +71,11 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:39
 #, fuzzy, no-c-format
 msgid "Event payload"
 msgstr "Producteurs d'évènements"
 
 #. Tag: para
-#: events.xml:41
 #, no-c-format
 msgid ""
 "The event object carries state from producer to consumer. The event object "
@@ -96,35 +87,18 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:48
 #, no-c-format
 msgid ""
 "An event qualifier is just a normal qualifier, defined using "
 "<literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({FIELD, PARAMETER})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated {}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated { ... }]]>"
-
 #. Tag: title
-#: events.xml:57
 #, no-c-format
 msgid "Event observers"
 msgstr "Observateurs d'évènements"
 
 #. Tag: para
-#: events.xml:59
 #, fuzzy, no-c-format
 msgid ""
 "An <emphasis>observer method</emphasis> is a method of a bean with a "
@@ -133,18 +107,7 @@
 "Un <emphasis>méthode observatrice</emphasis> est une méthode d'un Web Bean "
 "avec un paramètre annoté <literal>@Observes</literal>."
 
-#. Tag: programlisting
-#: events.xml:64
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }]]>"
-
 #. Tag: para
-#: events.xml:66
 #, fuzzy, no-c-format
 msgid ""
 "The annotated parameter is called the <emphasis>event parameter</emphasis>. "
@@ -159,23 +122,12 @@
 "Beans. Quand un type de liaison est utilisé comme un sélecteur d'évènement, "
 "il est applé un <emphasis>type de liaison d'évènement</emphasis>."
 
-#. Tag: programlisting
-#: events.xml:72 events.xml:240
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:74
 #, fuzzy, no-c-format
 msgid ""
-"An observer method need not specify any event qualifiers&#8212;in this case "
-"it is interested in <emphasis>all</emphasis> events of a particular type. If "
-"it does specify qualifiers, it's only interested in events which have those "
+"An observer method need not specify any event qualifiers—in this case it is "
+"interested in <emphasis>all</emphasis> events of a particular type. If it "
+"does specify qualifiers, it's only interested in events which have those "
 "qualifiers."
 msgstr ""
 "Il n'est pas obligatoire de spécifier une quelconque liaison d'évènement sur "
@@ -185,7 +137,6 @@
 "ces liaisons d'évènements."
 
 #. Tag: para
-#: events.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "The observer method may have additional parameters, which are injection "
@@ -195,24 +146,12 @@
 "injectés en fonction de la sémantique usuelle d'injection de paramètres des "
 "méthodes de Web Beans:"
 
-#. Tag: programlisting
-#: events.xml:84
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document, User user) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document, User user) { ... }]]>"
-
 #. Tag: title
-#: events.xml:89
 #, no-c-format
 msgid "Event producers"
 msgstr "Producteurs d'évènements"
 
 #. Tag: para
-#: events.xml:91
 #, no-c-format
 msgid ""
 "Event producers fire events using an instance of the parameterized "
@@ -220,14 +159,7 @@
 "obtained by injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:96
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
-msgstr "<![CDATA[@Observable Event<Document> documentEvent]]>"
-
 #. Tag: para
-#: events.xml:98
 #, fuzzy, no-c-format
 msgid ""
 "A producer raises events by calling the <literal>fire()</literal> method of "
@@ -237,20 +169,12 @@
 "literal> de l'interface <literal>Event</literal, en passant un "
 "<emphasis>objet évènement</literal>:"
 
-#. Tag: programlisting
-#: events.xml:103
-#, no-c-format
-msgid "<![CDATA[documentEvent.fire(document);]]>"
-msgstr "<![CDATA[documentEvent.fire(document);]]>"
-
 #. Tag: para
-#: events.xml:105
 #, fuzzy, no-c-format
 msgid "This particular event will be delivered to every observer method that:"
 msgstr "Un évènement sera délivré à toute méthode observatrice qui:"
 
 #. Tag: para
-#: events.xml:111
 #, fuzzy, no-c-format
 msgid ""
 "has an event parameter to which the event object (the <literal>Document</"
@@ -259,13 +183,11 @@
 "a un paramètre d'évènement pour lequel l'objet évènement est assignable, et"
 
 #. Tag: para
-#: events.xml:115
 #, fuzzy, no-c-format
 msgid "specifies no qualifiers."
 msgstr "ne spécifie aucune liaison d'évènement."
 
 #. Tag: para
-#: events.xml:119
 #, fuzzy, no-c-format
 msgid ""
 "The container simply calls all the observer methods, passing the event "
@@ -280,19 +202,16 @@
 "est relancée par la méthode <literal>fire()</literal>."
 
 #. Tag: para
-#: events.xml:125
 #, no-c-format
 msgid "Qualifiers can be applied to an event in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: events.xml:131
 #, no-c-format
 msgid "by annotating the <literal>Event</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: events.xml:134
 #, no-c-format
 msgid ""
 "by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
@@ -300,19 +219,11 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:138
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is far simpler:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:142
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
-msgstr "<![CDATA[@Observable @Updated Event<Document> documentUpdatedEvent]]>"
-
 #. Tag: para
-#: events.xml:144
 #, fuzzy, no-c-format
 msgid ""
 "Then, every event fired via this instance of <literal>Event</literal> has "
@@ -324,14 +235,12 @@
 "observatrice qui:"
 
 #. Tag: para
-#: events.xml:151
 #, no-c-format
 msgid "has an event parameter to which the event object is assignable, and"
 msgstr ""
 "a un paramètre d'évènement pour lequel l'objet évènement est assignable, et"
 
 #. Tag: para
-#: events.xml:154
 #, fuzzy, no-c-format
 msgid ""
 "does not have any event qualifier <emphasis>except</emphasis> for the event "
@@ -342,7 +251,6 @@
 "les liaision d'évènements passées à <literal>fire()</literal>."
 
 #. Tag: para
-#: events.xml:161
 #, no-c-format
 msgid ""
 "The downside of annotating the injection point is that we can't specify the "
@@ -352,18 +260,7 @@
 "<literal>Event</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:167
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
-"(document);]]>"
-msgstr ""
-"<![CDATA[documentEvent.fire( document, new AnnotationLiteral<Updated>()"
-"{} );]]>"
-
 #. Tag: para
-#: events.xml:169
 #, no-c-format
 msgid ""
 "Events can have multiple event qualifiers, assembled using any combination "
@@ -372,13 +269,11 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:178
 #, fuzzy, no-c-format
 msgid "Conditional observer methods"
 msgstr "Observateurs transactionnels"
 
 #. Tag: para
-#: events.xml:180
 #, no-c-format
 msgid ""
 "By default, if there is no instance of an observer in the current context, "
@@ -388,25 +283,13 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:186
 #, no-c-format
 msgid ""
 "A conditional observer is specified by adding <literal>receive = IF_EXISTS</"
 "literal> to the <literal>@Observes</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = IF_EXISTS) "
-"@Updated Document d) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:193
 #, no-c-format
 msgid ""
 "A bean with scope <literal>@Dependent</literal> cannot be a conditional "
@@ -414,37 +297,16 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:200
 #, fuzzy, no-c-format
 msgid "Event qualifiers with members"
 msgstr "Liaison d'évènement avec des membres"
 
 #. Tag: para
-#: events.xml:202
 #, fuzzy, no-c-format
 msgid "An event qualifier type may have annotation members:"
 msgstr "Un type de liaison d'évènement peut avoir des membres d'annotation:"
 
-#. Tag: programlisting
-#: events.xml:204
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"   RoleType value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"    RoleType value();\n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:206
 #, no-c-format
 msgid ""
 "The member value is used to narrow the messages delivered to the observer:"
@@ -452,18 +314,7 @@
 "la valeur membre est utilisée pour préciser d'avantage les messages délivrés "
 "à l'observateur:"
 
-#. Tag: programlisting
-#: events.xml:208
-#, no-c-format
-msgid ""
-"<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
-"{ ... }]]>"
-
 #. Tag: para
-#: events.xml:210
 #, fuzzy, no-c-format
 msgid ""
 "Event qualifier type members may be specified statically by the event "
@@ -473,14 +324,7 @@
 "statiquement par le producteur d'évènement, par des annotations au point "
 "d'injection du notificateur d'évènement:"
 
-#. Tag: programlisting
-#: events.xml:215
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
-msgstr "<![CDATA[@Observable @Role(ADMIN) Event<LoggedIn> LoggedInEvent;}}]]>"
-
 #. Tag: para
-#: events.xml:217
 #, fuzzy, no-c-format
 msgid ""
 "Alternatively, the value of the event qualifier type member may be "
@@ -491,20 +335,7 @@
 "être déterminée dynamiquement par le producteur d'évènement.Commençons par "
 "écrire une sous-classe abstraite de <literal>AnnotationLiteral</literal>:"
 
-#. Tag: programlisting
-#: events.xml:222
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[abstract class RoleBinding \n"
-"   extends AnnotationLiteral<Role> \n"
-"   implements Role {}]]>"
-msgstr ""
-"<![CDATA[abstract class RoleBinding \n"
-"    extends AnnotationLiteral<Role> \n"
-"    implements Role {}]]>"
-
 #. Tag: para
-#: events.xml:224
 #, fuzzy, no-c-format
 msgid ""
 "The event producer passes an instance of this class to <literal>select()</"
@@ -513,45 +344,17 @@
 "Le producteur d'évènement passe une instance de cette class à <literal>fire()"
 "</literal>:"
 
-#. Tag: programlisting
-#: events.xml:226
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[documentEvent.select(new RoleBinding() {\n"
-"   public void value() { return user.getRole(); }\n"
-"}).fire(document);]]>"
-msgstr ""
-"<![CDATA[documentEvent.fire( document, new RoleBinding() { public void value"
-"() { return user.getRole(); } } );]]>"
-
 #. Tag: title
-#: events.xml:231
 #, fuzzy, no-c-format
 msgid "Multiple event qualifiers"
 msgstr "Plusieurs liaisons d'évènements"
 
 #. Tag: para
-#: events.xml:233
 #, fuzzy, no-c-format
 msgid "Event qualifier types may be combined, for example:"
 msgstr "Les types de liaison d'évènement peuvent être combinés, par exemple:"
 
-#. Tag: programlisting
-#: events.xml:235
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>(){})."
-"fire(document);]]>"
-msgstr ""
-"<![CDATA[@Observable @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.fire(document, new "
-"AnnotationLiteral<Updated>(){});]]>"
-
 #. Tag: para
-#: events.xml:237
 #, no-c-format
 msgid ""
 "When this event occurs, all of the following observer methods will be "
@@ -560,44 +363,12 @@
 "Quand cet évènement se product, toutes méthodes observatrices seront "
 "notifiées:"
 
-#. Tag: programlisting
-#: events.xml:239
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
-"document) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
-"document) { ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:241
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
-"{ ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:242
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }}}]]>"
-msgstr ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }}}]]>"
-
 #. Tag: title
-#: events.xml:247
 #, no-c-format
 msgid "Transactional observers"
 msgstr "Observateurs transactionnels"
 
 #. Tag: para
-#: events.xml:249
 #, no-c-format
 msgid ""
 "Transactional observers receive their event notifications during the before "
@@ -613,31 +384,18 @@
 "le contexte de l'application, mais seulement quand les transactions qui "
 "mettent à jour l'arbre <literal>Category</literal> réussissent:"
 
-#. Tag: programlisting
-#: events.xml:256
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public void refreshCategoryTree(@Observes(during = AFTER_SUCCESS) "
-"CategoryUpdateEvent event) { ... }]]>"
-msgstr ""
-"<![CDATA[public void refreshCategoryTree(@AfterTransactionSuccess @Observes "
-"CategoryUpdateEvent event) { ... }]]>"
-
 #. Tag: para
-#: events.xml:258
 #, fuzzy, no-c-format
 msgid "There are five kinds of transactional observers:"
 msgstr "Il y a trois sortes d'observateurs transactionnels:"
 
 #. Tag: para
-#: events.xml:262
 #, no-c-format
 msgid ""
 "<literal>IN_PROGESS</literal> observers are called immediately (default)"
 msgstr ""
 
 #. Tag: para
-#: events.xml:265
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_SUCCESS</literal> observers are called during the after "
@@ -649,7 +407,6 @@
 "transaction se termine avec succès"
 
 #. Tag: para
-#: events.xml:271
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_FAILURE</literal> observers are called during the after "
@@ -661,7 +418,6 @@
 "transaction ne se termine pas correctement"
 
 #. Tag: para
-#: events.xml:277
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_COMPLETION</literal> observers are called during the after "
@@ -671,7 +427,6 @@
 "après la complétion de la phase de la transaction"
 
 #. Tag: para
-#: events.xml:283
 #, fuzzy, no-c-format
 msgid ""
 "<literal>BEFORE_COMPLETION</literal> observers are called during the before "
@@ -681,7 +436,6 @@
 "appelés avant la complétion de la phase de la transaction"
 
 #. Tag: para
-#: events.xml:290
 #, fuzzy, no-c-format
 msgid ""
 "Transactional observers are very important in a stateful object model "
@@ -692,7 +446,6 @@
 "longtemps qu'une simple transaction atomique."
 
 #. Tag: para
-#: events.xml:295
 #, no-c-format
 msgid ""
 "Imagine that we have cached a JPA query result set in the application scope:"
@@ -700,50 +453,7 @@
 "Imaginez que nous ayons caché un ensemble de résultats de requête JPA dans "
 "la portée application:"
 
-#. Tag: programlisting
-#: events.xml:297
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   List<Product> products;\n"
-"\n"
-"   @Produces @Catalog \n"
-"   List<Product> getCatalog() {\n"
-"      if (products==null) {\n"
-"         products = em.createQuery(\"select p from Product p where p.deleted "
-"= false\")\n"
-"            .getResultList();\n"
-"      }\n"
-"      return products;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    List<Product> products;\n"
-"\n"
-"    @Produces @Catalog \n"
-"    List<Product> getCatalog() {\n"
-"        if (products==null) {\n"
-"            products = em.createQuery(\"select p from Product p where p."
-"deleted = false\")\n"
-"                .getResultList();\n"
-"        }\n"
-"        return products;\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:299
 #, no-c-format
 msgid ""
 "From time to time, a <literal>Product</literal> is created or deleted. When "
@@ -758,7 +468,6 @@
 "avant d'éxécuter ce rafraîchissement!"
 
 #. Tag: para
-#: events.xml:305
 #, fuzzy, no-c-format
 msgid ""
 "The bean that creates and deletes <literal>Product</literal>s could raise "
@@ -767,51 +476,7 @@
 "Le Web Brans qui crée et détruit les <literal>Product</literal>s pourrait "
 "lever des évènements, par exemple:"
 
-#. Tag: programlisting
-#: events.xml:309
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"   @PersistenceContext EntityManager em;\n"
-"   @Inject @Any Event<Product> productEvent;\n"
-"\n"
-"   public void delete(Product product) {\n"
-"      em.delete(product);\n"
-"      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
-"(product);\n"
-"   }\n"
-"    \n"
-"   public void persist(Product product) {\n"
-"      em.persist(product);\n"
-"      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
-"(product);\n"
-"   }\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"\n"
-"    @PersistenceContext EntityManager em;\n"
-"    @Observable Event<Product> productEvent;\n"
-"\n"
-"    public void delete(Product product) {\n"
-"        em.delete(product);\n"
-"        productEvent.fire(product, new AnnotationLiteral<Deleted>(){});\n"
-"    }\n"
-"    \n"
-"    public void persist(Product product) {\n"
-"        em.persist(product);\n"
-"        productEvent.fire(product, new AnnotationLiteral<Created>(){});\n"
-"    }\n"
-"    \n"
-"    ...\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:311
 #, no-c-format
 msgid ""
 "And now <literal>Catalog</literal> can observe the events after successful "
@@ -820,42 +485,270 @@
 "Et maintenant <literal>Catalog</literal> peut observer les évènements après "
 "l'éxecution avec succès de la transaction:"
 
-#. Tag: programlisting
-#: events.xml:315
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"   ...\n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
-"product) {\n"
-"      products.add(product);\n"
-"   }\n"
-"    \n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
-"product) {\n"
-"      products.remove(product);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"    ...\n"
-"    \n"
-"    void addProduct(@AfterTransactionSuccess @Observes @Created Product "
-"product) {\n"
-"        products.add(product);\n"
-"    }\n"
-"    \n"
-"    void addProduct(@AfterTransactionSuccess @Observes @Deleted Product "
-"product) {\n"
-"        products.remove(product);\n"
-"    }\n"
-"    \n"
-"}]]>"
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({FIELD, PARAMETER})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated { ... }]]>"
 
 #~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
+#~ msgstr "<![CDATA[@Observable Event<Document> documentEvent]]>"
+
+#~ msgid "<![CDATA[documentEvent.fire(document);]]>"
+#~ msgstr "<![CDATA[documentEvent.fire(document);]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Updated Event<Document> documentUpdatedEvent]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
+#~ "(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.fire( document, new AnnotationLiteral<Updated>()"
+#~ "{} );]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = "
+#~ "IF_EXISTS) @Updated Document d) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "   RoleType value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "    RoleType value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Role(ADMIN) Event<LoggedIn> LoggedInEvent;}}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "   extends AnnotationLiteral<Role> \n"
+#~ "   implements Role {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "    extends AnnotationLiteral<Role> \n"
+#~ "    implements Role {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new RoleBinding() {\n"
+#~ "   public void value() { return user.getRole(); }\n"
+#~ "}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.fire( document, new RoleBinding() { public void "
+#~ "value() { return user.getRole(); } } );]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>()"
+#~ "{}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.fire(document, new "
+#~ "AnnotationLiteral<Updated>(){});]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public void refreshCategoryTree(@Observes(during = "
+#~ "AFTER_SUCCESS) CategoryUpdateEvent event) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void refreshCategoryTree(@AfterTransactionSuccess "
+#~ "@Observes CategoryUpdateEvent event) { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   List<Product> products;\n"
+#~ "\n"
+#~ "   @Produces @Catalog \n"
+#~ "   List<Product> getCatalog() {\n"
+#~ "      if (products==null) {\n"
+#~ "         products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "            .getResultList();\n"
+#~ "      }\n"
+#~ "      return products;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    List<Product> products;\n"
+#~ "\n"
+#~ "    @Produces @Catalog \n"
+#~ "    List<Product> getCatalog() {\n"
+#~ "        if (products==null) {\n"
+#~ "            products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "                .getResultList();\n"
+#~ "        }\n"
+#~ "        return products;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "   @Inject @Any Event<Product> productEvent;\n"
+#~ "\n"
+#~ "   public void delete(Product product) {\n"
+#~ "      em.delete(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void persist(Product product) {\n"
+#~ "      em.persist(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    @Observable Event<Product> productEvent;\n"
+#~ "\n"
+#~ "    public void delete(Product product) {\n"
+#~ "        em.delete(product);\n"
+#~ "        productEvent.fire(product, new AnnotationLiteral<Deleted>(){});\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void persist(Product product) {\n"
+#~ "        em.persist(product);\n"
+#~ "        productEvent.fire(product, new AnnotationLiteral<Created>(){});\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    ...\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "   ...\n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
+#~ "product) {\n"
+#~ "      products.add(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
+#~ "product) {\n"
+#~ "      products.remove(product);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "    ...\n"
+#~ "    \n"
+#~ "    void addProduct(@AfterTransactionSuccess @Observes @Created Product "
+#~ "product) {\n"
+#~ "        products.add(product);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    void addProduct(@AfterTransactionSuccess @Observes @Deleted Product "
+#~ "product) {\n"
+#~ "        products.remove(product);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "The Web Beans event notification facility allows Web Beans to interact in "
 #~ "a totally decoupled manner. Event <emphasis>producers</emphasis> raise "
 #~ "events that are then delivered to event <emphasis>observers</emphasis> by "

Modified: doc/trunk/reference/fr-FR/example.po
===================================================================
--- doc/trunk/reference/fr-FR/example.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/example.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-04 23:07+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: example.xml:4
 #, no-c-format
 msgid "JSF web application example"
 msgstr "Exemple d'une web application JSF"
 
 #. Tag: para
-#: example.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "Let's illustrate these ideas with a full example. We're going to implement "
@@ -34,113 +32,18 @@
 "D'abord, nous allons définir un Web Bean pour stocker le nom d'utilisateur "
 "et le mot de passe saisis lors de l'identification:"
 
-#. Tag: programlisting
-#: example.xml:12
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    @NotNull @Length(min=3, max=25)\n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    @NotNull @Length(min=6, max=20)\n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"        \n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:14
 #, fuzzy, no-c-format
 msgid "This bean is bound to the login prompt in the following JSF form:"
 msgstr ""
 "Ce Web Bean est lié à l'invite de connexion dans le formulaire JSF suivant:"
 
-#. Tag: programlisting
-#: example.xml:16
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<h:form>\n"
-"   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"      <f:validateBean>\n"
-"         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"         <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"         <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"      </f:validateBean>\n"
-"   </h:panelGrid>\n"
-"   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-msgstr ""
-"<![CDATA[<h:form>\n"
-"    <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"        <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"        <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"        <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"        <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"    </h:panelGrid>\n"
-"    <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"    <h:commandButton value=\"Logout\" acion=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-
 #. Tag: para
-#: example.xml:18
 #, no-c-format
 msgid "Users are represented by a JPA entity:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:22
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Entity\n"
-"public class User {\n"
-"   private @NotNull @Length(min=3, max=25) @Id String username;\n"
-"   private @NotNull @Length(min=6, max=20) String password;\n"
-"   \n"
-"   public String getUsername() { return username; }\n"
-"   public void setUsername(String username) { this.username = username; }\n"
-"   public String setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"        \n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:24
 #, no-c-format
 msgid ""
 "(Note that we're also going to need a <literal>persistence.xml</literal> "
@@ -149,7 +52,6 @@
 msgstr ""
 
 #. Tag: para
-#: example.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "The actual work is done by a session-scoped bean that maintains information "
@@ -160,141 +62,21 @@
 "maintient l'information à propos de l'utilisateur actuellement connecté et "
 "expose l'entité <literal>User</literal> aux autres Web Beans:"
 
-#. Tag: programlisting
-#: example.xml:34
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login implements Serializable {\n"
-"\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject @UserDatabase EntityManager userDatabase;\n"
-"\n"
-"   private User user;\n"
-"    \n"
-"   public void login() {\n"
-"      List<User> results = userDatabase.createQuery(\n"
-"         \"select u from User u where u.username = :username and u.password "
-"= :password\")\n"
-"         .setParameter(\"username\", credentials.getUsername())\n"
-"         .setParameter(\"password\", credentials.getPassword())\n"
-"         .getResultList();\n"
-"        \n"
-"      if (!results.isEmpty()) {\n"
-"         user = results.get(0);\n"
-"      }\n"
-"      else {\n"
-"         // perhaps add code here to report a failed login\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void logout() {\n"
-"      user = null;\n"
-"   }\n"
-"    \n"
-"   public boolean isLoggedIn() {\n"
-"      return user != null;\n"
-"   }\n"
-"    \n"
-"   @Produces @LoggedIn User getCurrentUser() {\n"
-"      return user;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @PersistenceContext EntityManager userDatabase;\n"
-"\n"
-"    private User user;\n"
-"    \n"
-"    public void login() {\n"
-"            \n"
-"        List<User> results = userDatabase.createQuery(\n"
-"           \"select u from User u where u.username=:username and u.password=:"
-"password\")\n"
-"           .setParameter(\"username\", credentials.getUsername())\n"
-"           .setParameter(\"password\", credentials.getPassword())\n"
-"           .getResultList();\n"
-"        \n"
-"        if ( !results.isEmpty() ) {\n"
-"           user = results.get(0);\n"
-"        }\n"
-"        \n"
-"    }\n"
-"    \n"
-"    public void logout() {\n"
-"        user = null;\n"
-"    }\n"
-"    \n"
-"    public boolean isLoggedIn() {\n"
-"       return user!=null;\n"
-"    }\n"
-"    \n"
-"    @Produces @LoggedIn User getCurrentUser() {\n"
-"        return user;\n"
-"    }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:36
 #, no-c-format
 msgid ""
 "<literal>@LoggedIn</literal> and <literal>@UserDatabase</literal> are custom "
 "qualifier annotations:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:38
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"public @interface LoggedIn {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD})\n"
-"@BindingType\n"
-"public @interface LoggedIn {}]]>"
-
-#. Tag: programlisting
-#: example.xml:40
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, PARAMETER, FIELD})\n"
-"public @interface UserDatabase {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD})\n"
-"@BindingType\n"
-"public @interface LoggedIn {}]]>"
-
 #. Tag: para
-#: example.xml:42
 #, no-c-format
 msgid ""
 "We need an adaptor bean to expose our typesafe <literal>EntityManager</"
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:46
-#, no-c-format
-msgid ""
-"<![CDATA[class UserDatabaseProducer {\n"
-"   @Produces @UserDatabase @PersistenceContext \n"
-"   static EntityManager userDatabase;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "Now <literal>DocumentEditor</literal>, or any other bean, can easily inject "
@@ -303,51 +85,12 @@
 "Maintenant, n'importe quel autre Web Bean peut facilement injecter "
 "l'utilisateur courant:"
 
-#. Tag: programlisting
-#: example.xml:50
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DocumentEditor {\n"
-"   @Inject Document document;\n"
-"   @Inject @LoggedIn User currentUser;\n"
-"   @Inject @DocumentDatabase EntityManager docDatabase;\n"
-"    \n"
-"   public void save() {\n"
-"      document.setCreatedBy(currentUser);\n"
-"      docDatabase.persist(document);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class DocumentEditor {\n"
-"\n"
-"    @Current Document document;\n"
-"    @LoggedIn User currentUser;\n"
-"    @PersistenceContext EntityManager docDatabase;\n"
-"    \n"
-"    public void save() {\n"
-"        document.setCreatedBy(currentUser);\n"
-"        docDatabase.persist(document);\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:52
 #, no-c-format
 msgid "Or we can reference the current user in a JSF view:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:54
-#, no-c-format
-msgid ""
-"<![CDATA[<h:panelGroup rendered=\"#{login.loggedIn}\">\n"
-"   signed in as #{currentUser.username}\n"
-"</h:panelGroup>]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:56
 #, fuzzy, no-c-format
 msgid ""
 "Hopefully, this example gave you a taste of the CDI programming model. In "
@@ -357,6 +100,229 @@
 "prochain chapitre, nous explorerons l'injection de dépendance des Web Beans "
 "plus en détail."
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=3, max=25)\n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=6, max=20)\n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "        \n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<h:form>\n"
+#~ "   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "      <f:validateBean>\n"
+#~ "         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"username\" value=\"#{credentials.username}\"/"
+#~ ">\n"
+#~ "         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"password\" value=\"#{credentials.password}\"/"
+#~ ">\n"
+#~ "      </f:validateBean>\n"
+#~ "   </h:panelGrid>\n"
+#~ "   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#"
+#~ "{!login.loggedIn}\"/>\n"
+#~ "   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</h:form>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<h:form>\n"
+#~ "    <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "        <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "        <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
+#~ "        <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "        <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
+#~ "    </h:panelGrid>\n"
+#~ "    <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered="
+#~ "\"#{!login.loggedIn}\"/>\n"
+#~ "    <h:commandButton value=\"Logout\" acion=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</h:form>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Entity\n"
+#~ "public class User {\n"
+#~ "   private @NotNull @Length(min=3, max=25) @Id String username;\n"
+#~ "   private @NotNull @Length(min=6, max=20) String password;\n"
+#~ "   \n"
+#~ "   public String getUsername() { return username; }\n"
+#~ "   public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "   public String setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "        \n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login implements Serializable {\n"
+#~ "\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject @UserDatabase EntityManager userDatabase;\n"
+#~ "\n"
+#~ "   private User user;\n"
+#~ "    \n"
+#~ "   public void login() {\n"
+#~ "      List<User> results = userDatabase.createQuery(\n"
+#~ "         \"select u from User u where u.username = :username and u."
+#~ "password = :password\")\n"
+#~ "         .setParameter(\"username\", credentials.getUsername())\n"
+#~ "         .setParameter(\"password\", credentials.getPassword())\n"
+#~ "         .getResultList();\n"
+#~ "        \n"
+#~ "      if (!results.isEmpty()) {\n"
+#~ "         user = results.get(0);\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         // perhaps add code here to report a failed login\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void logout() {\n"
+#~ "      user = null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public boolean isLoggedIn() {\n"
+#~ "      return user != null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "      return user;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @PersistenceContext EntityManager userDatabase;\n"
+#~ "\n"
+#~ "    private User user;\n"
+#~ "    \n"
+#~ "    public void login() {\n"
+#~ "            \n"
+#~ "        List<User> results = userDatabase.createQuery(\n"
+#~ "           \"select u from User u where u.username=:username and u."
+#~ "password=:password\")\n"
+#~ "           .setParameter(\"username\", credentials.getUsername())\n"
+#~ "           .setParameter(\"password\", credentials.getPassword())\n"
+#~ "           .getResultList();\n"
+#~ "        \n"
+#~ "        if ( !results.isEmpty() ) {\n"
+#~ "           user = results.get(0);\n"
+#~ "        }\n"
+#~ "        \n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void logout() {\n"
+#~ "        user = null;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public boolean isLoggedIn() {\n"
+#~ "       return user!=null;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "        return user;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface LoggedIn {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD})\n"
+#~ "@BindingType\n"
+#~ "public @interface LoggedIn {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface UserDatabase {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD})\n"
+#~ "@BindingType\n"
+#~ "public @interface LoggedIn {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "   @Inject Document document;\n"
+#~ "   @Inject @LoggedIn User currentUser;\n"
+#~ "   @Inject @DocumentDatabase EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "   public void save() {\n"
+#~ "      document.setCreatedBy(currentUser);\n"
+#~ "      docDatabase.persist(document);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "\n"
+#~ "    @Current Document document;\n"
+#~ "    @LoggedIn User currentUser;\n"
+#~ "    @PersistenceContext EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "    public void save() {\n"
+#~ "        document.setCreatedBy(currentUser);\n"
+#~ "        docDatabase.persist(document);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
 #~ msgid "Of course, <literal>@LoggedIn</literal> is a binding annotation:"
 #~ msgstr ""
 #~ "Evidemment, <literal>@LoggedIn</literal> est une annotation de liaison:"

Modified: doc/trunk/reference/fr-FR/extend.po
===================================================================
--- doc/trunk/reference/fr-FR/extend.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/extend.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-04 23:17+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: extend.xml:5
 #, no-c-format
 msgid "Portable extensions"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "CDI is intended to be a foundation for frameworks, extensions and "
@@ -35,13 +33,11 @@
 "furent envisagées par les concepteurs des Web Beans:"
 
 #. Tag: para
-#: extend.xml:15
 #, no-c-format
 msgid "integration with Business Process Management engines,"
 msgstr "intégration avec des moteurs de gestion de processus métiers (BPM),"
 
 #. Tag: para
-#: extend.xml:18
 #, no-c-format
 msgid ""
 "integration with third-party frameworks such as Spring, Seam, GWT or Wicket, "
@@ -51,7 +47,6 @@
 "et"
 
 #. Tag: para
-#: extend.xml:23
 #, fuzzy, no-c-format
 msgid "new technology based upon the CDI programming model."
 msgstr ""
@@ -59,25 +54,21 @@
 "Web Beans."
 
 #. Tag: para
-#: extend.xml:27
 #, no-c-format
 msgid "More formally, according to the spec:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:32
 #, no-c-format
 msgid "A portable extension may integrate with the container by:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:35
 #, no-c-format
 msgid "Providing its own beans, interceptors and decorators to the container"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:40
 #, no-c-format
 msgid ""
 "Injecting dependencies into its own objects using the dependency injection "
@@ -85,13 +76,11 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:45
 #, no-c-format
 msgid "Providing a context implementation for a custom scope"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:50
 #, no-c-format
 msgid ""
 "Augmenting or overriding the annotation-based metadata with metadata from "
@@ -99,13 +88,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:58
 #, fuzzy, no-c-format
 msgid "Creating an <literal>Extension</literal>"
 msgstr "La classe <literal>Bean</literal>"
 
 #. Tag: para
-#: extend.xml:60
 #, no-c-format
 msgid ""
 "The first step in creating a portable extension is to write a class that "
@@ -114,14 +101,7 @@
 "service provider architecture."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:66
-#, no-c-format
-msgid "class MyExtension implements Extension { ... }"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:68
 #, no-c-format
 msgid ""
 "Next, we need to register our extension as a service provider by creating a "
@@ -129,14 +109,7 @@
 "literal>, which contains the name of our extension class:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:74
-#, no-c-format
-msgid "org.mydomain.extension.MyExtension"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:76
 #, no-c-format
 msgid ""
 "An extension is not a bean, exactly, since it is instantiated by the "
@@ -145,18 +118,7 @@
 "process is complete."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:82
-#, no-c-format
-msgid ""
-"@Inject \n"
-"MyBean(MyExtension myExtension) {\n"
-"   myExtension.doSomething();\n"
-"}"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:84
 #, no-c-format
 msgid ""
 "And, like beans, extensions can have observer methods. Usually, the observer "
@@ -164,33 +126,28 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:92
 #, no-c-format
 msgid "Container lifecycle events"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:94
 #, no-c-format
 msgid ""
 "During the initialization process, the container fires a series of events, "
 "including:"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:101
-#, no-c-format
-msgid "BeforeBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>BeforeBeanDiscovery</literal>"
+msgstr "L'object <literal>Manager</literal>"
 
-#. Tag: literal
-#: extend.xml:106
-#, no-c-format
-msgid "ProcessAnnotatedType"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>ProcessAnnotatedType</literal>"
+msgstr "L'object <literal>Manager</literal>"
 
 #. Tag: para
-#: extend.xml:110
 #, no-c-format
 msgid ""
 "<literal>ProcessInjectionTarget</literal> and <literal>ProcessProducer</"
@@ -198,54 +155,27 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:115
 #, no-c-format
 msgid ""
 "<literal>ProcessBean</literal> and <literal>ProcessObserverMethod</literal>"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:121
-#, no-c-format
-msgid "AfterBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>AfterBeanDiscovery</literal>"
+msgstr "L'object <literal>Manager</literal>"
 
-#. Tag: literal
-#: extend.xml:126
+#. Tag: para
 #, no-c-format
-msgid "AfterDeploymentValidation"
+msgid "<literal>AfterDeploymentValidation</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:131
 #, no-c-format
 msgid "Extensions may observe these events:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:135
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"   \n"
-"   void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bbd) {\n"
-"      Logger.global.debug(\"beginning the scanning process\");\n"
-"   }\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      Logger.global.debug(\"scanning type: \" + pat.getAnnotatedType()."
-"getJavaClass().getName());\n"
-"   } \n"
-"\n"
-"   void afterBeanDiscovery(@Observes AfterBeanDiscovery abd) {\n"
-"      Logger.global.debug(\"finished the scanning process\");\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:137
 #, no-c-format
 msgid ""
 "In fact, the extension can do a lot more than just observe. The extension is "
@@ -253,45 +183,19 @@
 "example:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:142
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      //tell the container to ignore the type if it is annotated @Ignore\n"
-"      if ( pat.getAnnotatedType().isAnnotionPresent(Ignore.class) ) pat.veto"
-"();   \n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:144
 #, fuzzy, no-c-format
 msgid "The observer method may inject a <literal>BeanManager</literal>"
 msgstr ""
 "Le centre nerveux pour l'extension des Web Beans est l'objet "
 "<literal>Manager</literal>."
 
-#. Tag: programlisting
-#: extend.xml:148
-#, no-c-format
-msgid ""
-"<![CDATA[<T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> "
-"pat, BeanManager beanManager) { ... }]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:153
 #, fuzzy, no-c-format
 msgid "The <literal>BeanManager</literal> object"
 msgstr "L'object <literal>Manager</literal>"
 
 #. Tag: para
-#: extend.xml:155
 #, fuzzy, no-c-format
 msgid ""
 "The nerve center for extending CDI is the <literal>BeanManager</literal> "
@@ -302,54 +206,7 @@
 "d'obtenir des Web Beans, intercepteurs, décorateurs, observateurs et "
 "contextes de manière programmatique."
 
-#. Tag: programlisting
-#: extend.xml:161
-#, no-c-format
-msgid ""
-"<![CDATA[public interface BeanManager {\n"
-"   public Object getReference(Bean<?> bean, Type beanType, "
-"CreationalContext<?> ctx);\n"
-"   public Object getInjectableReference(InjectionPoint ij, "
-"CreationalContext<?> ctx);\n"
-"   public <T> CreationalContext<T> createCreationalContext(Contextual<T> "
-"contextual);\n"
-"   public Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers);\n"
-"   public Set<Bean<?>> getBeans(String name);\n"
-"   public Bean<?> getPassivationCapableBean(String id);\n"
-"   public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);\n"
-"   public void validate(InjectionPoint injectionPoint);\n"
-"   public void fireEvent(Object event, Annotation... qualifiers);\n"
-"   public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, "
-"Annotation... qualifiers);\n"
-"   public List<Decorator<?>> resolveDecorators(Set<Type> types, "
-"Annotation... qualifiers);\n"
-"   public List<Interceptor<?>> resolveInterceptors(InterceptionType type, "
-"Annotation... interceptorBindings);\n"
-"   public boolean isScope(Class<? extends Annotation> annotationType);\n"
-"   public boolean isNormalScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isPassivatingScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isQualifier(Class<? extends Annotation> annotationType);\n"
-"   public boolean isInterceptorBinding(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isStereotype(Class<? extends Annotation> annotationType);\n"
-"   public Set<Annotation> getInterceptorBindingDefinition(Class<? extends "
-"Annotation> bindingType);\n"
-"   public Set<Annotation> getStereotypeDefinition(Class<? extends "
-"Annotation> stereotype);\n"
-"   public Context getContext(Class<? extends Annotation> scopeType);\n"
-"   public ELResolver getELResolver();\n"
-"   public ExpressionFactory wrapExpressionFactory(ExpressionFactory "
-"expressionFactory);\n"
-"   public <T> AnnotatedType<T> createAnnotatedType(Class<T> type);\n"
-"   public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> "
-"type);\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:163
 #, fuzzy, no-c-format
 msgid ""
 "Any bean or other Java EE component which supports injection can obtain an "
@@ -358,14 +215,7 @@
 "Nous pouvons obtenir une instance d'un <literal>Manager</literal> par "
 "injection:"
 
-#. Tag: programlisting
-#: extend.xml:166
-#, fuzzy, no-c-format
-msgid "@Inject BeanManager beanManager;"
-msgstr "@Current Manager manager"
-
 #. Tag: para
-#: extend.xml:168
 #, no-c-format
 msgid ""
 "Java EE components may obtain an instance of <literal>BeanManager</literal> "
@@ -375,7 +225,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:174
 #, fuzzy, no-c-format
 msgid ""
 "Let's study some of the interfaces exposed by the <literal>BeanManager</"
@@ -385,13 +234,11 @@
 "<literal>Manager</literal>."
 
 #. Tag: title
-#: extend.xml:179
 #, fuzzy, no-c-format
 msgid "The <literal>InjectionTarget</literal> interface"
 msgstr "L'interface <literal>Context</literal>"
 
 #. Tag: para
-#: extend.xml:181
 #, no-c-format
 msgid ""
 "The first thing that a framework developer is going to look for in the "
@@ -401,7 +248,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:188
 #, no-c-format
 msgid ""
 "We recommend that frameworks let CDI take over the job of actually "
@@ -412,50 +258,12 @@
 "field injection will be supported."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:196
-#, no-c-format
-msgid ""
-"<![CDATA[//get the BeanManager from JNDI\n"
-"BeanManager beanManager = (BeanManager) new InitialContext().lookup(\"java:"
-"comp/BeanManager\");\n"
-"\n"
-"//CDI uses an AnnotatedType object to read the annotations of a class\n"
-"AnnotatedType<SomeFrameworkComponent> type = beanManager.createAnnotatedType"
-"(SomeFrameworkComponent.class);\n"
-"\n"
-"//The extension uses an InjectionTarget to delegate instantiation, "
-"dependency injection \n"
-"//and lifecycle callbacks to the CDI container\n"
-"InjectionTarget<SomeFrameworkComponent> it = beanManager."
-"createInjectionTarget(type);\n"
-"\n"
-"//each instance needs its own CDI CreationalContext\n"
-"CreationalContext ctx = beanManager.createCreationalContext(null);\n"
-"\n"
-"//instantiate the framework component and inject its dependencies\n"
-"SomeFrameworkComponent instance = it.produce(ctx);  //call the constructor\n"
-"it.inject(instance, ctx);  //call initializer methods and perform field "
-"injection\n"
-"it.postConstruct(instance);  //call the @PostConstruct method\n"
-"\n"
-"...\n"
-"\n"
-"//destroy the framework component instance and clean up dependent objects\n"
-"it.preDestroy(instance);  //call the @PreDestroy method\n"
-"it.dispose(instance);  //it is now safe to discard the instance\n"
-"ctx.release();  //clean up dependent objects\n"
-"]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:201
 #, fuzzy, no-c-format
 msgid "The <literal>Bean</literal> interface"
 msgstr "L'interface <literal>Context</literal>"
 
 #. Tag: para
-#: extend.xml:203
 #, fuzzy, no-c-format
 msgid ""
 "Instances of the interface <literal>Bean</literal> represent beans. There is "
@@ -470,46 +278,18 @@
 "l'application."
 
 #. Tag: para
-#: extend.xml:210
 #, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface exposes all the interesting things we "
-"dicussed in <xref linkend=\"bean-anatomy\"/>."
+"dicussed in <xref linkend=\"bean-anatomy\" />."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:215
-#, no-c-format
-msgid ""
-"<![CDATA[public interface Bean<T> extends Contextual<T> {\n"
-"   public Set<Type> getTypes();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public String getName();\n"
-"   public Set<Class<? extends Annotation>> getStereotypes();\n"
-"   public Class<?> getBeanClass();\n"
-"   public boolean isAlternative();\n"
-"   public boolean isNullable();\n"
-"   public Set<InjectionPoint> getInjectionPoints();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:217
 #, no-c-format
 msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:221
-#, no-c-format
-msgid ""
-"<![CDATA[Set<Bean<?>> allBeans = beanManager.getBeans(Obect.class, new "
-"AnnotationLiteral<Any>() {});]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:223
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface makes it possible for a portable "
@@ -527,13 +307,11 @@
 "par un autre framework d'être injectés dans des Web Beans."
 
 #. Tag: title
-#: extend.xml:233
 #, fuzzy, no-c-format
 msgid "Registering a <literal>Bean</literal>"
 msgstr "La classe <literal>Bean</literal>"
 
 #. Tag: para
-#: extend.xml:235
 #, no-c-format
 msgid ""
 "The most common kind of CDI portable extension registers a bean (or beans) "
@@ -541,7 +319,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:239
 #, no-c-format
 msgid ""
 "In this example, we make a framework class, <literal>SecurityManager</"
@@ -551,101 +328,7 @@
 "<literal>SecurityManager</literal> instance."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[public class SecurityManagerExtension implements Extension {\n"
-"    \n"
-"    void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager "
-"bm) {\n"
-"            \n"
-"        //use this to read annotations of the class\n"
-"        AnnotatedType<SecurityManager> at = bm.createAnnotatedType"
-"(SecurityManager.class); \n"
-"\n"
-"        //use this to instantiate the class and inject dependencies\n"
-"        final InjectionTarget<SecurityManager> it = bm.createInjectionTarget"
-"(at); \n"
-"\n"
-"        abd.addBean( new Bean<SecurityManager>() {\n"
-"\n"
-"            @Override\n"
-"            public Class<?> getBeanClass() {\n"
-"                return SecurityManager.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public String getName() {\n"
-"                return \"securityManager\";\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getQualifiers() {\n"
-"                Set<Annotation> qualifiers = new HashSet<Annotation>();\n"
-"                qualifiers.add( new AnnotationLiteral<Default>() {} );\n"
-"                qualifiers.add( new AnnotationLiteral<Any>() {} );\n"
-"                return qualifiers;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<? extends Annotation> getScope() {\n"
-"                return SessionScoped.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Class<? extends Annotation>> getStereotypes() {\n"
-"                return Collections.emptySet();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypes() {\n"
-"                Set<Type> types = new HashSet<Type>();\n"
-"                types.add(SecurityManager.class);\n"
-"                types.add(Object.class);\n"
-"                return types;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAlternative() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isNullable() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public SecurityManager create(CreationalContext<SecurityManager> "
-"ctx) {\n"
-"                SecurityManager instance = it.produce(ctx);\n"
-"                it.inject(instance, ctx);\n"
-"                it.postConstruct(instance);\n"
-"                return instance;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void destroy(SecurityManager instance, \n"
-"                                CreationalContext<SecurityManager> ctx) {\n"
-"                it.preDestroy(instance);\n"
-"                it.dispose(instance);\n"
-"                ctx.release();\n"
-"            }\n"
-"            \n"
-"        } );\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:248
 #, no-c-format
 msgid ""
 "But a portable extension can also mess with beans that are discovered "
@@ -653,13 +336,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:255
 #, no-c-format
 msgid "Wrapping an <literal>AnnotatedType</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:257
 #, no-c-format
 msgid ""
 "One of the most interesting things that an extension class can do is process "
@@ -668,7 +349,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:262
 #, no-c-format
 msgid ""
 "Let's start with an example of an extension that provides support for the "
@@ -679,101 +359,7 @@
 "<literal>value()</literal> of the <literal>@Named</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:270
-#, no-c-format
-msgid ""
-"<![CDATA[public class QualifiedNameExtension implements Extension {\n"
-"\n"
-"    <X> void processAnnotatedType(@Observes ProcessAnnotatedType<X> pat) {\n"
-"\n"
-"        //wrap this to override the annotations of the class\n"
-"        final AnnotatedType<X> at = pat.getAnnotatedType();\n"
-"        \n"
-"        AnnotatedType<X> wrapped = new AnnotatedType<X>() {\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedConstructor<X>> getConstructors() {\n"
-"                return at.getConstructors();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedField<? super X>> getFields() {\n"
-"                return at.getFields();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<X> getJavaClass() {\n"
-"                return at.getJavaClass();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedMethod<? super X>> getMethods() {\n"
-"                return at.getMethods();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public <T extends Annotation> T getAnnotation(final Class<T> "
-"annType) {\n"
-"                if ( Named.class.equals(annType) ) {\n"
-"                    class NamedLiteral \n"
-"                            extends AnnotationLiteral<Named> \n"
-"                            implements Named {\n"
-"                        @Override\n"
-"                        public String value() {\n"
-"                            Package pkg = at.getClass().getPackage();\n"
-"                            String unqualifiedName = at.getAnnotation(Named."
-"class).value();\n"
-"                            final String qualifiedName;\n"
-"                            if ( pkg.isAnnotationPresent(Named.class) ) {\n"
-"                                qualifiedName = pkg.getAnnotation(Named."
-"class).value() \n"
-"                                      + '.' + unqualifiedName;\n"
-"                            }\n"
-"                            else {\n"
-"                                qualifiedName = unqualifiedName;\n"
-"                            }\n"
-"                            return qualifiedName;\n"
-"                        }\n"
-"                    }\n"
-"                    return (T) new NamedLiteral();\n"
-"                }\n"
-"                else {\n"
-"                    return at.getAnnotation(annType);\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getAnnotations() {\n"
-"                return at.getAnnotations();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Type getBaseType() {\n"
-"                return at.getBaseType();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypeClosure() {\n"
-"                return at.getTypeClosure();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annType) {\n"
-"                return at.isAnnotationPresent(annType);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pat.setAnnotatedType(wrapped);\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:272
 #, no-c-format
 msgid ""
 "Here's a second example, which adds the <literal>@Alternative</literal> "
@@ -781,41 +367,7 @@
 "literal> interface."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:277
-#, no-c-format
-msgid ""
-"<![CDATA[class ServiceAlternativeExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"   \n"
-"      final AnnotatedType<T> type = pat.getAnnotatedType();\n"
-"      \n"
-"      if ( Service.class.isAssignableFrom( type.getJavaClass() ) ) {\n"
-"      \n"
-"         //if the class implements Service, make it an @Alternative\n"
-"         AnnotatedType<T> wrapped = new AnnotatedType<T>() {\n"
-"         \n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annotationType) {\n"
-"               return annotationType.equals(Alternative.class) ? \n"
-"                  true : type.isAnnotationPresent(annotationType);\n"
-"            }\n"
-"            \n"
-"            //remaining methods of AnnotatedType\n"
-"            ...\n"
-"         }\n"
-"         \n"
-"         pat.setAnnotatedType(wrapped);\n"
-"      }\n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:283
 #, no-c-format
 msgid ""
 "The <literal>AnnotatedType</literal> is not the only thing that can be "
@@ -823,13 +375,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:288
 #, no-c-format
 msgid "Wrapping an <literal>InjectionTarget</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:290
 #, no-c-format
 msgid ""
 "The <literal>InjectionTarget</literal> interface exposes operations for "
@@ -841,7 +391,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:297
 #, no-c-format
 msgid ""
 "Here's a CDI portable extension that reads values from properties files and "
@@ -853,16 +402,7 @@
 "<literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:305
-#, no-c-format
-msgid ""
-"firstName=Gavin\n"
-"lastName=King"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:307
 #, no-c-format
 msgid ""
 "The portable extension works by wrapping the containers "
@@ -870,121 +410,7 @@
 "<literal>inject()</literal> method."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:310
-#, no-c-format
-msgid ""
-"<![CDATA[public class ConfigExtension implements Extension {\n"
-"\n"
-"        <X> void processInjectionTarget(@Observes ProcessInjectionTarget<X> "
-"pit) {\n"
-"                \n"
-"                //wrap this to intercept the component lifecycle\n"
-"            final InjectionTarget<X> it = pit.getInjectionTarget();\n"
-"            \n"
-"        final Map<Field, Object> configuredValues = new HashMap<Field, "
-"Object>();\n"
-"        \n"
-"        //use this to read annotations of the class and its members\n"
-"        AnnotatedType<X> at = pit.getAnnotatedType();\n"
-"        \n"
-"        //read the properties file\n"
-"        String propsFileName = at.getClass().getSimpleName() + \".properties"
-"\";\n"
-"        InputStream stream = at.getJavaClass().getResourceAsStream"
-"(propsFileName);\n"
-"        if (stream!=null) {\n"
-"            \n"
-"            try {\n"
-"                Properties props = new Properties();\n"
-"                props.load(stream);\n"
-"                for (Map.Entry<Object, Object> property : props.entrySet()) "
-"{\n"
-"                    String fieldName = property.getKey().toString();\n"
-"                    Object value = property.getValue();\n"
-"                    try {\n"
-"                        Field field = at.getJavaClass().getField"
-"(fieldName);\n"
-"                        field.setAccessible(true);\n"
-"                        if ( field.getType().isAssignableFrom( value.getClass"
-"() ) ) {\n"
-"                            configuredValues.put(field, value);\n"
-"                        }\n"
-"                        else {\n"
-"                            //TODO: do type conversion automatically\n"
-"                            pit.addDefinitionError( new InjectionException(\n"
-"                                   \"field is not of type String: \" + "
-"field ) );\n"
-"                        }\n"
-"                    }\n"
-"                    catch (NoSuchFieldException nsfe) {\n"
-"                        pit.addDefinitionError(nsfe);\n"
-"                    }\n"
-"                    finally {\n"
-"                        stream.close();\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"            catch (IOException ioe) {\n"
-"                pit.addDefinitionError(ioe);\n"
-"            }\n"
-"        }\n"
-"        \n"
-"        InjectionTarget<X> wrapped = new InjectionTarget<X>() {\n"
-"\n"
-"            @Override\n"
-"            public void inject(X instance, CreationalContext<X> ctx) {\n"
-"                it.inject(instance, ctx);\n"
-"                \n"
-"                //set the values onto the new instance of the component\n"
-"                for (Map.Entry<Field, Object> configuredValue: "
-"configuredValues.entrySet()) {\n"
-"                    try {\n"
-"                        configuredValue.getKey().set(instance, "
-"configuredValue.getValue());\n"
-"                    }\n"
-"                    catch (Exception e) {\n"
-"                        throw new InjectionException(e);\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void postConstruct(X instance) {\n"
-"                it.postConstruct(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void preDestroy(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void dispose(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public X produce(CreationalContext<X> ctx) {\n"
-"                return it.produce(ctx);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pit.setInjectionTarget(wrapped);\n"
-"        \n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:312
 #, no-c-format
 msgid ""
 "There's a lot more to the portable extension SPI than what we've discussed "
@@ -993,13 +419,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:320
 #, no-c-format
 msgid "The <literal>Context</literal> interface"
 msgstr "L'interface <literal>Context</literal>"
 
 #. Tag: para
-#: extend.xml:322
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Context</literal> interface supports addition of new scopes to "
@@ -1009,30 +433,7 @@
 "aux Web Beans, ou d'extensions des portées fournies à de nouveaux "
 "environnements."
 
-#. Tag: programlisting
-#: extend.xml:327
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface Context {\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
-"creationalContext);\n"
-"   public <T> T get(Contextual<T> contextual);\n"
-"   boolean isActive();\n"
-"}]]>"
-msgstr ""
-"public interface Context {\n"
-"    \n"
-"    public Class&lt;? extends Annotation&gt; getScopeType();\n"
-"    \n"
-"    public &lt;T&gt; T get(Bean&lt;T&gt; bean, boolean create);\n"
-"    \n"
-"    boolean isActive();\n"
-"    \n"
-"}"
-
 #. Tag: para
-#: extend.xml:329
 #, fuzzy, no-c-format
 msgid ""
 "For example, we might implement <literal>Context</literal> to add a business "
@@ -1044,7 +445,31 @@
 "le support d'une portée conversation à une application qui utilise Wicket."
 
 #, fuzzy
+#~ msgid "@Inject BeanManager beanManager;"
+#~ msgstr "@Current Manager manager"
+
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public interface Context {\n"
+#~ "   public Class<? extends Annotation> getScope();\n"
+#~ "   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
+#~ "creationalContext);\n"
+#~ "   public <T> T get(Contextual<T> contextual);\n"
+#~ "   boolean isActive();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "public interface Context {\n"
+#~ "    \n"
+#~ "    public Class&lt;? extends Annotation&gt; getScopeType();\n"
+#~ "    \n"
+#~ "    public &lt;T&gt; T get(Bean&lt;T&gt; bean, boolean create);\n"
+#~ "    \n"
+#~ "    boolean isActive();\n"
+#~ "    \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
 #~ "There are two subinterfaces of <literal>Bean</literal> defined by the CDI "
 #~ "specification: <literal>Interceptor</literal> and <literal>Decorator</"
 #~ "literal>."

Modified: doc/trunk/reference/fr-FR/extensions.po
===================================================================
--- doc/trunk/reference/fr-FR/extensions.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/extensions.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,25 +15,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: extensions.xml:8
 #, no-c-format
 msgid "CDI extensions available as part of Weld"
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:11
 #, no-c-format
 msgid "These modules are usable on any JSR-299 implementation, not just Weld!"
 msgstr ""
 
 #. Tag: title
-#: extensions.xml:17
 #, no-c-format
 msgid "Weld Logger"
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:19
 #, no-c-format
 msgid ""
 "Adding logging to your application is now even easier with simple injection "
@@ -42,26 +38,7 @@
 "will be injected into any instance of the bean."
 msgstr ""
 
-#. Tag: programlisting
-#: extensions.xml:25
-#, no-c-format
-msgid ""
-"<![CDATA[import org.slf4j.Logger;\n"
-"import javax.inject.Inject;\n"
-"\n"
-"public class Checkout {\n"
-"   private @Inject Logger log;\n"
-"\n"
-"   public void invoiceItems() {\n"
-"      ShoppingCart cart;\n"
-"      ...\n"
-"      log.debug(\"Items invoiced for {}\", cart);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extensions.xml:27
 #, no-c-format
 msgid ""
 "The example shows how objects can be interpolated into a message. If you use "
@@ -71,7 +48,6 @@
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:34
 #, no-c-format
 msgid ""
 "You can add Weld logging to your project by including weld-logger.jar, sl4j-"
@@ -81,7 +57,6 @@
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:39
 #, no-c-format
 msgid ""
 "If you are using Weld as your JSR-299 implementation, there's no need to "

Modified: doc/trunk/reference/fr-FR/gettingstarted.po
===================================================================
--- doc/trunk/reference/fr-FR/gettingstarted.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/gettingstarted.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,27 +14,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: gettingstarted.xml:5
 #, no-c-format
 msgid "Getting started with Weld"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:7
 #, no-c-format
 msgid ""
 "Weld comes with two starter example applications, in addition to more "
 "specialized examples. The first, <literal>weld-numberguess</literal>, is a "
-"web (WAR) example containing only non-transactional managed beans. This "
+"web (war) example containing only non-transactional managed beans. This "
 "example can be run on a wide range of servers, including JBoss AS, "
 "GlassFish, Apache Tomcat, Jetty, Google App Engine, and any compliant Java "
 "EE 6 container. The second example, <literal>weld-translator</literal>, is "
-"an enterprise (EAR) example that contains session beans. This example must "
-"be run on JBoss AS 5.2, Glassfish 3.0 or any compliant Java EE 6 container."
+"an enterprise (ear) example that contains session beans. This example must "
+"be run on JBoss AS 6.0, Glassfish 3.0 or any compliant Java EE 6 container."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:16
 #, no-c-format
 msgid ""
 "Both examples use JSF 2.0 as the web framework and, as such, can be found in "
@@ -42,13 +39,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:22
 #, no-c-format
 msgid "Prerequisites"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:24
 #, no-c-format
 msgid ""
 "To run the examples with the provided build scripts, you'll need the "
@@ -56,58 +51,47 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:30
 #, no-c-format
 msgid "the latest release of Weld, which contains the examples"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:33
 #, no-c-format
 msgid "Ant 1.7.0, to build and deploy the examples"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:36
 #, no-c-format
 msgid "a supported runtime environment (minimum versions shown)"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:39
 #, no-c-format
-msgid ""
-"JBoss AS 5.2.0 (currently only nightly builds of JBoss AS 5.2.0.Beta1 are "
-"available),"
+msgid "JBoss AS 6.0.0,"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:42
 #, no-c-format
 msgid "GlassFish 3.0,"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:45
 #, no-c-format
-msgid "Apache Tomcat 6.0.x (WAR example only), or"
+msgid "Apache Tomcat 6.0.x (war example only), or"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:48
 #, no-c-format
-msgid "Jetty 6.1.x (WAR example only)"
+msgid "Jetty 6.1.x (war example only)"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:53
 #, no-c-format
 msgid ""
 "(optionally) Maven 2.x, to run the examples in an embedded servlet container"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:58
 #, no-c-format
 msgid ""
 "You'll need a full install of Ant 1.7.0. Some linux distributions only "
@@ -116,27 +100,24 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:64
 #, no-c-format
 msgid ""
 "In the next few sections, you'll be using the Ant command (<literal>ant</"
 "literal>) to invoke the Ant build script in each example to compile, "
-"assemble and deploy the example to JBoss AS and, for the WAR example, Apache "
-"Tomcat. You can also deploy the generated artifact (WAR or EAR) to any other "
+"assemble and deploy the example to JBoss AS and, for the war example, Apache "
+"Tomcat. You can also deploy the generated artifact (war or ear) to any other "
 "container that supports Java EE 6, such as GlassFish 3."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:71
 #, no-c-format
 msgid ""
 "If you have Maven installed, you can use the Maven command (<literal>mvn</"
-"literal>) to compile and assemble the standalone artifact (WAR or EAR) and, "
-"for the WAR example, run it in an embedded container."
+"literal>) to compile and assemble the standalone artifact (war or ear) and, "
+"for the war example, run it in an embedded container."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:76
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
@@ -144,28 +125,25 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:81
 #, no-c-format
 msgid "Deploying to JBoss AS"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:83
 #, no-c-format
 msgid ""
 "To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss."
-"org/jbossas/\">JBoss AS 5.2.0.Beta1</ulink> or above. If a release of the "
-"JBoss AS 5.2 line isn't yet available, you can download a <ulink url="
-"\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-5.x-sun16/"
-"\">nightly snapshot</ulink>. The reason JBoss AS 5.2.0.Beta1 or above is "
-"required is because it's the first release that has both CDI and Bean "
-"Validation support built-in, making it close enough to Java EE 6 to run the "
-"examples. The good news is that there are no additional modifications you "
-"have to make to the server. It's ready to go!"
+"org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS "
+"6.0 line isn't yet available, you can download a <ulink url=\"http://hudson."
+"jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</"
+"ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the "
+"first release that has both CDI and Bean Validation support built-in, making "
+"it close enough to Java EE 6 to run the examples. The good news is that "
+"there are no additional modifications you have to make to the server. It's "
+"ready to go!"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:92
 #, no-c-format
 msgid ""
 "After you have downloaded JBoss AS, extract it. (We recommended renaming the "
@@ -175,16 +153,7 @@
 "installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[$> unzip jboss-5.2.*.zip\n"
-"$> mv jboss-5.2.*/ jboss-as-5.2]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:101
 #, no-c-format
 msgid ""
 "In order for the build scripts to know where to deploy the example, you have "
@@ -195,72 +164,36 @@
 "<literal>jboss.home</literal>, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:108
-#, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:110
 #, no-c-format
 msgid "You're now ready to deploy your first example!"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:114
 #, no-c-format
 msgid ""
 "Switch to the <literal>examples/jsf/numberguess</literal> directory and "
 "execute the Ant <literal>deploy</literal> target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:119
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:121
 #, no-c-format
 msgid ""
 "If you haven't already, start JBoss AS. You can either start JBoss AS from a "
 "Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:125
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/jboss-as-5.2\n"
-"$> ./bin/run.sh]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:127 gettingstarted.xml:369
 #, no-c-format
 msgid "a Windows command window:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:131
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\jboss-as-5.2\\bin\n"
-"$> run]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:133 gettingstarted.xml:375
 #, no-c-format
 msgid "or you can start the server using an IDE, like Eclipse."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:138
 #, no-c-format
 msgid ""
 "If you are using Eclipse, you should seriously consider installing the "
@@ -270,7 +203,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:145
 #, no-c-format
 msgid ""
 "Wait a few seconds for the application to deploy (or the application server "
@@ -281,7 +213,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:152
 #, no-c-format
 msgid ""
 "The Ant build script includes additional targets for JBoss AS to deploy and "
@@ -290,7 +221,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:158
 #, no-c-format
 msgid ""
 "<literal>ant restart</literal> - deploy the example in exploded format to "
@@ -298,7 +228,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:163
 #, no-c-format
 msgid ""
 "<literal>ant explode</literal> - update an exploded example, without "
@@ -306,7 +235,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:168
 #, no-c-format
 msgid ""
 "<literal>ant deploy</literal> - deploy the example in compressed jar format "
@@ -314,19 +242,16 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:173
 #, no-c-format
 msgid "<literal>ant undeploy</literal> - remove the example from JBoss AS"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:178
 #, no-c-format
 msgid "<literal>ant clean</literal> - clean the example"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:185
 #, no-c-format
 msgid ""
 "The second starter example, <literal>weld-translator</literal>, will "
@@ -335,25 +260,15 @@
 "translator example directory and execute the deploy target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:191
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/translator\n"
-"$> ant deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:194
 #, no-c-format
 msgid ""
 "The translator uses session beans, which are packaged in an EJB module "
-"within an EAR. Java EE 6 will allow session beans to be deployed in WAR "
+"within an ear. Java EE 6 will allow session beans to be deployed in war "
 "modules, but that's a topic for a later chapter."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:200
 #, no-c-format
 msgid ""
 "Again, wait a few seconds for the application to deploy (if you're really "
@@ -362,55 +277,32 @@
 "pseudo-translating."
 msgstr ""
 
-#. Tag: para
-#: gettingstarted.xml:206
-#, no-c-format
-msgid ""
-"TODO Insert note about upgrading the Weld deployer that directs reader to "
-"section on the JBoss AS environment"
-msgstr ""
-
 #. Tag: title
-#: gettingstarted.xml:213
 #, no-c-format
 msgid "Deploying to GlassFish"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:215
 #, no-c-format
 msgid ""
-"Deploying to GlassFish should be easy, right? After all, it's the Java EE 6 "
-"reference implementation. Since it's the Java EE 6 reference implementation, "
-"that means it also bundles the JSR-299 reference implementation, Weld! So "
-"yes, it's very easy."
+"Deploying to GlassFish should be easy and familiar, right? After all, it's "
+"the Java EE 6 reference implementation and Weld is the JSR-299 reference "
+"implementation, meaning Weld gets bundled with GlassFish. So yes, it's all "
+"quite easy and familiar."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:221
 #, no-c-format
 msgid ""
 "To deploy the examples to GlassFish, you'll need the final <ulink url="
-"\"https://glassfish.dev.java.net/\">GlassFish V3</ulink> release (the "
-"preview release won't do). If the final release isn't yet available, you can "
-"download a <ulink url=\"http://download.java.net/glassfish/v3/promoted/"
-"\">promoted build</ulink> in the meantime. Select the b69 preview release or "
-"above that ends in either <literal>-unix.sh</literal> or <literal>-windows."
-"exe</literal> depending on your platform. After the download is complete, "
-"execute the installer. On Linux/Unix, you'll need to first make the script "
-"executable."
+"\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</"
+"ulink> release. Select the release that ends in either <literal>-unix.sh</"
+"literal> or <literal>-windows.exe</literal> depending on your platform. "
+"After the download is complete, execute the installer. On Linux/Unix, you'll "
+"need to first make the script executable."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:231
-#, no-c-format
-msgid ""
-"<![CDATA[$> chmod 755 glassfish-v3-b69-unix.sh\n"
-"$> ./glassfish-v3-b69-unix.sh]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:233
 #, no-c-format
 msgid ""
 "On Windows you can just click on the executable. Follow the instructions in "
@@ -421,7 +313,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:240
 #, no-c-format
 msgid ""
 "If you've deployed either of the starter examples, <literal>weld-"
@@ -430,16 +321,7 @@
 "either of the two directories and build it."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess (or examples/jsf/translator)\n"
-"$> ant package]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:248
 #, no-c-format
 msgid ""
 "The deployable archive for the <literal>weld-numberguess</literal>, named "
@@ -451,24 +333,17 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:255
 #, no-c-format
 msgid ""
-"You deploy applications to GlassFish using the <ulink url=\"http://"
-"localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin Console "
-"running, you need to start a GlassFish domain, in our case <literal>domain1</"
-"literal>. Switch to the <literal>bin</literal> folder in the directory where "
-"you installed GlassFish and execute the following command:"
+"One way to deploy applications to GlassFish is by using the <ulink url="
+"\"http://localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin "
+"Console running, you need to start a GlassFish domain, in our case "
+"<literal>domain1</literal>. Switch to the <literal>bin</literal> folder in "
+"the directory where you installed GlassFish and execute the following "
+"command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:262
-#, no-c-format
-msgid "<![CDATA[$> asadmin start-domain domain1]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:264
 #, no-c-format
 msgid ""
 "After a few seconds you can visit the Admin Console in the browser at the "
@@ -485,22 +360,26 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:276
 #, no-c-format
 msgid ""
+"Alternatively, you can deploy the application to GlassFish using the asadmin "
+"command:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The reason the same artifact can be deployed to both JBoss AS and GlassFish, "
 "without any modifications, is because all of the features being used are "
 "part of the standard platform. And what a capable platform it has become!"
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:285
 #, no-c-format
 msgid "Deploying to Apache Tomcat"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:287
 #, no-c-format
 msgid ""
 "Servlet containers are not required to support Java EE services like CDI. "
@@ -509,7 +388,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:291
 #, no-c-format
 msgid ""
 "Weld comes with a servlet listener which bootstraps the CDI environment, "
@@ -520,7 +398,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:297
 #, no-c-format
 msgid ""
 "Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll "
@@ -528,14 +405,7 @@
 "apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:302
-#, no-c-format
-msgid "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:304
 #, no-c-format
 msgid ""
 "You have two choices for how you can deploy the application to Tomcat. You "
@@ -546,13 +416,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:312
 #, no-c-format
 msgid "Deploying with Ant"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:314
 #, no-c-format
 msgid ""
 "In order for Ant to push the artifact to the Tomcat hot deploy directory, it "
@@ -563,36 +431,19 @@
 "property key <literal>tomcat.home</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:321
-#, no-c-format
-msgid "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:323
 #, no-c-format
 msgid "Now you're ready to deploy the numberguess example to Tomcat!"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:327
 #, no-c-format
 msgid ""
 "Change to the <literal>examples/jsf/numberguess</literal> directory again "
 "and run the Ant <literal>deploy</literal> target for Tomcat:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:332
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant tomcat.deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:335
 #, no-c-format
 msgid ""
 "The Ant build script includes additional targets for Tomcat to deploy and "
@@ -601,7 +452,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:341
 #, no-c-format
 msgid ""
 "<literal>ant tomcat.restart</literal> - deploy the example in exploded "
@@ -609,7 +459,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:346
 #, no-c-format
 msgid ""
 "<literal>ant tomcat.explode</literal> - update an exploded example, without "
@@ -617,7 +466,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:351
 #, no-c-format
 msgid ""
 "<literal>ant tomcat.deploy</literal> - deploy the example in compressed jar "
@@ -625,37 +473,18 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:356
 #, no-c-format
 msgid "<literal>ant tomcat.undeploy</literal> - remove the example from Tomcat"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:363
 #, no-c-format
 msgid ""
 "If you haven't already, start Tomcat. You can either start Tomcat from a "
 "Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:367
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/apache-tomcat-6\n"
-"$> ./bin/start.sh]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: gettingstarted.xml:373
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
-"$> start]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:379
 #, no-c-format
 msgid ""
 "Wait a few seconds for the application to deploy (or the application server "
@@ -666,13 +495,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:388
 #, no-c-format
 msgid "Deploying with Maven"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:390
 #, no-c-format
 msgid ""
 "You can also deploy the application to Tomcat using Maven. This section is a "
@@ -682,7 +509,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:396
 #, no-c-format
 msgid ""
 "The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
@@ -694,7 +520,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:403
 #, no-c-format
 msgid ""
 "To allow Maven to communicate with Tomcat over HTTP, edit the <literal>conf/"
@@ -702,41 +527,20 @@
 "following line:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:408
-#, no-c-format
-msgid "<![CDATA[<user username=\"admin\" password=\"\" roles=\"manager\"/>]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:410
 #, no-c-format
 msgid ""
 "Restart Tomcat. You can now deploy the application to Tomcat with Maven "
 "using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:414
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:exploded tomcat:exploded -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:416
 #, no-c-format
 msgid ""
 "Once the application is deployed, you can redeploy it using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:420
-#, no-c-format
-msgid "<![CDATA[$> mvn tomcat:redeploy -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:422
 #, no-c-format
 msgid ""
 "The <literal>-Ptomcat</literal> argument activates the <literal>tomcat</"
@@ -745,21 +549,13 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:427
 #, no-c-format
 msgid ""
 "Rather than shipping the container off to a standalone Tomcat installation, "
 "you can also execute the application in an embedded Tomcat 6 container:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:432
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace tomcat:run -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:434
 #, no-c-format
 msgid ""
 "The advantage of using the embedded server is that changes to assets in "
@@ -769,14 +565,7 @@
 "classpath resource, you need to execute a build:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:441
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:443
 #, no-c-format
 msgid ""
 "There are several other Maven goals that you can use if you are hacking on "
@@ -785,13 +574,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:453
 #, no-c-format
 msgid "Deploying to Jetty"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:457
 #, no-c-format
 msgid ""
 "Support for Jetty in the examples is a more recent addition. Since Jetty is "
@@ -802,7 +589,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:464
 #, no-c-format
 msgid ""
 "If you've read through the entire Tomcat section, then you're all ready to "
@@ -812,7 +598,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:470
 #, no-c-format
 msgid ""
 "The Maven POM (<literal>pom.xml</literal>) includes a profile named "
@@ -824,25 +609,15 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:479
 #, no-c-format
 msgid ""
 "To run the <literal>weld-numberguess</literal> example on Jetty, switch to "
 "the example directory and execute the <literal>inplace</literal> goal of the "
-"Maven WAR plugin followed by the <literal>run</literal> goal of the Maven "
+"Maven war plugin followed by the <literal>run</literal> goal of the Maven "
 "Jetty plugin with the <literal>jetty</literal> profile enabled, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:485
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> mvn war:inplace jetty:run -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:487
 #, no-c-format
 msgid ""
 "The log output of Jetty will be shown in the console. Once Jetty reports "
@@ -853,7 +628,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:494
 #, no-c-format
 msgid ""
 "Any changes to assets in <literal>src/main/webapp</literal> take effect "
@@ -861,30 +635,22 @@
 "application may automatically redeploy. The redeploy behavior can be fined-"
 "tuned in the plugin configuration. If you make a change to a classpath "
 "resource, you need to execute a build and the <literal>inplace</literal> "
-"goal of the Maven WAR plugin, again with the <literal>jetty</literal> "
+"goal of the Maven war plugin, again with the <literal>jetty</literal> "
 "profile enabled."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:501
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:503
 #, no-c-format
 msgid ""
-"The <literal>war:inplace</literal> goal copies the compiled classes and JARs "
+"The <literal>war:inplace</literal> goal copies the compiled classes and jars "
 "inside <literal>src/main/webapp</literal>, under <literal>WEB-INF/classes</"
 "literal> and <literal>WEB-INF/lib</literal>, respectively, mixing source and "
 "compiled files. However, the build does work around these temporary files by "
-"excluding them from the packaged WAR and cleaning them during the Maven "
+"excluding them from the packaged war and cleaning them during the Maven "
 "clean phase."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:510
 #, no-c-format
 msgid ""
 "You have two options if you want to run the example on Jetty from the IDE. "
@@ -894,33 +660,18 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:516
 #, no-c-format
 msgid "First, initialize the Eclipse project:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:520
-#, no-c-format
-msgid "<![CDATA[$> mvn clean eclipse:clean eclipse:eclipse -Pjetty-ide]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:522
 #, no-c-format
 msgid ""
 "Next, assemble all the necessary resources under <literal>src/main/webapp</"
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:526
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace -Pjetty-ide]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:528
 #, no-c-format
 msgid ""
 "Now, you are ready to run the server in Eclipse. Import the project into "
@@ -933,7 +684,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:536
 #, no-c-format
 msgid ""
 "Now that you have gotten the starter applications deployed on the server of "

Modified: doc/trunk/reference/fr-FR/injection.po
===================================================================
--- doc/trunk/reference/fr-FR/injection.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/injection.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-05 00:00+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,28 +14,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: injection.xml:4
 #, fuzzy, no-c-format
 msgid "Dependency injection and programmatic lookup"
 msgstr "Injection de dépendance"
 
 #. Tag: para
-#: injection.xml:6
 #, no-c-format
 msgid ""
-"One of the most significant features of CDI&#8212;certainly the most "
-"recognized&#8212;is dependency injection; excuse me, <emphasis>typesafe</"
-"emphasis> dependency injection."
+"One of the most significant features of CDI—certainly the most recognized—is "
+"dependency injection; excuse me, <emphasis>typesafe</emphasis> dependency "
+"injection."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:12
 #, no-c-format
 msgid "Injection points"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:14
 #, no-c-format
 msgid ""
 "The <literal>@Inject</literal> annotation lets us define an injection point "
@@ -44,81 +40,25 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:19
 #, fuzzy, no-c-format
 msgid "<emphasis>Bean constructor</emphasis> parameter injection:"
 msgstr ""
 "Injection de paramètre dans une méthode d'<emphasis>initialisation</"
 "emphasis>:"
 
-#. Tag: programlisting
-#: injection.xml:23
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private final ShoppingCart cart;\n"
-"    \n"
-"   @Inject\n"
-"   public Checkout(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"    private final ShoppingCart cart;\n"
-"    \n"
-"    @Initializer\n"
-"    public Checkout(ShoppingCart cart) {\n"
-"        this.cart = cart;\n"
-"    }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:26
 #, no-c-format
 msgid "A bean can only have one injectable constructor."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:31
 #, fuzzy, no-c-format
 msgid "<emphasis>Initializer method</emphasis> parameter injection:"
 msgstr ""
 "Injection de paramètre dans une méthode d'<emphasis>initialisation</"
 "emphasis>:"
 
-#. Tag: programlisting
-#: injection.xml:35
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private ShoppingCart cart;\n"
-"\n"
-"   @Inject\n"
-"   void setShoppingCart(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"    private ShoppingCart cart;\n"
-"\n"
-"    @Initializer \n"
-"    void setShoppingCart(ShoppingCart cart) {\n"
-"        this.cart = cart;\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:38
 #, no-c-format
 msgid ""
 "A bean can have multiple initializer methods. If the bean is a session bean, "
@@ -127,29 +67,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:44
 #, no-c-format
 msgid "And direct field injection:"
 msgstr "Et injection directe dans un champ:"
 
-#. Tag: programlisting
-#: injection.xml:48
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"   private @Inject ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"    private @Current ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:51
 #, no-c-format
 msgid ""
 "Getter and setter methods are not required for field injection to work "
@@ -157,7 +79,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:56
 #, fuzzy, no-c-format
 msgid ""
 "Dependency injection always occurs when the bean instance is first "
@@ -168,7 +89,6 @@
 "vient d'être instanciée."
 
 #. Tag: para
-#: injection.xml:63
 #, fuzzy, no-c-format
 msgid ""
 "First, the container calls the bean constructor (the default constructor or "
@@ -179,7 +99,6 @@
 "pour obtenir une instance d'un Web Bean."
 
 #. Tag: para
-#: injection.xml:69
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container initializes the values of all injected fields of the "
@@ -189,7 +108,6 @@
 "champs injectés du Web Bean."
 
 #. Tag: para
-#: injection.xml:74
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container calls all initializer methods of bean (the call order is "
@@ -199,7 +117,6 @@
 "d'initalisation du Web Bean."
 
 #. Tag: para
-#: injection.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "Finally, the <literal>@PostConstruct</literal> method, if any, is called."
@@ -208,7 +125,6 @@
 "une, est appelée."
 
 #. Tag: para
-#: injection.xml:86
 #, no-c-format
 msgid ""
 "(The only complication is that the container might call initializer methods "
@@ -217,7 +133,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:90
 #, no-c-format
 msgid ""
 "One major advantage of constructor injection is that it allows the bean to "
@@ -225,7 +140,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:95
 #, no-c-format
 msgid ""
 "CDI also supports parameter injection for some other methods that are "
@@ -233,36 +147,21 @@
 "producer methods:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:100
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:102
 #, no-c-format
 msgid ""
 "This is a case where the <literal>@Inject</literal> annotation <emphasis>is "
 "not</emphasis> required at the injection point. The same is true for "
-"observer methods (which we'll meet in <xref linkend=\"events\"/>) and "
+"observer methods (which we'll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:110
 #, no-c-format
 msgid "What gets injected"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:112
 #, fuzzy, no-c-format
 msgid ""
 "The CDI specification defines a procedure, called <emphasis>typesafe "
@@ -285,7 +184,6 @@
 "<literal>AmbiguousDependencyException</literal>."
 
 #. Tag: para
-#: injection.xml:120
 #, fuzzy, no-c-format
 msgid ""
 "The purpose of this algorithm is to allow multiple beans to implement the "
@@ -295,7 +193,6 @@
 "d'implémenter la même API et soit:"
 
 #. Tag: para
-#: injection.xml:126
 #, fuzzy, no-c-format
 msgid ""
 "allow the client to select which implementation it requires using a "
@@ -305,7 +202,6 @@
 "utiliser en utilisant des <emphasis>annotations de liaison</emphasis>,"
 
 #. Tag: para
-#: injection.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "allow the application deployer to select which implementation is appropriate "
@@ -318,13 +214,11 @@
 "de déploiement</emphasis>, ou"
 
 #. Tag: para
-#: injection.xml:137
 #, no-c-format
 msgid "allow the beans to be isolated into separate modules."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:143
 #, no-c-format
 msgid ""
 "Obviously, if you have exactly one bean of a given type, and an injection "
@@ -334,7 +228,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:149
 #, no-c-format
 msgid ""
 "But then, things start to get complicated. Let's explore how the container "
@@ -343,13 +236,11 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:157
 #, fuzzy, no-c-format
 msgid "Qualifier annotations"
 msgstr "Annotations de liaison"
 
 #. Tag: para
-#: injection.xml:159
 #, fuzzy, no-c-format
 msgid ""
 "If we have more than one bean that implements a particular bean type, the "
@@ -362,36 +253,7 @@
 "utilisant une annotation de liaison. Par exemple, il peut y avoir deux "
 "implémentation de <literal>PaymentProcessor</literal>:"
 
-#. Tag: programlisting
-#: injection.xml:165
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Synchronous\n"
-"public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: injection.xml:167
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Asynchronous\n"
-"public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:169
 #, fuzzy, no-c-format
 msgid ""
 "Where <literal>@Synchronous</literal> and <literal>@Asynchronous</literal> "
@@ -400,36 +262,7 @@
 "Où <literal>@PayByCheque</literal> et <literal>@PayByCreditCard</literal> "
 "sont des annotations de liaison:"
 
-#. Tag: programlisting
-#: injection.xml:173
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Synchronous {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayByCheque {}]]>"
-
-#. Tag: programlisting
-#: injection.xml:175
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Asynchronous {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayByCheque {}]]>"
-
 #. Tag: para
-#: injection.xml:177
 #, fuzzy, no-c-format
 msgid ""
 "A client bean developer uses the qualifier annotation to specify exactly "
@@ -439,76 +272,21 @@
 "pour spécifier exactement quel Web Bean doit être injecté."
 
 #. Tag: para
-#: injection.xml:181
 #, no-c-format
 msgid "Using field injection:"
 msgstr "En utilisant l'injection de champ:"
 
-#. Tag: programlisting
-#: injection.xml:183
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
-"@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@PayByCheque PaymentProcessor chequePaymentProcessor;\n"
-"@PayByCreditCard PaymentProcessor creditCardPaymentProcessor;]]>"
-
 #. Tag: para
-#: injection.xml:185
 #, no-c-format
 msgid "Using initializer method injection:"
 msgstr "En  utilisant l'injection de méthode d'initialisation:"
 
-#. Tag: programlisting
-#: injection.xml:187
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public void setPaymentProcessors(@Synchronous PaymentProcessor "
-"syncPaymentProcessor, \n"
-"                                 @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public void setPaymentProcessors(@PayByCheque PaymentProcessor "
-"chequePaymentProcessor, \n"
-"                                 @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:189
 #, fuzzy, no-c-format
 msgid "Using constructor injection:"
 msgstr "Ou en utilisant l'injection de constructeur:"
 
-#. Tag: programlisting
-#: injection.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
-"                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public Checkout(@PayByCheque PaymentProcessor chequePaymentProcessor, \n"
-"                @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:193
 #, no-c-format
 msgid ""
 "Qualifier annotations can also qualify method arguments of producer, "
@@ -517,29 +295,7 @@
 "runtime based on the state of the system:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:199
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces\n"
-"PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
-"syncPaymentProcessor,\n"
-"                                     @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   return isSynchronous() ? syncPaymentProcessor : asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public void setPaymentProcessors(@PayByCheque PaymentProcessor "
-"chequePaymentProcessor, \n"
-"                                 @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:201
 #, no-c-format
 msgid ""
 "If an injected field or a parameter of a bean constructor or initializer "
@@ -548,7 +304,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:206
 #, no-c-format
 msgid ""
 "Now, you may be thinking, <emphasis>\"What's the different between using a "
@@ -560,7 +315,6 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:216
 #, no-c-format
 msgid ""
 "The built-in qualifiers <literal>@Default</literal> and <literal>@Any</"
@@ -568,7 +322,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:218
 #, no-c-format
 msgid ""
 "Whenever a bean or injection point does not explicitly declare a qualifier, "
@@ -581,33 +334,18 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:225
 #, no-c-format
 msgid ""
 "This is especially useful if you want to iterate over all beans with a "
 "certain bean type. For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:226
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject \n"
-"void initServices(@Any Instance<Service> services) { \n"
-"   for (Service service: services) {\n"
-"      service.init();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:232
 #, no-c-format
 msgid "Qualifiers with members"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:234
 #, no-c-format
 msgid ""
 "Java annotations can have members. We can use annotation members to further "
@@ -617,41 +355,13 @@
 "single annotation with a member:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:240
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayBy {\n"
-"    PaymentType value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:242
 #, no-c-format
 msgid ""
 "Then we select one of the possible member values when appling the qualifier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:246
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:248
 #, fuzzy, no-c-format
 msgid ""
 "We can force the container to ignore a member of a qualifier type by "
@@ -660,49 +370,18 @@
 "Vous pouvez dire au gestionnaire de Web Bean d'ignorer un membre d'un type "
 "d'annotation de liaison en annotant le membre <literal>@NonBinding</literal>."
 
-#. Tag: programlisting
-#: injection.xml:253
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"   @Nonbinding String comment() default \"\";\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayBy {\n"
-"    PaymentType value();\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:258
 #, no-c-format
 msgid "Multiple qualifiers"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:260
 #, fuzzy, no-c-format
 msgid "An injection point may specify multiple qualifiers:"
 msgstr ""
 "Un point d'injection peut même spécifier plusieurs annotations de liaison:"
 
-#. Tag: programlisting
-#: injection.xml:264
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
-"syncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:266
 #, fuzzy, no-c-format
 msgid ""
 "Then only a bean which has <emphasis>both</emphasis> qualifier annotations "
@@ -711,29 +390,12 @@
 "Dans ce cas, seul un Web Bean qui a <emphasis>les deux</emphasis> "
 "annotations de liaison serait éligible pour l'injection."
 
-#. Tag: programlisting
-#: injection.xml:271
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Synchronous @Reliable\n"
-"public class SynchronousReliablePaymentProcessor implements PaymentProcessor "
-"{\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:276
 #, no-c-format
 msgid "Alternatives"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:278
 #, no-c-format
 msgid ""
 "Alternatives are beans whose implementation is specific to a particular "
@@ -742,22 +404,7 @@
 "<literal>@Asynchronous PaymentProcessor</literal>, all in one:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:282
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Synchronous @Asynchronous\n"
-"public class MockPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:284
 #, no-c-format
 msgid ""
 "By default, <literal>@Alternative</literal> beans are disabled. We need to "
@@ -766,24 +413,7 @@
 "and injection. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:290
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <class>org.mycompany.mock.MockPaymentProcessor</class>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:292
 #, no-c-format
 msgid ""
 "When an ambiguous dependency exists at an injection point, the container "
@@ -793,13 +423,11 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:301
 #, fuzzy, no-c-format
 msgid "Fixing unsatisfied and ambiguous dependencies"
 msgstr "Résoudre les dépendances insatisfaites"
 
 #. Tag: para
-#: injection.xml:303
 #, fuzzy, no-c-format
 msgid ""
 "The typesafe resolution algorithm fails when, after considering the "
@@ -815,7 +443,6 @@
 "incapable d'identifier exactement un Web Bean à injecter."
 
 #. Tag: para
-#: injection.xml:310
 #, no-c-format
 msgid ""
 "During the course of your development, you're going to encounter this "
@@ -823,13 +450,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:314
 #, no-c-format
 msgid "To fix an <emphasis>unsatisfied dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:320
 #, no-c-format
 msgid ""
 "create a bean which implements the bean type and has all the qualifier types "
@@ -837,7 +462,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:325
 #, no-c-format
 msgid ""
 "make sure that the bean you already have is in the classpath of the module "
@@ -845,7 +469,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:330
 #, no-c-format
 msgid ""
 "explicitly enable an <literal>@Alternative</literal> bean that implements "
@@ -854,13 +477,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:337
 #, no-c-format
 msgid "To fix an <emphasis>ambiguous dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:343
 #, no-c-format
 msgid ""
 "introduce a qualifier to distinguish between the two implementations of the "
@@ -868,14 +489,12 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:348
 #, no-c-format
 msgid ""
 "disable one of the beans by annotating it <literal>@Alternative</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:353
 #, no-c-format
 msgid ""
 "move one of the implementations to a module that is not in the classpath of "
@@ -883,7 +502,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:359
 #, no-c-format
 msgid ""
 "disable one of two <literal>@Alternative</literal> beans that are trying to "
@@ -891,7 +509,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:366
 #, no-c-format
 msgid ""
 "See <ulink url=\"http://sfwk.org/Documentation/"
@@ -902,22 +519,19 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:374
 #, no-c-format
 msgid "Just remember: \"There can be only one.\""
 msgstr ""
 
 #. Tag: para
-#: injection.xml:377
 #, no-c-format
 msgid ""
 "On the other hand, if you really do have an optional or multivalued "
 "injection point, you should change the type of your injection point to "
-"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\"/>."
+"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:382
 #, no-c-format
 msgid ""
 "Now there's one more issue you need to be aware of when using the dependency "
@@ -925,13 +539,11 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:389
 #, no-c-format
 msgid "Client proxies"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:391
 #, no-c-format
 msgid ""
 "Clients of an injected bean do not usually hold a direct reference to a bean "
@@ -940,17 +552,15 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:396
 #, no-c-format
 msgid ""
 "Imagine that a bean bound to the application scope held a direct reference "
 "to a bean bound to the request scope. The application-scoped bean is shared "
 "between many different requests. However, each request should see a "
-"different instance of the request scoped bean&#8212;the current one!"
+"different instance of the request scoped bean—the current one!"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:402
 #, no-c-format
 msgid ""
 "Now imagine that a bean bound to the session scope holds a direct reference "
@@ -962,7 +572,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:409
 #, no-c-format
 msgid ""
 "Therefore, unless a bean has the default scope <literal>@Dependent</"
@@ -976,7 +585,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:417
 #, no-c-format
 msgid ""
 "Unfortunately, due to limitations of the Java language, some Java types "
@@ -987,20 +595,17 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:423
 #, no-c-format
 msgid "The following Java types cannot be proxied by the container:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:427
 #, no-c-format
 msgid ""
 "classes which don't have a non-private constructor with no parameters, and"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:430
 #, no-c-format
 msgid ""
 "classes which are declared <literal>final</literal> or have a "
@@ -1008,13 +613,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:435
 #, no-c-format
 msgid "arrays and primitive types."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:439
 #, no-c-format
 msgid ""
 "It's usually very easy to fix an unproxyable dependency problem. If an "
@@ -1023,13 +626,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:446
 #, no-c-format
 msgid "add a constructor with no parameters to <literal>X</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:451
 #, no-c-format
 msgid ""
 "change the type of the injection point to <literal>Instance&lt;X&gt;</"
@@ -1037,7 +638,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:456
 #, no-c-format
 msgid ""
 "introduce an interface <literal>Y</literal>, implemented by the injected "
@@ -1045,7 +645,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:462
 #, no-c-format
 msgid ""
 "if all else fails, change the scope of the injected bean to "
@@ -1053,7 +652,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:469
 #, no-c-format
 msgid ""
 "A future release of Weld will likely support a non-standard workaround for "
@@ -1061,7 +659,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:476
 #, no-c-format
 msgid ""
 "Sun, IcedTea, Mac: <literal>Unsafe.allocateInstance()</literal> (The most "
@@ -1069,7 +666,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:481
 #, no-c-format
 msgid ""
 "IBM, JRockit: <literal>ReflectionFactory.newConstructorForSerialization()</"
@@ -1077,19 +673,16 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:487
 #, no-c-format
 msgid "But we didn't get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:496
 #, no-c-format
 msgid "Obtaining a contextual instance by programmatic lookup"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:498
 #, no-c-format
 msgid ""
 "In certain situations, injection is not the most convenient way to obtain a "
@@ -1097,13 +690,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:505
 #, no-c-format
 msgid "the bean type or qualifiers vary dynamically at runtime, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:510
 #, no-c-format
 msgid ""
 "depending upon the deployment, there may be no bean which satisfies the type "
@@ -1111,27 +702,18 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:515
 #, no-c-format
 msgid "we would like to iterate over all beans of a certain type."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:521
 #, no-c-format
 msgid ""
 "In these situations, the application may obtain an instance of the interface "
 "<literal>Instance</literal>, parameterized for the bean type, by injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:526
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:528
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>get()</literal> method of <literal>Instance</literal> produces "
@@ -1140,26 +722,17 @@
 "<literal>@Mock</literal> and <literal>@Staging</literal> deployment types "
 "for testing"
 
-#. Tag: programlisting
-#: injection.xml:532
-#, fuzzy, no-c-format
-msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:534
 #, no-c-format
 msgid "Qualifiers can be specified in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:540
 #, no-c-format
 msgid "by annotating the <literal>Instance</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:543
 #, no-c-format
 msgid ""
 "by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
@@ -1167,22 +740,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:547
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is much, much easier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:551
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
-"paymentProcessorSource;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:553
 #, no-c-format
 msgid ""
 "Now, the <literal>PaymentProcessor</literal> returned by <literal>get()</"
@@ -1190,7 +752,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:558
 #, no-c-format
 msgid ""
 "Alternatively, we can specify the qualifier dynamically. First, we add the "
@@ -1198,15 +759,7 @@
 "default qualifier. (All beans have the qualifier <literal>@Any</literal>.)"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:563
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:565
 #, no-c-format
 msgid ""
 "Next, we need to obtain an instance of our qualifier type. Since annotatons "
@@ -1216,61 +769,30 @@
 "subclassing the helper class <literal>AnnotationLiteral</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:572
-#, no-c-format
-msgid ""
-"<![CDATA[abstract class AsynchronousQualifier\n"
-"extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:574
 #, no-c-format
 msgid "In some cases, we can use an anonymous class:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:578
-#, no-c-format
-msgid ""
-"<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
-"   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:581
 #, no-c-format
 msgid ""
 "We can't use an anonymous class to implement a qualifier type with members."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:586
 #, no-c-format
 msgid ""
 "Now, finally, we can pass the qualifier to the <literal>select()</literal> "
 "method of <literal>Instance</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:590
-#, no-c-format
-msgid ""
-"<![CDATA[Annotation qualifier = synchronously ?\n"
-"      new SynchronousQualifier() : new AsynchronousQualifier();\n"
-"PaymentProcessor p = anyPaymentProcessor.select(qualifier).get().process"
-"(payment);]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:595
 #, no-c-format
 msgid "The <literal>InjectionPoint</literal> object"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:597
 #, no-c-format
 msgid ""
 "There are certain kinds of dependent objects (beans with scope "
@@ -1280,7 +802,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:603
 #, no-c-format
 msgid ""
 "The log category for a <literal>Logger</literal> depends upon the class of "
@@ -1288,7 +809,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:607
 #, no-c-format
 msgid ""
 "Injection of a HTTP parameter or header value depends upon what parameter or "
@@ -1296,7 +816,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:611
 #, no-c-format
 msgid ""
 "Injection of the result of an EL expression evaluation depends upon the "
@@ -1304,7 +823,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:616
 #, no-c-format
 msgid ""
 "A bean with scope <literal>@Dependent</literal> may inject an instance of "
@@ -1313,116 +831,42 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:620
 #, no-c-format
 msgid ""
 "Let's look at an example. The following code is verbose, and vulnerable to "
 "refactoring problems:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:623
-#, no-c-format
-msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:625
 #, no-c-format
 msgid ""
 "This clever little producer method lets you inject a JDK <literal>Logger</"
 "literal> without explicitly specifying the log category:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:628
-#, no-c-format
-msgid ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:630
 #, no-c-format
 msgid "We can now write:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:632
-#, no-c-format
-msgid "<![CDATA[@Inject Logger log;]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:634
 #, no-c-format
 msgid ""
 "Not convinced? Then here's a second example. To inject HTTP parameters, we "
 "need to define a qualifier type:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:637
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @Nonbinding public String value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayBy {\n"
-"    PaymentType value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:639
 #, no-c-format
 msgid "We would use this qualifier type at injection points as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:641
-#, no-c-format
-msgid ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:643
 #, no-c-format
 msgid "The following producer method does the work:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:645
-#, no-c-format
-msgid ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotated().getAnnotation(HttpParam."
-"class).value());\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:647
 #, no-c-format
 msgid ""
 "(Note that the <literal>value()</literal> member of the <literal>HttpParam</"
@@ -1431,29 +875,306 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:650
 #, no-c-format
 msgid ""
 "The container provides a built-in bean that implements the "
 "<literal>InjectionPoint</literal> interface:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:653
-#, no-c-format
-msgid ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Type getType();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Bean<?> getBean();\n"
-"   public Member getMember();\n"
-"   public Annotated getAnnotated();\n"
-"   public boolean isDelegate();\n"
-"   public boolean isTransient();\n"
-"}]]>"
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   public Checkout(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "    private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "    @Initializer\n"
+#~ "    public Checkout(ShoppingCart cart) {\n"
+#~ "        this.cart = cart;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "}]]>"
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private ShoppingCart cart;\n"
+#~ "\n"
+#~ "   @Inject\n"
+#~ "   void setShoppingCart(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "    private ShoppingCart cart;\n"
+#~ "\n"
+#~ "    @Initializer \n"
+#~ "    void setShoppingCart(ShoppingCart cart) {\n"
+#~ "        this.cart = cart;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "   private @Inject ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "    private @Current ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Synchronous\n"
+#~ "public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Asynchronous\n"
+#~ "public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Synchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayByCheque {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Asynchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayByCheque {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
+#~ "@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque PaymentProcessor chequePaymentProcessor;\n"
+#~ "@PayByCreditCard PaymentProcessor creditCardPaymentProcessor;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public void setPaymentProcessors(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor, \n"
+#~ "                                 @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public void setPaymentProcessors(@PayByCheque PaymentProcessor "
+#~ "chequePaymentProcessor, \n"
+#~ "                                 @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
+#~ "                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public Checkout(@PayByCheque PaymentProcessor chequePaymentProcessor, \n"
+#~ "                @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces\n"
+#~ "PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor,\n"
+#~ "                                     @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   return isSynchronous() ? syncPaymentProcessor : "
+#~ "asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public void setPaymentProcessors(@PayByCheque PaymentProcessor "
+#~ "chequePaymentProcessor, \n"
+#~ "                                 @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayBy {\n"
+#~ "    PaymentType value();\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "   @Nonbinding String comment() default \"\";\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayBy {\n"
+#~ "    PaymentType value();\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
+#~ "syncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Synchronous @Reliable\n"
+#~ "public class SynchronousReliablePaymentProcessor implements "
+#~ "PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative @Synchronous @Asynchronous\n"
+#~ "public class MockPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
+#~ "paymentProcessorSource;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]"
+#~ ">"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @Nonbinding public String value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayBy {\n"
+#~ "    PaymentType value();\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "Web Beans supports three primary mechanisms for dependency injection:"
 #~ msgstr ""
 #~ "Les Web Beans suportent trois principaux mécanismes d'injection de "

Modified: doc/trunk/reference/fr-FR/interceptors.po
===================================================================
--- doc/trunk/reference/fr-FR/interceptors.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/interceptors.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: interceptors.xml:5
 #, no-c-format
 msgid "Interceptors"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:7
 #, no-c-format
 msgid ""
 "Interceptor functionality is defined in the Java Interceptors specification. "
@@ -29,69 +27,41 @@
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:12
 #, no-c-format
 msgid ""
 "The Interceptors specification defines two kinds of interception points:"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:18
 #, no-c-format
 msgid "business method interception, and"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:21
 #, no-c-format
 msgid "lifecycle callback interception."
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:25
 #, no-c-format
 msgid "In addition, the EJB specification defines timeout method interception."
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:29
 #, no-c-format
 msgid ""
 "A <emphasis>business method interceptor</emphasis> applies to invocations of "
 "methods of the bean by clients of the bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:34
-#, no-c-format
-msgid ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:36
 #, no-c-format
 msgid ""
 "A <emphasis>lifecycle callback interceptor</emphasis> applies to invocations "
 "of lifecycle callbacks by the container:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:41
-#, no-c-format
-msgid ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"   @PostConstruct \n"
-"   public void injectDependencies(InvocationContext ctx) { ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:43
 #, no-c-format
 msgid ""
 "An interceptor class may intercept both lifecycle callbacks and business "
@@ -99,32 +69,18 @@
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:47
 #, no-c-format
 msgid ""
 "A <emphasis>timeout method interceptor</emphasis> applies to invocations of "
 "EJB timeout methods by the container:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:52
-#, no-c-format
-msgid ""
-"<![CDATA[public class TimeoutInterceptor {\n"
-"   @AroundTimeout \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: interceptors.xml:55
 #, no-c-format
 msgid "Interceptor bindings"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:57
 #, no-c-format
 msgid ""
 "Suppose we want to declare that some of our beans are transactional. The "
@@ -132,55 +88,24 @@
 "specify exactly which beans we're interested in:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:62
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:64
 #, no-c-format
 msgid ""
 "Now we can easily specify that our <literal>ShoppingCart</literal> is a "
 "transactional object:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:68
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:70
 #, no-c-format
 msgid "Or, if we prefer, we can specify that just one method is transactional:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:74
-#, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: interceptors.xml:79
 #, no-c-format
 msgid "Implementing interceptors"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:81
 #, no-c-format
 msgid ""
 "That's great, but somewhere along the line we're going to have to actually "
@@ -189,54 +114,22 @@
 "<literal>@Interceptor</literal> and <literal>@Transactional</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:87
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:89
 #, no-c-format
 msgid "Interceptors can take advantage of dependency injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:93
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource UserTransaction transaction;\n"
-"\n"
-"    @AroundInvoke \n"
-"    public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:95
 #, no-c-format
 msgid "Multiple interceptors may use the same interceptor binding type."
 msgstr ""
 
 #. Tag: title
-#: interceptors.xml:102
 #, no-c-format
 msgid "Enabling interceptors"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:104
 #, no-c-format
 msgid ""
 "By default, all interceptors are disabled. We need to <emphasis>enable</"
@@ -244,30 +137,12 @@
 "a bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:110
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:112
 #, no-c-format
 msgid "Whoah! Why the angle bracket stew?"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:114
 #, no-c-format
 msgid ""
 "Well, having the XML declaration is actually a <emphasis>good thing</"
@@ -275,7 +150,6 @@
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:120
 #, no-c-format
 msgid ""
 "it enables us to specify a total ordering for all the interceptors in our "
@@ -283,38 +157,18 @@
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:126
 #, no-c-format
 msgid "it lets us enable or disable interceptor classes at deployment time."
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:130
 #, no-c-format
 msgid ""
 "For example, we could specify that our security interceptor runs before our "
 "transaction interceptor."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.SecurityInterceptor</class>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:136
 #, no-c-format
 msgid ""
 "Or we could turn them both off in our test environment by simply not "
@@ -322,33 +176,18 @@
 msgstr ""
 
 #. Tag: title
-#: interceptors.xml:142
 #, no-c-format
 msgid "Interceptor bindings with members"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:144
 #, no-c-format
 msgid ""
 "Suppose we want to add some extra information to our "
 "<literal>@Transactional</literal> annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:148
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"   boolean requiresNew() default false;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:150
 #, no-c-format
 msgid ""
 "CDI will use the value of <literal>requiresNew</literal> to choose between "
@@ -356,36 +195,14 @@
 "<literal>RequiresNewTransactionInterceptor</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:155
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:157
 #, no-c-format
 msgid ""
 "Now we can use <literal>RequiresNewTransactionInterceptor</literal> like "
 "this:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:161
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true)\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:163
 #, no-c-format
 msgid ""
 "But what if we only have one interceptor and we want the container to ignore "
@@ -394,26 +211,12 @@
 "We can use the <literal>@Nonbinding</literal> annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:169
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"   @Nonbinding String[] rolesAllowed() default {};\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: interceptors.xml:174
 #, no-c-format
 msgid "Multiple interceptor binding annotations"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:176
 #, no-c-format
 msgid ""
 "Usually we use combinations of interceptor bindings types to bind multiple "
@@ -422,85 +225,26 @@
 "<literal>SecurityInterceptor</literal> to the same bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:182
-#, no-c-format
-msgid ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:184
 #, no-c-format
 msgid ""
 "However, in very complex cases, an interceptor itself may specify some "
 "combination of interceptor binding types:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:189
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:191
 #, no-c-format
 msgid ""
 "Then this interceptor could be bound to the <literal>checkout()</literal> "
 "method using any one of the following combinations:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:196
-#, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: interceptors.xml:198
-#, no-c-format
-msgid ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: interceptors.xml:200
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart {\n"
-"   @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: interceptors.xml:202
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: interceptors.xml:207
 #, no-c-format
 msgid "Interceptor binding type inheritance"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:209
 #, no-c-format
 msgid ""
 "One limitation of the Java language support for annotations is the lack of "
@@ -508,37 +252,17 @@
 "allow this kind of thing to work:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:214
-#, no-c-format
-msgid ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:216
 #, no-c-format
 msgid ""
 "Well, fortunately, CDI works around this missing feature of Java. We may "
 "annotate one interceptor binding type with other interceptor binding types "
 "(termed a <emphasis>meta-annotation</emphasis>). The interceptor bindings "
-"are transitive &#8212; any bean with the first interceptor binding inherits "
-"the interceptor bindings declared as meta-annotations."
+"are transitive — any bean with the first interceptor binding inherits the "
+"interceptor bindings declared as meta-annotations."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:223
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBinding\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:225
 #, no-c-format
 msgid ""
 "Now, any bean annotated <literal>@Action</literal> will be bound to both "
@@ -548,13 +272,11 @@
 msgstr ""
 
 #. Tag: title
-#: interceptors.xml:234
 #, no-c-format
 msgid "Use of <literal>@Interceptors</literal>"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:236
 #, no-c-format
 msgid ""
 "The <literal>@Interceptors</literal> annotation defined by the interceptor "
@@ -562,45 +284,29 @@
 "supported in CDI."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:239
-#, no-c-format
-msgid ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:241
 #, no-c-format
 msgid "However, this approach suffers the following drawbacks:"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:245
 #, no-c-format
 msgid "the interceptor implementation is hardcoded in business code,"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:250
 #, no-c-format
 msgid "interceptors may not be easily disabled at deployment time, and"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:255
 #, no-c-format
 msgid ""
-"the interceptor ordering is non-global &#8212; it is determined by the order "
-"in which interceptors are listed at the class level."
+"the interceptor ordering is non-global — it is determined by the order in "
+"which interceptors are listed at the class level."
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:262
 #, no-c-format
 msgid "Therefore, we recommend the use of CDI-style interceptor bindings."
 msgstr ""

Modified: doc/trunk/reference/fr-FR/intro.po
===================================================================
--- doc/trunk/reference/fr-FR/intro.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/intro.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: intro.xml:4
 #, no-c-format
 msgid "Introduction"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:6
 #, no-c-format
 msgid ""
 "So you're keen to get started writing your first bean? Or perhaps you're "
@@ -31,13 +29,11 @@
 msgstr ""
 
 #. Tag: title
-#: intro.xml:13
 #, no-c-format
 msgid "What is a bean?"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:15
 #, no-c-format
 msgid ""
 "A bean is exactly what you think it is. Only now, it has a true identity in "
@@ -45,7 +41,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:19
 #, no-c-format
 msgid ""
 "Prior to Java EE 6, there was no clear definition of the term \"bean\" in "
@@ -58,7 +53,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:27
 #, no-c-format
 msgid ""
 "Java EE 6 finally lays down that common definition in the Managed Beans "
@@ -72,14 +66,13 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:36
 #, no-c-format
 msgid ""
 "With very few exceptions, almost every concrete Java class that has a "
 "constructor with no parameters (or a constructor designated with the "
 "annotation <literal>@Inject</literal>) is a bean. This includes every "
 "JavaBean and every EJB session bean. If you've already got some JavaBeans or "
-"session beans lying around, they're already beans&#8212;you won't need any "
+"session beans lying around, they're already beans—you won't need any "
 "additional special metadata. There's just little one thing you need to do "
 "before you can start injecting them into stuff: you need to put them in an "
 "archive (a jar, or a Java EE module such as a war or EJB jar) that contains "
@@ -87,33 +80,29 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:45
 #, no-c-format
 msgid ""
 "The JavaBeans and EJBs you've been writing every day, up until now, have not "
 "been able to take advantage of the new services defined by the CDI "
-"specification. But you'll be able to use every one of them with CDI&#8212;"
-"allowing the container to create and destroy instances of your beans and "
-"associate them with a designated context, injecting them into other beans, "
-"using them in EL expressions, specializing them with qualifier annotations, "
-"even adding interceptors and decorators to them&#8212;without modifying your "
-"existing code. At most, you'll need to add some annotations."
+"specification. But you'll be able to use every one of them with CDI—allowing "
+"the container to create and destroy instances of your beans and associate "
+"them with a designated context, injecting them into other beans, using them "
+"in EL expressions, specializing them with qualifier annotations, even adding "
+"interceptors and decorators to them—without modifying your existing code. At "
+"most, you'll need to add some annotations."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:54
 #, no-c-format
 msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
-#: intro.xml:61
 #, no-c-format
 msgid "Getting our feet wet"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:63
 #, no-c-format
 msgid ""
 "Suppose that we have two existing Java classes that we've been using for "
@@ -121,17 +110,7 @@
 "of sentences:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:68
-#, no-c-format
-msgid ""
-"<![CDATA[public class SentenceParser {\n"
-"   public List<String> parse(String text) { ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:70
 #, no-c-format
 msgid ""
 "The second existing class is a stateless session bean front-end for an "
@@ -139,67 +118,19 @@
 "another:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:75
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"   public String translate(String sentence) { ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:77
 #, no-c-format
 msgid "Where <literal>Translator</literal> is the EJB local interface:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:79
-#, no-c-format
-msgid ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"   public String translate(String sentence);\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:81
 #, no-c-format
 msgid ""
 "Unfortunately, we don't have a class that translates whole text documents. "
 "So let's write a bean for this job:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:85
-#, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator {\n"
-"   private SentenceParser sentenceParser;\n"
-"   private Translator sentenceTranslator;\n"
-"    \n"
-"   @Inject\n"
-"   TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"      this.sentenceParser = sentenceParser;\n"
-"      this.sentenceTranslator = sentenceTranslator;\n"
-"   }\n"
-"    \n"
-"   public String translate(String text) {\n"
-"      StringBuilder sb = new StringBuilder();\n"
-"      for (String sentence: sentenceParser.parse(text)) {\n"
-"          sb.append(sentenceTranslator.translate(sentence));\n"
-"      }\n"
-"      return sb.toString();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:87
 #, no-c-format
 msgid ""
 "But wait! <literal>TextTranslator</literal> does not have a constructor with "
@@ -209,7 +140,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:93
 #, no-c-format
 msgid ""
 "As you've guessed, the <literal>@Inject</literal> annotation has something "
@@ -220,7 +150,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:100
 #, no-c-format
 msgid ""
 "We may obtain an instance of <literal>TextTranslator</literal> by injecting "
@@ -231,7 +160,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:107
 #, no-c-format
 msgid ""
 "Let's create a UI controller bean that uses field injection to obtain an "
@@ -239,44 +167,12 @@
 "entered by a user:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:116
-#, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class TranslateController {\n"
-"   @Inject TextTranslator textTranslator;\n"
-"\n"
-"   private String inputText;\n"
-"   private String translation;\n"
-"\n"
-"   // JSF action method, perhaps\n"
-"   public void translate() {\n"
-"      translation = textTranslator.translate(inputText); \n"
-"   }\n"
-"\n"
-"   public String getInputText() {\n"
-"      return inputText;\n"
-"   }\n"
-"\n"
-"   public void setInputText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"\n"
-"   public String getTranslation() {\n"
-"      return translation;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:119
 #, no-c-format
 msgid "Field injection of <literal>TextTranslator</literal> instance"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:127
 #, no-c-format
 msgid ""
 "Notice the controller bean is request-scoped and named. Since this "
@@ -287,7 +183,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:135
 #, no-c-format
 msgid ""
 "Alternatively, we may obtain an instance of <literal>TextTranslator</"
@@ -295,19 +190,7 @@
 "literal>, parameterized with the bean type:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:140
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
-"...\n"
-"public void translate() {\n"
-"   textTranslatorInstance.get().translate(inputText);\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:142
 #, no-c-format
 msgid ""
 "Notice that it isn't necessary to create a getter or setter method to inject "
@@ -318,21 +201,18 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:148
 #, no-c-format
 msgid ""
 "At system initialization time, the container must validate that exactly one "
 "bean exists which satisfies each injection point. In our example, if no "
-"implementation of <literal>Translator</literal> is available&#8212;if the "
-"<literal>SentenceTranslator</literal> EJB was not deployed&#8212;the "
-"container would inform us of an <emphasis>unsatisfied dependency</emphasis>. "
-"If more than one implementation of <literal>Translator</literal> were "
-"available, the container would inform us of the <emphasis>ambiguous "
-"dependency</emphasis>."
+"implementation of <literal>Translator</literal> is available—if the "
+"<literal>SentenceTranslator</literal> EJB was not deployed—the container "
+"would inform us of an <emphasis>unsatisfied dependency</emphasis>. If more "
+"than one implementation of <literal>Translator</literal> were available, the "
+"container would inform us of the <emphasis>ambiguous dependency</emphasis>."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:156
 #, no-c-format
 msgid ""
 "Before we get too deep in the details, let's pause and examine a bean's "

Modified: doc/trunk/reference/fr-FR/master.po
===================================================================
--- doc/trunk/reference/fr-FR/master.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/master.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-02-05 00:03+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: master.xml:9
 #, no-c-format
 msgid "A note about naming and nomenclature"
 msgstr ""
 
 #. Tag: para
-#: master.xml:10
 #, no-c-format
 msgid ""
 "Shortly before the final draft of JSR-299 was submitted, the specification "
@@ -35,7 +33,6 @@
 msgstr ""
 
 #. Tag: para
-#: master.xml:19
 #, no-c-format
 msgid ""
 "You'll also find that some of the functionality that once existed in the "
@@ -45,43 +42,37 @@
 msgstr ""
 
 #. Tag: para
-#: master.xml:25
 #, no-c-format
 msgid ""
 "Note that this reference guide was started while changes were still being "
 "made to the specification. We've done our best to update it for accuracy. If "
 "you discover a conflict between what is written in this guide and the "
-"specification, the specification is the authority&#8212;assume it is "
-"correct. If you believe you have found an error in the specification, please "
-"report it to the JSR-299 EG."
+"specification, the specification is the authority—assume it is correct. If "
+"you believe you have found an error in the specification, please report it "
+"to the JSR-299 EG."
 msgstr ""
 
 #. Tag: title
-#: master.xml:36
 #, no-c-format
 msgid "Beans"
 msgstr ""
 
 #. Tag: title
-#: master.xml:49
 #, no-c-format
 msgid "Weld, the CDI Reference Implementation"
 msgstr ""
 
 #. Tag: title
-#: master.xml:59
 #, fuzzy, no-c-format
 msgid "Loose coupling with strong typing"
 msgstr "Tirer meilleur parti du typage fort"
 
 #. Tag: title
-#: master.xml:75
 #, fuzzy, no-c-format
 msgid "CDI and the Java EE ecosystem"
 msgstr "Web Beans et l'écosystème Java EE"
 
 #. Tag: title
-#: master.xml:87
 #, no-c-format
 msgid "Weld reference"
 msgstr ""

Modified: doc/trunk/reference/fr-FR/next.po
===================================================================
--- doc/trunk/reference/fr-FR/next.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/next.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-02-02 23:32+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: next.xml:4
 #, no-c-format
 msgid "Next steps"
 msgstr "Etapes suivantes"
 
 #. Tag: para
-#: next.xml:6
 #, no-c-format
 msgid ""
 "Because CDI is so new, there's not yet a lot of information available "
@@ -33,7 +31,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:14
 #, fuzzy, no-c-format
 msgid ""
 "The CDI reference implementation, Weld, is being developed at the <ulink url="
@@ -51,7 +48,6 @@
 "Cet article se base en grande partie sur une série de billets publiées là."
 
 #. Tag: para
-#: next.xml:22
 #, no-c-format
 msgid ""
 "We encourage you to follow the <ulink url=\"https://lists.jboss.org/mailman/"
@@ -61,7 +57,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:28
 #, no-c-format
 msgid ""
 "We are eager to find volunteers to help revise, proofread or translate this "
@@ -70,7 +65,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:35
 #, no-c-format
 msgid ""
 "Checkout source from <ulink url=\"http://anonsvn.jboss.org/repos/weld/doc/"
@@ -78,16 +72,7 @@
 "ulink> using SVN"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:40
-#, no-c-format
-msgid ""
-"<![CDATA[$> svn co http://anonsvn.jboss.org/repos/weld/doc/trunk/reference "
-"weld-reference]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:43
 #, no-c-format
 msgid ""
 "Edit the <literal>pom.xml</literal> file in the root of the checkout and "
@@ -96,19 +81,11 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:49
 #, no-c-format
 msgid "Build using Maven 2"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:52
-#, no-c-format
-msgid "<![CDATA[$> mvn]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:54
 #, no-c-format
 msgid ""
 "If you experience an out of memory error, try setting this environment "
@@ -116,7 +93,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:61
 #, no-c-format
 msgid ""
 "The PDF version of the reference guide will appear the current directory. "
@@ -125,7 +101,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:66
 #, no-c-format
 msgid "We look forward to your participation!"
 msgstr ""

Modified: doc/trunk/reference/fr-FR/part1.po
===================================================================
--- doc/trunk/reference/fr-FR/part1.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/part1.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part1.xml:14
 #, no-c-format
 msgid ""
 "The <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-299</ulink> "
@@ -25,7 +24,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:23
 #, no-c-format
 msgid ""
 "an improved lifecycle for stateful objects, bound to well-defined "
@@ -33,20 +31,17 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:28
 #, no-c-format
 msgid "a typesafe approach to <emphasis>dependency injection</emphasis>,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:33
 #, no-c-format
 msgid ""
 "object interaction via an <emphasis>event notification facility</emphasis>,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:38
 #, no-c-format
 msgid ""
 "a better approach to binding <emphasis>interceptors</emphasis> to objects, "
@@ -55,7 +50,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:45
 #, no-c-format
 msgid ""
 "an <emphasis>SPI</emphasis> for developing portable extensions to the "
@@ -63,22 +57,21 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:51
 #, no-c-format
 msgid ""
 "The CDI services are a core aspect of the Java EE platform and include full "
 "support for Java EE modularity and the Java EE component architecture. But "
 "the specification does not limit the use of CDI to the Java EE environment. "
 "In the Java SE environment, the services might be provided by a standalone "
-"CDI implementation like Weld (see <xref linkend=\"weld-se\"/>), or even by a "
-"container that also implements the subset of EJB defined for embedded usage "
-"by the EJB 3.1 specification. CDI is especially useful in the context of web "
-"application development, but the problems it solves are general development "
-"concerns and it is therefore applicable to a wide variety of application."
+"CDI implementation like Weld (see <xref linkend=\"weld-se\" />), or even by "
+"a container that also implements the subset of EJB defined for embedded "
+"usage by the EJB 3.1 specification. CDI is especially useful in the context "
+"of web application development, but the problems it solves are general "
+"development concerns and it is therefore applicable to a wide variety of "
+"application."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:61
 #, no-c-format
 msgid ""
 "An object bound to a lifecycle context is called a bean. CDI includes built-"
@@ -87,19 +80,16 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:68
 #, no-c-format
 msgid "managed beans, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:71
 #, no-c-format
 msgid "EJB session beans."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:75
 #, no-c-format
 msgid ""
 "Both managed beans and EJB session beans may inject other beans. But some "
@@ -109,37 +99,31 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:83
 #, no-c-format
 msgid "message-driven beans,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:86
 #, no-c-format
 msgid "interceptors,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:89
 #, no-c-format
 msgid "servlets, servlet filters and servlet event listeners,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:92
 #, no-c-format
 msgid "JAX-WS service endpoints and handlers, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:95
 #, no-c-format
 msgid "JSP tag handlers and tag library event listeners."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:99
 #, no-c-format
 msgid ""
 "CDI relieves the user of an unfamiliar API of the need to answer the "
@@ -147,44 +131,37 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:105
 #, no-c-format
 msgid "What is the lifecycle of this object?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:108
 #, no-c-format
 msgid "How many simultaneous clients can it have?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:111
 #, no-c-format
 msgid "Is it multithreaded?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:114
 #, no-c-format
 msgid "How do I get access to it from a client?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:117
 #, no-c-format
 msgid "Do I need to explicitly destroy it?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:120
 #, no-c-format
 msgid ""
 "Where should I keep the reference to it when I'm not currently using it?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:125
 #, no-c-format
 msgid ""
 "How can I define an alternative implementation, so that the implementation "
@@ -192,13 +169,11 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:131
 #, no-c-format
 msgid "How should I go about sharing this object between other objects?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:137
 #, no-c-format
 msgid ""
 "CDI is more than a framework. It's a whole, rich programming model. The "
@@ -207,7 +182,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:142
 #, no-c-format
 msgid ""
 "A bean specifies only the type and semantics of other beans it depends upon. "
@@ -219,7 +193,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:149
 #, no-c-format
 msgid ""
 "Events, interceptors and decorators enhance the loose-coupling inherent in "
@@ -227,7 +200,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:155
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -235,7 +207,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:159
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -243,7 +214,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:163
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> allow business concerns to be "
@@ -251,7 +221,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:168
 #, no-c-format
 msgid ""
 "What's even more powerful (and comforting) is that CDI provides all these "
@@ -266,7 +235,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:177
 #, no-c-format
 msgid ""
 "But CDI isn't a restrictive programming model. It doesn't tell you how you "
@@ -276,7 +244,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:183
 #, no-c-format
 msgid ""
 "CDI even provides a comprehensive SPI, allowing other kinds of object "
@@ -286,7 +253,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:189
 #, no-c-format
 msgid ""
 "CDI was influenced by a number of existing Java frameworks, including Seam, "
@@ -299,7 +265,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:197
 #, no-c-format
 msgid ""
 "Finally, CDI is a <ulink url=\"http://jcp.org\">Java Community Process</"

Modified: doc/trunk/reference/fr-FR/part2.po
===================================================================
--- doc/trunk/reference/fr-FR/part2.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/part2.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part2.xml:5
 #, no-c-format
 msgid ""
 "Weld, the JSR-299 Reference Implementation (RI), is being developed as part "
@@ -26,7 +25,6 @@
 msgstr ""
 
 #. Tag: para
-#: part2.xml:12
 #, no-c-format
 msgid ""
 "Weld provides a complete SPI allowing Java EE containers such as JBoss AS "
@@ -36,7 +34,6 @@
 msgstr ""
 
 #. Tag: para
-#: part2.xml:18
 #, no-c-format
 msgid ""
 "Weld comes with an extensive library of examples, which are a great starting "

Modified: doc/trunk/reference/fr-FR/part3.po
===================================================================
--- doc/trunk/reference/fr-FR/part3.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/part3.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-02-07 15:15+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part3.xml:5
 #, no-c-format
 msgid ""
 "The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've "
@@ -22,19 +21,16 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:12
 #, no-c-format
 msgid "<emphasis>alternatives</emphasis> enable deployment time polymorphism,"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:17
 #, no-c-format
 msgid "<emphasis>producer methods</emphasis> enable runtime polymorphism, and"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:21
 #, no-c-format
 msgid ""
 "<emphasis>contextual lifecycle management</emphasis> decouples bean "
@@ -42,7 +38,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:27
 #, no-c-format
 msgid ""
 "These techniques serve to enable loose coupling of client and server. The "
@@ -52,7 +47,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:33
 #, no-c-format
 msgid ""
 "Loose coupling makes a system more <emphasis>dynamic</emphasis>. The system "
@@ -64,7 +58,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:40
 #, no-c-format
 msgid ""
 "CDI provides three extra important facilities that further the goal of loose "
@@ -72,7 +65,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:46
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -80,7 +72,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:51
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> may be used to decouple some business "
@@ -88,7 +79,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:56
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -96,7 +86,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:62
 #, fuzzy, no-c-format
 msgid ""
 "The second major theme of CDI is <emphasis>strong typing</emphasis>. The "
@@ -111,13 +100,12 @@
 "typesafe qui peuvent être validées par le compilateur."
 
 #. Tag: para
-#: part3.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "You don't see string-based identifiers in CDI code, not because the "
-"framework is hiding them from you using clever defaulting rules&#8212;so-"
-"called \"configuration by convention\"&#8212;but because there are simply no "
-"strings there to begin with!"
+"framework is hiding them from you using clever defaulting rules—so-called "
+"\"configuration by convention\"—but because there are simply no strings "
+"there to begin with!"
 msgstr ""
 "Vous ne voyez pas d'identifiants basés sur des chaînes de caractères dans un "
 "code Web Bean, pas parce que le framework vous les cache en utilisant des "
@@ -126,7 +114,6 @@
 "pour commencer!"
 
 #. Tag: para
-#: part3.xml:74
 #, no-c-format
 msgid ""
 "The obvious benefit of this approach is that <emphasis>any</emphasis> IDE "
@@ -144,7 +131,6 @@
 "d'élever le niveau sémantique de votre code."
 
 #. Tag: para
-#: part3.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "CDI encourages you develop annotations that model concepts, for example,"
@@ -153,61 +139,51 @@
 "des concepts, par exemple,"
 
 #. Tag: para
-#: part3.xml:87
 #, no-c-format
 msgid "<literal>@Asynchronous</literal>,"
 msgstr "<literal>@Asynchronous</literal>,"
 
 #. Tag: para
-#: part3.xml:90
 #, no-c-format
 msgid "<literal>@Mock</literal>,"
 msgstr "<literal>@Mock</literal>,"
 
 #. Tag: para
-#: part3.xml:93
 #, no-c-format
 msgid "<literal>@Secure</literal> or"
 msgstr "<literal>@Secure</literal> or"
 
 #. Tag: para
-#: part3.xml:96
 #, no-c-format
 msgid "<literal>@Updated</literal>,"
 msgstr "<literal>@Updated</literal>,"
 
 #. Tag: para
-#: part3.xml:100
 #, no-c-format
 msgid "instead of using compound names like"
 msgstr "au lieu d'utiliser des noms composés comme"
 
 #. Tag: para
-#: part3.xml:104
 #, no-c-format
 msgid "<literal>asyncPaymentProcessor</literal>,"
 msgstr "<literal>asyncPaymentProcessor</literal>,"
 
 #. Tag: para
-#: part3.xml:107
 #, no-c-format
 msgid "<literal>mockPaymentProcessor</literal>,"
 msgstr "<literal>mockPaymentProcessor</literal>,"
 
 #. Tag: para
-#: part3.xml:110
 #, no-c-format
 msgid "<literal>SecurityInterceptor</literal> or"
 msgstr "<literal>SecurityInterceptor</literal> or"
 
 #. Tag: para
-#: part3.xml:113
 #, no-c-format
 msgid "<literal>DocumentUpdatedEvent</literal>."
 msgstr "<literal>DocumentUpdatedEvent</literal>."
 
 #. Tag: para
-#: part3.xml:117
 #, no-c-format
 msgid ""
 "The annotations are reusable. They help describe common qualities of "
@@ -222,7 +198,6 @@
 "compréhensible."
 
 #. Tag: para
-#: part3.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "CDI <emphasis>stereotypes</emphasis> take this idea a step further. A "
@@ -239,7 +214,6 @@
 "déploiement, etc, dans un seul paquetage réutilisable."
 
 #. Tag: para
-#: part3.xml:138
 #, fuzzy, no-c-format
 msgid ""
 "We're now ready to meet some more advanced features of CDI. Bear in mind "

Modified: doc/trunk/reference/fr-FR/part4.po
===================================================================
--- doc/trunk/reference/fr-FR/part4.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/part4.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-02-07 15:02+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part4.xml:5
 #, no-c-format
 msgid ""
 "The third theme of CDI is <emphasis>integration</emphasis>. We've already "
@@ -26,7 +25,6 @@
 msgstr ""
 
 #. Tag: para
-#: part4.xml:12
 #, fuzzy, no-c-format
 msgid ""
 "CDI is also designed to work in concert with technologies outside of the "
@@ -53,7 +51,6 @@
 "parti de la plateforme de manière transparente dans un environnement Java EE."
 
 #. Tag: para
-#: part4.xml:23
 #, fuzzy, no-c-format
 msgid ""
 "We're about to see how to take full advantage of the Java EE platform in an "

Modified: doc/trunk/reference/fr-FR/part5.po
===================================================================
--- doc/trunk/reference/fr-FR/part5.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/part5.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,7 +15,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part5.xml:5
 #, no-c-format
 msgid ""
 "Weld is the reference implementation of JSR-299, and is used by JBoss AS and "
@@ -27,7 +26,6 @@
 msgstr ""
 
 #. Tag: para
-#: part5.xml:12
 #, no-c-format
 msgid ""
 "Some of the extensions in Weld are portable across JSR-299 implementations "
@@ -37,12 +35,11 @@
 msgstr ""
 
 #. Tag: para
-#: part5.xml:18
 #, no-c-format
 msgid ""
 "If you want to get started quickly using Weld (and, in turn, CDI) with JBoss "
 "AS, GlassFish or Tomcat and experiment with one of the examples, take a look "
-"at <xref linkend=\"gettingstarted\"/>. Otherwise read on for a exhaustive "
+"at <xref linkend=\"gettingstarted\" />. Otherwise read on for a exhaustive "
 "discussion of using Weld in all the environments and application servers it "
 "supports and the Weld extensions."
 msgstr ""

Modified: doc/trunk/reference/fr-FR/producermethods.po
===================================================================
--- doc/trunk/reference/fr-FR/producermethods.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/producermethods.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: producermethods.xml:5
 #, no-c-format
 msgid "Producer methods"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:7
 #, no-c-format
 msgid ""
 "Producer methods let us overcome certain limitations that arise when a "
@@ -30,31 +28,26 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:14
 #, no-c-format
 msgid "According to the spec:"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:18
 #, no-c-format
 msgid "A producer method acts as a source of objects to be injected, where:"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:22
 #, no-c-format
 msgid "the objects to be injected are not required to be instances of beans,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:25
 #, no-c-format
 msgid "the concrete type of the objects to be injected may vary at runtime or"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:28
 #, no-c-format
 msgid ""
 "the objects require some custom initialization that is not performed by the "
@@ -62,25 +55,21 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:36
 #, no-c-format
 msgid "For example, producer methods let us:"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:40
 #, no-c-format
 msgid "expose a JPA entity as a bean,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:43
 #, no-c-format
 msgid "expose any JDK class as a bean,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:46
 #, no-c-format
 msgid ""
 "define multiple beans, with different scopes or initialization, for the same "
@@ -88,13 +77,11 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:51
 #, no-c-format
 msgid "vary the implementation of a bean type at runtime."
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:55
 #, no-c-format
 msgid ""
 "In particular, producer methods let us use runtime polymorphism with CDI. As "
@@ -103,40 +90,12 @@
 "is fixed. A producer method has no such limitation:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Preferences implements Serializable {\n"
-"   private PaymentStrategyType paymentStrategy;\n"
-"   ...\n"
-"   @Produces @Preferred \n"
-"   public PaymentStrategy getPaymentStrategy() {\n"
-"       switch (paymentStrategy) {\n"
-"           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
-"           case CHECK: return new CheckPaymentStrategy();\n"
-"           case PAYPAL: return new PayPalPaymentStrategy();\n"
-"           default: return null;\n"
-"       } \n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:63
 #, no-c-format
 msgid "Consider an injection point:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:65
-#, no-c-format
-msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:67
 #, no-c-format
 msgid ""
 "This injection point has the same type and qualifier annotations as the "
@@ -146,13 +105,11 @@
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:74
 #, no-c-format
 msgid "Scope of a producer method"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:76
 #, no-c-format
 msgid ""
 "The scope of the producer method defaults to <literal>@Dependent</literal>, "
@@ -163,25 +120,13 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:83
 #, no-c-format
 msgid ""
 "To change this behavior, we can add a <literal>@SessionScoped</literal> "
 "annotation to the method."
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:87
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:89
 #, no-c-format
 msgid ""
 "Now, when the producer method is called, the returned "
@@ -190,7 +135,6 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:95
 #, no-c-format
 msgid ""
 "A producer method does <emphasis>not</emphasis> inherit the scope of the "
@@ -203,13 +147,11 @@
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:107
 #, no-c-format
 msgid "Injection into producer methods"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:109
 #, no-c-format
 msgid ""
 "There's one potential problem with the code above. The implementations of "
@@ -220,32 +162,13 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:116
 #, no-c-format
 msgid ""
 "If this isn't what we want, we can use dependency injection into the "
 "producer method to obtain bean instances:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:121
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          CheckPaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:123
 #, no-c-format
 msgid ""
 "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-"
@@ -259,7 +182,6 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:132
 #, no-c-format
 msgid ""
 "There's at least three ways we could go about fixing this bug. We could "
@@ -270,7 +192,6 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:139
 #, no-c-format
 msgid ""
 "But a more common solution is to use the special <literal>@New</literal> "
@@ -278,38 +199,16 @@
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:144
 #, no-c-format
 msgid "Use of <literal>@New</literal> with producer methods"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:146
 #, no-c-format
 msgid "Consider the following producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:148
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New CheckPaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:150
 #, no-c-format
 msgid ""
 "Then a new <emphasis>dependent</emphasis> instance of "
@@ -321,47 +220,25 @@
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:160
 #, no-c-format
 msgid "Disposer methods"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:162
 #, no-c-format
 msgid ""
 "Some producer methods return objects that require explicit destruction. For "
 "example, somebody needs to close this JDBC connection:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:167
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @RequestScoped Connection connect(User user) {\n"
-"   return createConnection(user.getId(), user.getPassword());\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:169
 #, no-c-format
 msgid ""
 "Destruction can be performed by a matching <emphasis>disposer method</"
 "emphasis>, defined by the same class as the producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:172
-#, no-c-format
-msgid ""
-"<![CDATA[void close(@Disposes Connection connection) {\n"
-"   connection.close();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:174
 #, no-c-format
 msgid ""
 "The disposer method must have at least one parameter, annotated "

Modified: doc/trunk/reference/fr-FR/resources.po
===================================================================
--- doc/trunk/reference/fr-FR/resources.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/resources.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: resources.xml:5
 #, no-c-format
 msgid "Java EE component environment resources"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:7
 #, no-c-format
 msgid ""
 "Java EE 5 already introduced some limited support for dependency injection, "
@@ -30,7 +28,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:13
 #, no-c-format
 msgid ""
 "Naturally, there is now a slight mismatch with the new style of dependency "
@@ -44,7 +41,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:22
 #, no-c-format
 msgid ""
 "Fields have a duality in that they can both be the target of Java EE "
@@ -57,13 +53,11 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:31
 #, no-c-format
 msgid "Defining a resource"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:33
 #, no-c-format
 msgid ""
 "The CDI specification uses the term <emphasis>resource</emphasis> to refer, "
@@ -72,7 +66,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:38
 #, no-c-format
 msgid ""
 "JDBC <literal>Datasource</literal>s, JMS <literal>Queue</literal>s, "
@@ -82,7 +75,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:43
 #, no-c-format
 msgid ""
 "JPA <literal>EntityManager</literal>s and <literal>EntityManagerFactory</"
@@ -90,19 +82,16 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:46
 #, no-c-format
 msgid "remote EJBs, and"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:49
 #, no-c-format
 msgid "web services"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:53
 #, no-c-format
 msgid ""
 "We declare a resource by annotating a producer field with a component "
@@ -111,61 +100,17 @@
 "<literal>@PersistenceUnit</literal> or <literal>@WebServiceRef</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:57
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @WebServiceRef(lookup=\"java:app/service/Catalog\")\n"
-"Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Resource(lookup=\"java:global/env/jdbc/CustomerDatasource"
-"\") \n"
-"@CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceContext(unitName=\"CustomerDatabase\")\n"
-"@CustomerDatabase EntityManager customerDatabasePersistenceContext;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:63
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceUnit(unitName=\"CustomerDatabase\") \n"
-"@CustomerDatabase EntityManagerFactory customerDatabasePersistenceUnit;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @EJB(ejbLink=\"../their.jar#PaymentService\") \n"
-"PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:67
 #, no-c-format
 msgid "The field may be static (but not final)."
 msgstr ""
 
 #. Tag: para
-#: resources.xml:69
 #, no-c-format
 msgid "A resource declaration really contains two pieces of information:"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:73
 #, no-c-format
 msgid ""
 "the JNDI name, EJB link, persistence unit name, or other metadata needed to "
@@ -173,7 +118,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:77
 #, no-c-format
 msgid ""
 "the type and qualifiers that we will use to inject the reference into our "
@@ -181,7 +125,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:82
 #, no-c-format
 msgid ""
 "It might feel strange to be declaring resources in Java code. Isn't this "
@@ -191,53 +134,16 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:90
 #, no-c-format
 msgid "Typesafe resource injection"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:92
 #, no-c-format
 msgid "These resources can now be injected in the usual way."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:96
-#, no-c-format
-msgid "<![CDATA[@Inject Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:97
-#, no-c-format
-msgid "<![CDATA[@Inject @CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:98
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManager "
-"customerDatabaseEntityManager;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManagerFactory "
-"customerDatabaseEntityManagerFactory;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:100
-#, no-c-format
-msgid "<![CDATA[@Inject PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:102
 #, no-c-format
 msgid ""
 "The bean type and qualifiers of the resource are determined by the producer "
@@ -245,7 +151,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:106
 #, no-c-format
 msgid ""
 "It might seem like a pain to have to write these extra producer field "
@@ -256,26 +161,12 @@
 "and more typesafe to write"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:113
-#, no-c-format
-msgid "@Inject @CustomerDatabase EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:115
 #, no-c-format
 msgid "instead of"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:117
-#, no-c-format
-msgid "@PersistenceContext(unitName=\"CustomerDatabase\") EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:119
 #, no-c-format
 msgid "all over the place?"
 msgstr ""

Modified: doc/trunk/reference/fr-FR/ri-spi.po
===================================================================
--- doc/trunk/reference/fr-FR/ri-spi.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/ri-spi.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-20 22:07+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: ri-spi.xml:4
 #, no-c-format
 msgid "Integrating Weld into other environments"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:6
 #, no-c-format
 msgid ""
 "If you want to use Weld in another environment, you will need to provide "
@@ -29,13 +27,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:12
 #, no-c-format
 msgid "Enterprise Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:13
 #, no-c-format
 msgid ""
 "If you just want to use managed beans, and not take advantage of enterprise "
@@ -47,7 +43,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:21
 #, no-c-format
 msgid ""
 "All SPIs and APIs described have extensive JavaDoc, which spell out the "
@@ -55,13 +50,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:27
 #, no-c-format
 msgid "The Weld SPI"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:29
 #, no-c-format
 msgid ""
 "The Weld SPI is located in the <literal>weld-spi</literal> module, and "
@@ -71,7 +64,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:35
 #, no-c-format
 msgid ""
 "All interfaces in the SPI support the decorator pattern and provide a "
@@ -82,7 +74,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:41
 #, no-c-format
 msgid ""
 "Weld supports multiple environments. An environment is defined by an "
@@ -96,7 +87,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:50
 #, no-c-format
 msgid ""
 "Weld uses a generic-typed service registry to allow services to be "
@@ -105,18 +95,16 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:56
 #, no-c-format
 msgid "Deployment structure"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:58
 #, no-c-format
 msgid ""
 "An application is often comprised of a number of modules. For example, a "
 "Java EE deployment may contain a number of EJB modules (containing business "
-"logic) and WAR modules (containing the user interface). A container may "
+"logic) and war modules (containing the user interface). A container may "
 "enforce certain <emphasis>accessibility</emphasis> rules which limit the "
 "visibility of classes between modules. CDI allows these same rules to apply "
 "to bean and observer method resolution. As the accessibility rules vary "
@@ -126,13 +114,12 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:67
 #, no-c-format
 msgid ""
 "The CDI specification discusses <emphasis>Bean Deployment Archives</"
-"emphasis> (BDAs)&#8212;archives which are marked as containing beans which "
-"should be deployed to the CDI container, and made available for injection "
-"and resolution. Weld reuses this description of <emphasis>Bean Deployment "
+"emphasis> (BDAs)—archives which are marked as containing beans which should "
+"be deployed to the CDI container, and made available for injection and "
+"resolution. Weld reuses this description of <emphasis>Bean Deployment "
 "Archives</emphasis> in its deployment structure SPI. Each deployment exposes "
 "the BDAs which it contains; each BDA may also reference other which it can "
 "access. Together, the transitive closure of this graph forms the beans which "
@@ -140,7 +127,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:76
 #, no-c-format
 msgid ""
 "To describe the deployment structure to Weld, the container should provide "
@@ -154,7 +140,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:85
 #, no-c-format
 msgid ""
 "As programmatically described beans may result in additional BDAs being "
@@ -164,13 +149,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:92
 #, no-c-format
 msgid "Virtual BDAs"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:93
 #, no-c-format
 msgid ""
 "In a strict container, each BDA might have to explicitly specify which other "
@@ -181,7 +164,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:100
 #, no-c-format
 msgid ""
 "A container, might, for example, use a flat accessibility structure for the "
@@ -190,11 +172,10 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:106
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it's contents to be discovered by Weld&#8212;<literal>BeanDeploymentArchive."
+"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
 "getBeanClasses()</literal> must return all the classes in the BDA, "
 "<literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the "
 "deployment descriptors in the archive, and <literal>BeanDeploymentArchive."
@@ -203,7 +184,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:114
 #, no-c-format
 msgid ""
 "BDA X may also reference another BDA Y whose beans can be resolved by, and "
@@ -214,13 +194,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:122
 #, no-c-format
 msgid "Matching the classloader structure for the deployment"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:124
 #, no-c-format
 msgid ""
 "In practice, you can regard the deployment structure represented by "
@@ -231,7 +209,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:132
 #, no-c-format
 msgid ""
 "To specify the directly accessible BDAs, the container should provide an "
@@ -240,7 +217,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:138
 #, no-c-format
 msgid ""
 "Weld allows the container to describe a circular graph, and will convert a "
@@ -248,7 +224,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:144
 #, no-c-format
 msgid ""
 "Certain services are provided for the whole deployment, whilst some are "
@@ -258,13 +233,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:153
 #, no-c-format
 msgid "EJB descriptors"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:155
 #, no-c-format
 msgid ""
 "Weld delegates EJB 3 bean discovery to the container so that it doesn't "
@@ -273,7 +246,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:160
 #, no-c-format
 msgid ""
 "The <literal>EjbDescriptor</literal> should return the relevant metadata as "
@@ -282,13 +254,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:169
 #, no-c-format
 msgid "EE resource injection and resolution services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:171
 #, no-c-format
 msgid ""
 "All the EE resource services are per-BDA services, and may be provided using "
@@ -297,37 +267,33 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:176
 #, no-c-format
 msgid ""
 "The integrator may choose to provide all EE resource injection services "
 "themselves, using another library or framework. In this case the integrator "
 "should use the <literal>EE</literal> environment, and implement the <xref "
-"linkend=\"injection.services\"/> SPI."
+"linkend=\"injection.services\" /> SPI."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:182
 #, no-c-format
 msgid ""
 "Alternatively, the integrator may choose to use CDI to provide EE resource "
 "injection. In this case, the <literal>EE_INJECT</literal> environment should "
 "be used, and the integrator should implement the <xref linkend=\"ejb."
-"services.resolution\"/>, <xref linkend=\"resource.services\"/> and <xref "
-"linkend=\"jpa.services\"/>."
+"services.resolution\" />, <xref linkend=\"resource.services\" /> and <xref "
+"linkend=\"jpa.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:189
 #, no-c-format
 msgid ""
 "CDI only provides annotation-based EE resource injection; if you wish to "
 "provide deployment descriptor (e.g. <literal>ejb-jar.xml</literal>) "
-"injection, you must use <xref linkend=\"injection.services\"/>."
+"injection, you must use <xref linkend=\"injection.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:195
 #, no-c-format
 msgid ""
 "If the container performs EE resource injection, the injected resources must "
@@ -336,7 +302,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:201
 #, no-c-format
 msgid ""
 "If you use a non-EE environment then you may implement any of the EE service "
@@ -345,49 +310,43 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:210
 #, no-c-format
 msgid "EJB services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:212
 #, no-c-format
 msgid "EJB services are split between two interfaces which are both per-BDA."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:216
 #, no-c-format
 msgid ""
 "<literal>EJBServices</literal> is used to resolve local EJBs used to back "
 "session beans, and must always be provided in an EE environment. "
 "<literal>EJBServices.resolveEjb(EjbDescriptor ejbDescriptor)</literal> "
-"returns a wrapper&#8212;<literal>SessionObjectReference</literal>&#8212;"
-"around the EJB reference. This wrapper allows Weld to request a reference "
-"that implements the given business interface, and, in the case of SFSBs, "
-"both request the removal of the EJB from the container and query whether the "
-"EJB has been previously removed."
+"returns a wrapper—<literal>SessionObjectReference</literal>—around the EJB "
+"reference. This wrapper allows Weld to request a reference that implements "
+"the given business interface, and, in the case of SFSBs, both request the "
+"removal of the EJB from the container and query whether the EJB has been "
+"previously removed."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:225
 #, no-c-format
 msgid ""
 "<literal>EJBResolutionServices.resolveEjb(InjectionPoint ij)</literal> "
 "allows the resolution of <literal>@EJB</literal> (for injection into managed "
 "beans). This service is not required if the implementation of <xref linkend="
-"\"injection.services\"/> takes care of <literal>@EJB</literal> injection."
+"\"injection.services\" /> takes care of <literal>@EJB</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:234
 #, no-c-format
 msgid "JPA services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:236
 #, no-c-format
 msgid ""
 "Just as EJB resolution is delegated to the container, resolution of "
@@ -397,23 +356,20 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:242
 #, no-c-format
 msgid ""
 "To allow JPA integration, the <literal>JpaServices</literal> interface "
 "should be implemented. This service is not required if the implementation of "
-"<xref linkend=\"injection.services\"/> takes care of "
+"<xref linkend=\"injection.services\" /> takes care of "
 "<literal>@PersistenceContext</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:251
 #, no-c-format
 msgid "Transaction Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:253
 #, no-c-format
 msgid ""
 "Weld delegates JTA activities to the container. The SPI provides a couple "
@@ -422,7 +378,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:258
 #, no-c-format
 msgid ""
 "Any <literal>javax.transaction.Synchronization</literal> implementation may "
@@ -432,7 +387,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:264
 #, no-c-format
 msgid ""
 "To make it easier to determine whether or not a transaction is currently "
@@ -442,30 +396,26 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:272
 #, no-c-format
 msgid "Resource Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:274
 #, no-c-format
 msgid ""
 "The resolution of <literal>@Resource</literal> (for injection into managed "
 "beans) is delegated to the container. You must provide an implementation of "
 "<literal>ResourceServices</literal> which provides these operations. This "
 "service is not required if the implementation of <xref linkend=\"injection."
-"services\"/> takes care of <literal>@Resource</literal> injection."
+"services\" /> takes care of <literal>@Resource</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:283
 #, no-c-format
 msgid "Injection Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:285
 #, no-c-format
 msgid ""
 "An integrator may wish to use <literal>InjectionServices</literal> to "
@@ -476,7 +426,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:291
 #, no-c-format
 msgid ""
 "<literal>InjectionServices</literal> provides a very simple contract, the "
@@ -487,7 +436,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:298
 #, no-c-format
 msgid ""
 "The <literal>InjectionContext</literal> can be used to discover additional "
@@ -498,13 +446,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:307
 #, no-c-format
 msgid "Security Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:309
 #, no-c-format
 msgid ""
 "In order to obtain the <literal>Principal</literal> representing the current "
@@ -513,13 +459,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:317
 #, no-c-format
 msgid "Bean Validation Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:319
 #, no-c-format
 msgid ""
 "In order to obtain the default <literal>ValidatorFactory</literal> for the "
@@ -528,13 +472,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:327
 #, no-c-format
 msgid "Identifying the BDA being addressed"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:329
 #, no-c-format
 msgid ""
 "When a client makes a request to an application which uses Weld, the request "
@@ -545,43 +487,39 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:337
 #, no-c-format
 msgid ""
-"Most Servlet contains use a classloader-per-WAR, this may provide a good way "
+"Most Servlet contains use a classloader-per-war, this may provide a good way "
 "to identify the BDA in use for web requests."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:343
 #, no-c-format
 msgid ""
 "When Weld needs to identify the BDA, it will use one of these services, "
 "depending on what is servicing the request:"
 msgstr ""
 
-#. Tag: literal
-#: ri-spi.xml:350
+#. Tag: term
 #, no-c-format
-msgid "ServletServices.getBeanDeploymentArchive(ServletContext ctx)"
+msgid ""
+"<literal>ServletServices.getBeanDeploymentArchive(ServletContext ctx)</"
+"literal>"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:352
 #, no-c-format
 msgid ""
-"Identify the WAR in use. The <literal>ServletContext</literal> is provided "
+"Identify the war in use. The <literal>ServletContext</literal> is provided "
 "for additional context."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:362
 #, no-c-format
 msgid "The bean store"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:364
 #, no-c-format
 msgid ""
 "Weld uses a map like structure to store bean instances - <literal>org.jboss."
@@ -590,13 +528,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:372
 #, no-c-format
 msgid "The application context"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:374
 #, no-c-format
 msgid ""
 "Weld expects the Application Server or other container to provide the "
@@ -606,13 +542,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:383
 #, no-c-format
 msgid "Initialization and shutdown"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:384
 #, no-c-format
 msgid ""
 "The <literal>org.jboss.weld.bootstrap.api.Bootstrap</literal> interface "
@@ -623,7 +557,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:391
 #, no-c-format
 msgid ""
 "The bootstrap is split into phases, container initialization, bean "
@@ -634,7 +567,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:398
 #, no-c-format
 msgid ""
 "To initialize the container, you call <literal>Bootstrap.startInitialization"
@@ -646,7 +578,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:405
 #, no-c-format
 msgid ""
 "Having called <literal>startInitialization()</literal>, the "
@@ -655,7 +586,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:410
 #, no-c-format
 msgid ""
 "To deploy the discovered beans, call <literal>Bootstrap.deployBeans()</"
@@ -663,7 +593,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:414
 #, no-c-format
 msgid ""
 "To validate the deployed beans, call <literal>Bootstrap.validateBeans()</"
@@ -671,7 +600,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:418
 #, no-c-format
 msgid ""
 "To place the container into a state where it can service requests, call "
@@ -679,7 +607,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:423
 #, no-c-format
 msgid ""
 "To shutdown the container you call <literal>Bootstrap.shutdown()</literal>. "
@@ -687,13 +614,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:431
 #, no-c-format
 msgid "Resource loading"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:433
 #, no-c-format
 msgid ""
 "Weld needs to load classes and resources from the classpath at various "
@@ -704,13 +629,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:445
 #, no-c-format
 msgid "The contract with the container"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:447
 #, no-c-format
 msgid ""
 "There are a number of requirements that Weld places on the container for "
@@ -718,13 +641,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:454
 #, no-c-format
 msgid "Classloader isolation"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:458
 #, no-c-format
 msgid ""
 "If you are integrating Weld into an environment that supports deployment of "
@@ -733,13 +654,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:466
 #, no-c-format
 msgid "Servlet"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:470
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a Servlet environment you must register "
@@ -749,7 +668,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:475
 #, no-c-format
 msgid ""
 "You must ensure that that <literal>WeldListener.contextInitialized()</"
@@ -758,13 +676,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:482
 #, no-c-format
-msgid "<term>JSF</term>"
+msgid "JSF"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:487
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -772,7 +688,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:492
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -781,7 +696,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:497
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -790,7 +704,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:502
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -802,7 +715,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:509
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -812,7 +724,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:516 ri-spi.xml:562
 #, no-c-format
 msgid ""
 "There are a number of ways you can obtain the bean manager for the module. "
@@ -822,7 +733,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:523
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -833,19 +743,16 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:531
 #, no-c-format
 msgid "Weld only supports JSF 1.2 and above."
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:538
 #, no-c-format
-msgid "<term>JSP</term>"
+msgid "JSP"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:543
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must register "
@@ -854,7 +761,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:548
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -865,7 +771,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:555
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -875,24 +780,23 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:572
 #, no-c-format
 msgid "Session Bean Interceptor"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:576
 #, no-c-format
 msgid ""
-"If you are integrating Weld into an EJB environment you must register "
-"<literal>org.jboss.weld.ejb.SessionBeanInterceptor</literal> as a EJB "
-"interceptor for all EJBs in the application, either automatically, or "
-"through user configuration, for each CDI application which uses enterprise "
-"beans."
+"If you are integrating Weld into an EJB environment you must register the "
+"<literal>aroundInvoke</literal> method of <literal>org.jboss.weld.ejb."
+"SessionBeanInterceptor</literal> as a EJB around-invoke interceptor for all "
+"EJBs in the application, either automatically, or through user "
+"configuration, for each CDI application which uses enterprise beans. If you "
+"are running in a EJB 3.1 environment, you should register this as an around-"
+"timeout interceptor as well."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:583
 #, no-c-format
 msgid ""
 "You must register the <literal>SessionBeanInterceptor</literal> as the inner "
@@ -900,13 +804,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:591
 #, no-c-format
 msgid "The <literal>weld-core.jar</literal>"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:595
 #, no-c-format
 msgid ""
 "Weld can reside on an isolated classloader, or on a shared classloader. If "
@@ -918,7 +820,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:601
 #, no-c-format
 msgid ""
 "You can provide your own implementation of <literal>Singleton</literal> and "
@@ -927,7 +828,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:606
 #, no-c-format
 msgid ""
 "Weld also provides an implementation of Thread Context Classloader per "
@@ -935,13 +835,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:613
 #, no-c-format
 msgid "Binding the manager in JNDI"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:617
 #, no-c-format
 msgid ""
 "You should bind the bean manager for the bean deployment archive into JNDI "
@@ -952,13 +850,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:627
 #, no-c-format
 msgid "Performing CDI injection on Java EE component classes"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:631
 #, no-c-format
 msgid ""
 "The CDI specification requires the container to provide injection into non-"
@@ -970,7 +866,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:639
 #, no-c-format
 msgid ""
 "The CDI specification also requires that a <literal>ProcessInjectionTarget</"
@@ -981,7 +876,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:646
 #, no-c-format
 msgid ""
 "To help the integrator, Weld provides <literal>WeldManager."
@@ -989,36 +883,7 @@
 "<literal>InjectionTarget</literal> to use."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:651
-#, no-c-format
-msgid ""
-"<![CDATA[// Fire ProcessInjectionTarget, returning the InjectionTarget\n"
-"// to use\n"
-"InjectionTarget it = weldBeanManager.fireProcessInjectionTarget(clazz);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = beanManager.createCreationalContext(null);\n"
-"\n"
-"// Produce the instance, performing any constructor injection required\n"
-"Object instance = it.produce();\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
-
 #. Tag: para
-#: ri-spi.xml:652
 #, no-c-format
 msgid ""
 "The container may intersperse other operations between these calls. Further, "
@@ -1027,7 +892,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:656
 #, no-c-format
 msgid ""
 "When performing injections on EJBs you must use the Weld-defined SPI, "
@@ -1035,39 +899,3 @@
 "on the correct bean manager for the bean deployment archive containing the "
 "EJB."
 msgstr ""
-
-#. Tag: programlisting
-#: ri-spi.xml:661
-#, no-c-format
-msgid ""
-"<![CDATA[// Obtain the EjbDescriptor for the EJB\n"
-"// You may choose to use this utility method to get the descriptor\n"
-"EjbDescriptor<?> ejbDescriptor = beanManager.getEjbDescriptor(ejbName);\n"
-"\n"
-"// Get an the Bean object\n"
-"Bean<?> bean = beanManager.getBean(ejbDescriptor);\n"
-"\n"
-"// Create the injection target\n"
-"InjectionTarget it = deploymentBeanManager.createInjectionTarget"
-"(ejbDescriptor);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = deploymentBeanManager.createCreationalContext"
-"(bean);\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// You may choose to have CDI call the post construct and pre destroy\n"
-"// lifecycle callbacks\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""

Modified: doc/trunk/reference/fr-FR/scopescontexts.po
===================================================================
--- doc/trunk/reference/fr-FR/scopescontexts.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/scopescontexts.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: scopescontexts.xml:5
 #, no-c-format
 msgid "Scopes and contexts"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:7
 #, no-c-format
 msgid ""
 "So far, we've seen a few examples of <emphasis>scope type annotations</"
@@ -30,26 +28,22 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:16
 #, no-c-format
 msgid "When a new instance of any bean with that scope is created"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:19
 #, no-c-format
 msgid "When an existing instance of any bean with that scope is destroyed"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:22
 #, no-c-format
 msgid ""
 "Which injected references refer to any instance of a bean with that scope"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:27
 #, no-c-format
 msgid ""
 "For example, if we have a session-scoped bean, <literal>CurrentUser</"
@@ -61,7 +55,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:35
 #, no-c-format
 msgid ""
 "JPA entities aren't a great fit for this model. Entities have their whole "
@@ -74,31 +67,18 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:45
 #, no-c-format
 msgid "Scope types"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:47
 #, no-c-format
 msgid ""
 "CDI features an <emphasis>extensible context model</emphasis>. It's possible "
 "to define new scopes by creating a new scope type annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:52
-#, no-c-format
-msgid ""
-"<![CDATA[@ScopeType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"public @interface ClusterScoped {}]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:54
 #, no-c-format
 msgid ""
 "Of course, that's the easy part of the job. For this scope type to be "
@@ -110,71 +90,53 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:61
 #, no-c-format
 msgid ""
 "We can apply a scope type annotation to a bean implementation class to "
 "specify the scope of the bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:67
 #, no-c-format
 msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:72
 #, no-c-format
 msgid "Built-in scopes"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:74
 #, no-c-format
 msgid "CDI defines four built-in scopes:"
 msgstr ""
 
-#. Tag: literal
-#: scopescontexts.xml:78
+#. Tag: para
 #, no-c-format
-msgid "@RequestScoped"
+msgid "<literal>@RequestScoped</literal>"
 msgstr ""
 
-#. Tag: literal
-#: scopescontexts.xml:81
+#. Tag: para
 #, no-c-format
-msgid "@SessionScoped"
+msgid "<literal>@SessionScoped</literal>"
 msgstr ""
 
-#. Tag: literal
-#: scopescontexts.xml:84
+#. Tag: para
 #, no-c-format
-msgid "@ApplicationScoped"
+msgid "<literal>@ApplicationScoped</literal>"
 msgstr ""
 
-#. Tag: literal
-#: scopescontexts.xml:87
+#. Tag: para
 #, no-c-format
-msgid "@ConversationScoped"
+msgid "<literal>@ConversationScoped</literal>"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:91
 #, no-c-format
 msgid "For a web application that uses CDI:"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:95
 #, no-c-format
 msgid ""
 "any servlet request has access to active request, session and application "
@@ -182,13 +144,11 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:100
 #, no-c-format
 msgid "any JSF request has access to an active conversation scope."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:105
 #, no-c-format
 msgid ""
 "A CDI extension can implement support for the conversation scope in other "
@@ -196,49 +156,41 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:108
 #, no-c-format
 msgid "The request and application scopes are also active:"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:112
 #, no-c-format
 msgid "during invocations of EJB remote methods,"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:115
 #, no-c-format
 msgid "during invocations of EJB asynchronous methods,"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:118
 #, no-c-format
 msgid "during EJB timeouts,"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:121
 #, no-c-format
 msgid "during message delivery to a message-driven bean,"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:124
 #, no-c-format
 msgid "during message delivery to a <literal>MessageListener</literal>, and"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:127
 #, no-c-format
 msgid "during web service invocations."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:131
 #, no-c-format
 msgid ""
 "If the application tries to invoke a bean with a scope that does not have an "
@@ -247,7 +199,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:136
 #, no-c-format
 msgid ""
 "Managed beans with scope <literal>@SessionScoped</literal> or "
@@ -256,7 +207,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:141
 #, no-c-format
 msgid ""
 "Three of the four built-in scopes should be extremely familiar to every Java "
@@ -265,13 +215,11 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:149
 #, no-c-format
 msgid "The conversation scope"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:151
 #, no-c-format
 msgid ""
 "The conversation scope is a bit like the traditional session scope in that "
@@ -281,13 +229,11 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:159
 #, no-c-format
 msgid "is demarcated explicitly by the application, and"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:162
 #, no-c-format
 msgid ""
 "holds state associated with a particular web browser tab in a JSF "
@@ -296,17 +242,15 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:169
 #, no-c-format
 msgid ""
-"A conversation represents a task&#8212;a unit of work from the point of view "
-"of the user. The conversation context holds state associated with what the "
-"user is currently working on. If the user is doing multiple things at the "
-"same time, there are multiple conversations."
+"A conversation represents a task—a unit of work from the point of view of "
+"the user. The conversation context holds state associated with what the user "
+"is currently working on. If the user is doing multiple things at the same "
+"time, there are multiple conversations."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:175
 #, no-c-format
 msgid ""
 "The conversation context is active during any JSF request. Most "
@@ -316,27 +260,18 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:182
 #, no-c-format
 msgid "Conversation demarcation"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:184
 #, no-c-format
 msgid ""
 "CDI provides a built-in bean for controlling the lifecycle of conversations "
 "in a JSF application. This bean may be obtained by injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:189
-#, no-c-format
-msgid "@Inject Conversation conversation;"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:191
 #, no-c-format
 msgid ""
 "To promote the conversation associated with the current request to a long-"
@@ -347,49 +282,13 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:197
 #, no-c-format
 msgid ""
 "In the following example, a conversation-scoped bean controls the "
 "conversation with which it is associated:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:201
-#, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"   private Order order;\n"
-"   private @Inject Conversation conversation;\n"
-"   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
-"   \n"
-"   @Produces public Order getOrder() {\n"
-"      return order;\n"
-"   }\n"
-"\n"
-"   public Order createOrder() {\n"
-"      order = new Order();\n"
-"      conversation.begin();\n"
-"      return order;\n"
-"   }\n"
-"   \n"
-"   public void addLineItem(Product product, int quantity) {\n"
-"      order.add(new LineItem(product, quantity));\n"
-"   }\n"
-"\n"
-"   public void saveOrder(Order order) {\n"
-"      em.persist(order);\n"
-"      conversation.end();\n"
-"   }\n"
-"   \n"
-"   @Remove\n"
-"   public void destroy() {}\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:203
 #, no-c-format
 msgid ""
 "This bean is able to control its own lifecycle through use of the "
@@ -398,13 +297,11 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:211
 #, no-c-format
 msgid "Conversation propagation"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:213
 #, no-c-format
 msgid ""
 "The conversation context automatically propagates with any JSF faces request "
@@ -413,7 +310,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:218
 #, no-c-format
 msgid ""
 "We can force the conversation to propagate with a non-faces request by "
@@ -425,36 +321,16 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:225
 #, no-c-format
 msgid "Therefore, the following link propagates the conversation:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:229
-#, no-c-format
-msgid ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:231
 #, no-c-format
 msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:235
-#, no-c-format
-msgid ""
-"<![CDATA[<h:link outcome=\"/addProduct.xhtml value=\"Add Product\">\n"
-"   <f:param name=\"cid\" value=\"#{conversation.id}\"/>\n"
-"</h:link>]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:238
 #, no-c-format
 msgid ""
 "The conversation context propagates across redirects, making it very easy to "
@@ -464,25 +340,22 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:248
 #, no-c-format
 msgid "Conversation timeout"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:250
 #, no-c-format
 msgid ""
 "The container is permitted to destroy a conversation and all state held in "
 "its context at any time in order to conserve resources. A CDI implementation "
-"will normally do this on the basis of some kind of timeout&#8212;though this "
-"is not required by the specification. The timeout is the period of "
-"inactivity before the conversation is destroyed (as opposed to the amount of "
-"time the conversation is active)."
+"will normally do this on the basis of some kind of timeout—though this is "
+"not required by the specification. The timeout is the period of inactivity "
+"before the conversation is destroyed (as opposed to the amount of time the "
+"conversation is active)."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:257
 #, no-c-format
 msgid ""
 "The <literal>Conversation</literal> object provides a method to set the "
@@ -490,20 +363,12 @@
 "setting."
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:262
-#, no-c-format
-msgid "conversation.setTimeout(timeoutInMillis);"
-msgstr ""
-
 #. Tag: title
-#: scopescontexts.xml:269
 #, no-c-format
 msgid "The singleton pseudo-scope"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:271
 #, no-c-format
 msgid ""
 "In addition to the four built-in scopes, CDI also supports two "
@@ -513,7 +378,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:277
 #, no-c-format
 msgid ""
 "Unlike the other scopes, which belong to the package <literal>javax."
@@ -522,7 +386,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:283
 #, no-c-format
 msgid ""
 "You can guess what \"singleton\" means here. It means a bean that is "
@@ -537,7 +400,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:292
 #, no-c-format
 msgid ""
 "Now, if the singleton instance is a simple, immutable, serializable object "
@@ -548,7 +410,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:298
 #, no-c-format
 msgid ""
 "There are several ways to ensure that the singleton bean remains a singleton "
@@ -556,7 +417,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:302
 #, no-c-format
 msgid ""
 "have the singleton bean implement <literal>writeResolve()</literal> and "
@@ -565,7 +425,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:308
 #, no-c-format
 msgid ""
 "make sure the client keeps only a transient reference to the singleton bean, "
@@ -573,7 +432,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:313
 #, no-c-format
 msgid ""
 "give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
@@ -581,7 +439,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:320
 #, no-c-format
 msgid ""
 "A fourth, better solution is to instead use <literal>@ApplicationScoped</"
@@ -590,13 +447,11 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:326
 #, no-c-format
 msgid "The dependent pseudo-scope"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:328
 #, no-c-format
 msgid ""
 "Finally, CDI features the so-called <emphasis>dependent pseudo-scope</"
@@ -605,20 +460,12 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:333
 #, no-c-format
 msgid ""
 "For example, this bean has the scope type <literal>@Dependent</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:337
-#, no-c-format
-msgid "<![CDATA[public class Calculator { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:339
 #, no-c-format
 msgid ""
 "An instance of a dependent bean is never shared between different clients or "
@@ -629,7 +476,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:345
 #, no-c-format
 msgid ""
 "If a Unified EL expression refers to a dependent bean by EL name, an "
@@ -638,7 +484,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:351
 #, no-c-format
 msgid ""
 "If you need to access a bean directly by EL name in a JSF page, you probably "
@@ -653,7 +498,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:361
 #, no-c-format
 msgid ""
 "Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
@@ -661,7 +505,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:366
 #, no-c-format
 msgid ""
 "CDI makes it easy to obtain a dependent instance of a bean, even if the bean "
@@ -669,27 +512,18 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:374
 #, no-c-format
 msgid "The <literal>@New</literal> qualifier"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:376
 #, no-c-format
 msgid ""
 "The built-in qualifier <literal>@New</literal> allows us to obtain a "
 "dependent object of a specified class."
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:380
-#, no-c-format
-msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:382
 #, no-c-format
 msgid ""
 "The class must be a valid managed bean or session bean, but need not be an "
@@ -697,41 +531,20 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:384
 #, no-c-format
 msgid ""
 "This works even if <literal>Calculator</literal> is <emphasis>already</"
 "emphasis> declared with a different scope type, for example:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:391
 #, no-c-format
 msgid ""
 "So the following injected attributes each get a different instance of "
 "<literal>Calculator</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:395
-#, no-c-format
-msgid ""
-"<![CDATA[public class PaymentCalc {\n"
-"   @Inject Calculator calculator;\n"
-"   @Inject @New Calculator newCalculator;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:397
 #, no-c-format
 msgid ""
 "The <literal>calculator</literal> field has a conversation-scoped instance "
@@ -741,7 +554,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:403
 #, no-c-format
 msgid ""
 "This feature is particularly useful with producer methods, as we'll see in "

Modified: doc/trunk/reference/fr-FR/specialization.po
===================================================================
--- doc/trunk/reference/fr-FR/specialization.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/specialization.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: specialization.xml:5
 #, no-c-format
 msgid "Specialization, inheritance and alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:7
 #, no-c-format
 msgid ""
 "When you first start developing with CDI, you'll likely be dealing only with "
@@ -35,7 +33,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:16
 #, no-c-format
 msgid ""
 "The CDI specification recognizes two distinct scenarios in which one bean "
@@ -43,7 +40,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:23
 #, no-c-format
 msgid ""
 "The second bean <emphasis>specializes</emphasis> the first bean in certain "
@@ -52,7 +48,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:29
 #, no-c-format
 msgid ""
 "The second bean is simply reusing the Java implementation, and otherwise "
@@ -61,7 +56,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:37
 #, no-c-format
 msgid ""
 "The second case is the default assumed by CDI. It's possible to have two "
@@ -71,7 +65,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:43
 #, no-c-format
 msgid ""
 "The first case is the exception, and also requires more care. In any given "
@@ -83,13 +76,11 @@
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:51
 #, no-c-format
 msgid "Using alternative stereotypes"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:53
 #, no-c-format
 msgid ""
 "CDI lets you <emphasis>override</emphasis> the implementation of a bean type "
@@ -98,18 +89,7 @@
 "interface:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[public class DefaultPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:61
 #, no-c-format
 msgid ""
 "But in our staging environment, we don't really want to submit payments to "
@@ -117,36 +97,12 @@
 "<literal>PaymentProcessor</literal> with a different bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:66
-#, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:68
 #, no-c-format
-msgid "<para>or</para>"
+msgid "or"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:70
-#, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      extends DefaultPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:72
 #, no-c-format
 msgid ""
 "We've already seen how we can enable this alternative by listing its class "
@@ -154,7 +110,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:77
 #, no-c-format
 msgid ""
 "But suppose we have many alternatives in the staging environment. It would "
@@ -164,62 +119,21 @@
 "this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:84
-#, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Staging {}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:86
 #, no-c-format
 msgid ""
 "Then we replace the <literal>@Alternative</literal> annotation on our bean "
 "with <literal>@Staging</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:90
-#, no-c-format
-msgid ""
-"<![CDATA[@Staging\n"
-"public class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:92
 #, no-c-format
 msgid ""
 "Finally, we activate the <literal>@Staging</literal> stereotype in the "
 "<literal>beans.xml</literal> descriptor:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:96
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <stereotype>org.mycompany.myapp.Staging</stereotype>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:98
 #, no-c-format
 msgid ""
 "Now, no matter how many staging beans we have, they will all be enabled at "
@@ -227,13 +141,11 @@
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:105
 #, no-c-format
 msgid "A minor problem with alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:107
 #, no-c-format
 msgid ""
 "When we enable an alternative, does that mean the default implementation is "
@@ -242,15 +154,7 @@
 "not, you could still inject the default implementation."
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:113
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @LargeTransaction PaymentProcessor paymentProcessor;]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:115
 #, no-c-format
 msgid ""
 "So we haven't completely replaced the default implementation in this "
@@ -263,7 +167,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:123
 #, no-c-format
 msgid ""
 "CDI provides a special feature, called <emphasis>specialization</emphasis>, "
@@ -273,13 +176,11 @@
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:132
 #, no-c-format
 msgid "Using specialization"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:134
 #, no-c-format
 msgid ""
 "When the goal is to replace one bean implementation with a second, to help "
@@ -287,13 +188,11 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:141
 #, no-c-format
 msgid "directly extend the bean class of the second bean, or"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:146
 #, no-c-format
 msgid ""
 "directly override the producer method, in the case that the second bean is a "
@@ -301,25 +200,12 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:152
 #, no-c-format
 msgid ""
 "explicitly declare that it <emphasis>specializes</emphasis> the second bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:154
-#, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Specializes\n"
-"public class MockCreditCardPaymentProcessor \n"
-"      extends CreditCardPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:156
 #, no-c-format
 msgid ""
 "When an enabled bean specializes another bean, the other bean is never "
@@ -328,7 +214,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:161
 #, no-c-format
 msgid ""
 "So why does specialization work, and what does it have to do with "
@@ -336,7 +221,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:165
 #, no-c-format
 msgid ""
 "Since we're informing the container that our alternative bean is meant to "
@@ -348,7 +232,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:172
 #, no-c-format
 msgid ""
 "Furthermore, if the default implementation declares a bean EL name using "

Modified: doc/trunk/reference/fr-FR/stereotypes.po
===================================================================
--- doc/trunk/reference/fr-FR/stereotypes.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/stereotypes.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,19 +14,16 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: stereotypes.xml:5
 #, no-c-format
 msgid "Stereotypes"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:7
 #, no-c-format
 msgid "The CDI specification defines a stereotype as follows:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:11
 #, no-c-format
 msgid ""
 "In many systems, use of architectural patterns produces a set of recurring "
@@ -36,43 +33,36 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:17
 #, no-c-format
 msgid "A stereotype encapsulates any combination of:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:21
 #, no-c-format
 msgid "a default scope, and"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:24
 #, no-c-format
 msgid "a set of interceptor bindings."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:28
 #, no-c-format
 msgid "A stereotype may also specify that:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:34
 #, no-c-format
 msgid "all beans with the stereotype have defaulted bean EL names, or that"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:37
 #, no-c-format
 msgid "all beans with the stereotype are alternatives."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:41
 #, no-c-format
 msgid ""
 "A bean may declare zero, one or multiple stereotypes. Stereotype annotations "
@@ -80,7 +70,6 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:48
 #, no-c-format
 msgid ""
 "A stereotype is an annotation, annotated <literal>@Stereotype</literal>, "
@@ -88,33 +77,12 @@
 "stereotype identifies action classes in some MVC framework:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:53
-#, no-c-format
-msgid ""
-"<![CDATA[@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"...\n"
-"public @interface Action {}]]>"
-msgstr ""
-
 #. Tag: para
-#: stereotypes.xml:55
 #, no-c-format
 msgid "We use the stereotype by applying the annotation to a bean."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: stereotypes.xml:61
 #, no-c-format
 msgid ""
 "Of course, we need to apply some other annotations to our stereotype or else "
@@ -122,46 +90,23 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:66
 #, no-c-format
 msgid "Default scope for a stereotype"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:68
 #, no-c-format
 msgid ""
 "A stereotype may specify a default scope for beans annotated with the "
 "stereotype. For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:72
-#, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-
 #. Tag: para
-#: stereotypes.xml:74
 #, no-c-format
 msgid "A particular action may still override this default if necessary:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:78
-#, no-c-format
-msgid ""
-"<![CDATA[@Dependent @Action \n"
-"public class DependentScopedLoginAction { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: stereotypes.xml:80
 #, no-c-format
 msgid ""
 "Naturally, overriding a single default isn't much use. But remember, "
@@ -169,34 +114,18 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:88
 #, no-c-format
 msgid "Interceptor bindings for stereotypes"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:90
 #, no-c-format
 msgid ""
 "A stereotype may specify a set of interceptor bindings to be inherited by "
 "all beans with that stereotype."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:94
-#, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-
 #. Tag: para
-#: stereotypes.xml:96
 #, no-c-format
 msgid ""
 "This helps us get technical concerns, like transactions and security, even "
@@ -204,13 +133,11 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:103
 #, no-c-format
 msgid "Name defaulting with stereotypes"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:105
 #, no-c-format
 msgid ""
 "We can specify that all beans with a certain stereotype have a defaulted EL "
@@ -218,22 +145,7 @@
 "is add an empty <literal>@Named</literal> annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:110
-#, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-
 #. Tag: para
-#: stereotypes.xml:112
 #, no-c-format
 msgid ""
 "Now, the <literal>LoginAction</literal> bean will have the defaulted name "
@@ -241,13 +153,11 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:119
 #, no-c-format
 msgid "Alternative stereotypes"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:121
 #, no-c-format
 msgid ""
 "A stereotype can indicate that all beans to which it is applied are "
@@ -255,41 +165,19 @@
 "emphasis> lets us classify beans by deployment scenario."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:126
-#, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Mock {}]]>"
-msgstr ""
-
 #. Tag: para
-#: stereotypes.xml:128
 #, no-c-format
 msgid ""
 "We can apply an alternative stereotype to a whole set of beans, and activate "
 "them all with one line of code in <literal>beans.xml</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:133
-#, no-c-format
-msgid ""
-"<![CDATA[@Mock\n"
-"public class MockLoginAction extends LoginAction { ... }]]>"
-msgstr ""
-
 #. Tag: title
-#: stereotypes.xml:141
 #, no-c-format
 msgid "Stereotype stacking"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:143
 #, no-c-format
 msgid ""
 "This may blow your mind a bit, but stereotypes may declare other "
@@ -300,33 +188,18 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:150
 #, no-c-format
 msgid ""
 "Here's an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:155
-#, no-c-format
-msgid ""
-"<![CDATA[@Auditable\n"
-"@Action\n"
-"@Stereotype\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface AuditableAction {}]]>"
-msgstr ""
-
 #. Tag: title
-#: stereotypes.xml:160
 #, no-c-format
 msgid "Built-in stereotypes"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:162
 #, no-c-format
 msgid ""
 "We've already met two standard stereotypes defined by the CDI specification: "
@@ -334,27 +207,13 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:167
 #, no-c-format
 msgid ""
 "CDI defines one further standard stereotype, <literal>@Model</literal>, "
 "which is expected to be used frequently in web applications:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:172
-#, no-c-format
-msgid ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {}]]>"
-msgstr ""
-
 #. Tag: para
-#: stereotypes.xml:174
 #, no-c-format
 msgid ""
 "Instead of using JSF managed beans, just annotate a bean <literal>@Model</"

Modified: doc/trunk/reference/fr-FR/viewlayers.po
===================================================================
--- doc/trunk/reference/fr-FR/viewlayers.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/viewlayers.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-04-19 20:36+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,19 +15,16 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: viewlayers.xml:5
 #, no-c-format
 msgid "Alternative view layers"
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:8
 #, no-c-format
 msgid "Wicket CDI integration"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:10
 #, no-c-format
 msgid ""
 "Weld provides integration between the Apache Wicket web framework and CDI. "
@@ -37,7 +34,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:16
 #, no-c-format
 msgid ""
 "This section describes some of the utilities provided by the Wicket "
@@ -45,13 +41,11 @@
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:22
 #, no-c-format
 msgid "The <literal>WebApplication</literal> class"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:24
 #, no-c-format
 msgid ""
 "Each wicket application must have a <literal>WebApplication</literal> "
@@ -61,7 +55,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:31
 #, no-c-format
 msgid ""
 "If you would prefer not to subclass <literal>WeldApplication</literal>, you "
@@ -71,31 +64,16 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:38
 #, no-c-format
 msgid "For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: viewlayers.xml:41
-#, no-c-format
-msgid ""
-"<![CDATA[public class SampleApplication extends WeldApplication {\n"
-"   @Override\n"
-"   public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: viewlayers.xml:45
 #, no-c-format
 msgid "Conversations with Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:46
 #, no-c-format
 msgid ""
 "Wicket can also take advantage of the conversation scope from CDI, provided "
@@ -103,7 +81,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:52
 #, no-c-format
 msgid ""
 "Setting up the conversation context at the beginning of a Wicket request, "
@@ -111,7 +88,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:58
 #, no-c-format
 msgid ""
 "Storing the id of any long-running conversation in Wicket's metadata when "
@@ -119,7 +95,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:64
 #, no-c-format
 msgid ""
 "Activating the correct long-running conversation based upon which page is "
@@ -127,7 +102,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:69
 #, no-c-format
 msgid ""
 "Propagating the conversation context for any long-running conversation to "
@@ -135,13 +109,11 @@
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:76
 #, no-c-format
 msgid "Starting and stopping conversations in Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:77
 #, no-c-format
 msgid ""
 "As in JSF applications, a conversation <emphasis>always</emphasis> exists "
@@ -153,27 +125,12 @@
 "</literal> methods:"
 msgstr ""
 
-#. Tag: programlisting
-#: viewlayers.xml:86
-#, no-c-format
-msgid ""
-"<![CDATA[private @Inject Conversation conversation;\n"
-"...\n"
-"// begin a conversation\n"
-"conversation.begin();\n"
-"...\n"
-"// end a conversation\n"
-"conversation.end();]]>"
-msgstr ""
-
 #. Tag: title
-#: viewlayers.xml:91
 #, no-c-format
 msgid "Long running conversation propagation in Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:92
 #, no-c-format
 msgid ""
 "When a conversation is marked as long-running, the id of that conversation "

Modified: doc/trunk/reference/fr-FR/weldexamples.po
===================================================================
--- doc/trunk/reference/fr-FR/weldexamples.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/weldexamples.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: weldexamples.xml:5
 #, no-c-format
 msgid "Diving into the Weld examples"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:7
 #, no-c-format
 msgid ""
 "It's time to pull the covers back and dive into the internals of Weld "
@@ -29,13 +27,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:13
 #, no-c-format
 msgid "The numberguess example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:15
 #, no-c-format
 msgid ""
 "In the numberguess application you get 10 attempts to guess a number between "
@@ -44,16 +40,14 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:20
 #, no-c-format
 msgid ""
 "The numberguess example is comprised of a number of beans, configuration "
-"files and Facelets (JSF) views, packaged as a WAR module. Let's start by "
+"files and Facelets (JSF) views, packaged as a war module. Let's start by "
 "examining the configuration files."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:25
 #, no-c-format
 msgid ""
 "All the configuration files for this example are located in <literal>WEB-INF/"
@@ -64,21 +58,7 @@
 "to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:33
-#, no-c-format
-msgid ""
-"<![CDATA[<faces-config version=\"2.0\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd\">\n"
-"</faces-config>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:35
 #, no-c-format
 msgid ""
 "There's also an empty <literal>beans.xml</literal> file, which tells the "
@@ -87,212 +67,120 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:40
 #, no-c-format
 msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:42
+#. Tag: para
 #, no-c-format
+msgid "Enable and initialize the JSF servlet"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"faces.servlet\" coords=\"10\"/> "
-"<area id=\"faces.servlet.mapping\" coords=\"16\"/> <area id=\"faces.default."
-"suffix\" coords=\"21\"/> <area id=\"session.timeout\" coords=\"26\"/> </"
-"areaspec> <programlisting role=\"XML\"><![CDATA[<web-app version=\"2.5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n"
-"   \n"
-"   <display-name>weld-jsf-numberguess-war</display-name>\n"
-"   <description>Weld JSF numberguess example (WAR)</description>\n"
-"\n"
-"   <servlet>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>\n"
-"      <load-on-startup>1</load-on-startup>\n"
-"   </servlet>\n"
-"\n"
-"   <servlet-mapping>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <url-pattern>*.jsf</url-pattern>\n"
-"   </servlet-mapping>\n"
-"   \n"
-"   <context-param>\n"
-"      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>\n"
-"      <param-value>.xhtml</param-value>\n"
-"   </context-param>\n"
-"\n"
-"   <session-config>\n"
-"      <session-timeout>10</session-timeout>\n"
-"   </session-config>\n"
-"\n"
-"</web-app>]]></programlisting> <calloutlist> <callout arearefs=\"faces."
-"servlet\"> <para> Enable and initialize the JSF servlet </para> </callout> "
-"<callout arearefs=\"faces.servlet.mapping\"> <para> Configure requests for "
-"URLs ending in <literal>.jsf</literal> to be handled by JSF </para> </"
-"callout> <callout arearefs=\"faces.default.suffix\"> <para> Tell JSF that we "
-"will be giving our JSF views (Facelets templates) an extension of <literal>."
-"xhtml</literal> </para> </callout> <callout arearefs=\"session.timeout\"> "
-"<para> Configure a session timeout of 10 minutes </para> </callout> </"
-"calloutlist> </programlistingco> <note> <para> This demo uses JSF 2 as the "
-"view framework, but you can use Weld with any servlet-based web framework, "
-"such as JSF 1.2 or Wicket. </para> </note> <para> Let's take a look at the "
-"main JSF view, <literal>src/main/webapp/home.xhtml</literal>. </para> "
-"<programlistingco> <areaspec> <area id=\"template\" coords=\"8\"/> <area id="
-"\"statusMessages\" coords=\"12\"/> <area id=\"instructions\" coords=\"20\"/> "
-"<area id=\"guess\" coords=\"27\"/> <area id=\"validator\" coords=\"29\"/> "
-"<area id=\"submit\" coords=\"30\"/> </areaspec> <programlisting role=\"XML"
-"\"><![CDATA[<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN"
-"\"\n"
-"   \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
-"<html xmlns=\"http://www.w3.org/1999/xhtml\"\n"
-"   xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n"
-"   xmlns:h=\"http://java.sun.com/jsf/html\"\n"
-"   xmlns:f=\"http://java.sun.com/jsf/core\">\n"
-"\n"
-"   <ui:composition template=\"/template.xhtml\">\n"
-"      <ui:define name=\"content\">\n"
-"         <h1>Guess a number...</h1>\n"
-"         <h:form id=\"numberGuess\">\n"
-"            <div style=\"color: red\">\n"
-"               <h:messages id=\"messages\" globalOnly=\"false\"/>\n"
-"               <h:outputText id=\"Higher\" value=\"Higher!\"\n"
-"                  rendered=\"#{game.number gt game.guess and game.guess ne 0}"
-"\"/>\n"
-"               <h:outputText id=\"Lower\" value=\"Lower!\"\n"
-"                  rendered=\"#{game.number lt game.guess and game.guess ne 0}"
-"\"/>\n"
-"            </div>\n"
-"    \n"
-"            <div>\n"
-"               I'm thinking of a number between #{game.smallest} and #{game."
-"biggest}.\n"
-"               You have #{game.remainingGuesses} guesses remaining.\n"
-"            </div>\n"
-"       \n"
-"            <div>\n"
-"               Your guess: \n"
-"               <h:inputText id=\"inputGuess\" value=\"#{game.guess}\"\n"
-"                  size=\"3\" required=\"true\" disabled=\"#{game.number eq "
-"game.guess}\"\n"
-"                  validator=\"#{game.validateNumberRange}\"/>\n"
-"               <h:commandButton id=\"guessButton\" value=\"Guess\" \n"
-"                  action=\"#{game.check}\" disabled=\"#{game.number eq game."
-"guess}\"/>\n"
-"            </div>\n"
-"            <div>\n"
-"              <h:commandButton id=\"restartButton\" value=\"Reset\" action="
-"\"#{game.reset}\" immediate=\"true\"/>\n"
-"            </div>\n"
-"         </h:form>\n"
-"      </ui:define>\n"
-"   </ui:composition>\n"
-"</html>]]></programlisting> <calloutlist> <callout arearefs=\"template\"> "
-"<para> Facelets is the built-in templating language for JSF. Here we are "
-"wrapping our page in a template which defines the layout. </para> </callout> "
-"<callout arearefs=\"statusMessages\"> <para> There are a number of messages "
-"which can be sent to the user, \"Higher!\", \"Lower!\" and \"Correct!\" </"
-"para> </callout> <callout arearefs=\"instructions\"> <para> As the user "
-"guesses, the range of numbers they can guess gets smaller - this sentence "
-"changes to make sure they know the number range of a valid guess. </para> </"
-"callout> <callout arearefs=\"guess\"> <para> This input field is bound to a "
-"bean property using a value expression. </para> </callout> <callout arearefs="
-"\"validator\"> <para> A validator binding is used to make sure the user "
-"doesn't accidentally input a number outside of the range in which they can "
-"guess - if the validator wasn't here, the user might use up a guess on an "
-"out of bounds number. </para> </callout> <callout arearefs=\"submit\"> "
-"<para> And, of course, there must be a way for the user to send their guess "
-"to the server. Here we bind to an action method on the bean. </para> </"
-"callout> </calloutlist> </programlistingco>"
+"Configure requests for URLs ending in <literal>.jsf</literal> to be handled "
+"by JSF"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:142
 #, no-c-format
 msgid ""
-"The example exists of 4 classes, the first two of which are qualifiers. "
-"First, there is the <literal>@Random</literal> qualifier, used for injecting "
-"a random number:"
+"Tell JSF that we will be giving our JSF views (Facelets templates) an "
+"extension of <literal>.xhtml</literal>"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:147
+#. Tag: para
 #, no-c-format
+msgid "Configure a session timeout of 10 minutes"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Random {}]]>"
+"This demo uses JSF 2 as the view framework, but you can use Weld with any "
+"servlet-based web framework, such as JSF 1.2 or Wicket."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:149
 #, no-c-format
 msgid ""
-"There is also the <literal>@MaxNumber</literal> qualifier, used for "
-"injecting the maximum number that can be injected:"
+"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
+"literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:154
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface MaxNumber {}\n"
-"]]>"
+"Facelets is the built-in templating language for JSF. Here we are wrapping "
+"our page in a template which defines the layout."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:156
 #, no-c-format
 msgid ""
-"The application-scoped <literal>Generator</literal> class is responsible for "
-"creating the random number, via a producer method. It also exposes the "
-"maximum possible number via a producer method:"
+"There are a number of messages which can be sent to the user, \"Higher!\", "
+"\"Lower!\" and \"Correct!\""
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:161
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class Generator implements Serializable {\n"
-"\n"
-"   private java.util.Random random = new java.util.Random(System."
-"currentTimeMillis());\n"
-"   \n"
-"   private int maxNumber = 100;\n"
-"   \n"
-"   java.util.Random getRandom() {\n"
-"      return random;\n"
-"   }\n"
-"   \n"
-"   @Produces @Random int next() { \n"
-"      return getRandom().nextInt(maxNumber); \n"
-"   }\n"
-"   \n"
-"   @Produces @MaxNumber int getMaxNumber() {\n"
-"      return maxNumber;\n"
-"   }\n"
-"\n"
-"}]]>"
+"As the user guesses, the range of numbers they can guess gets smaller - this "
+"sentence changes to make sure they know the number range of a valid guess."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:163
 #, no-c-format
+msgid "This input field is bound to a bean property using a value expression."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
+"A validator binding is used to make sure the user doesn't accidentally input "
+"a number outside of the range in which they can guess - if the validator "
+"wasn't here, the user might use up a guess on an out of bounds number."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"And, of course, there must be a way for the user to send their guess to the "
+"server. Here we bind to an action method on the bean."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The example exists of 4 classes, the first two of which are qualifiers. "
+"First, there is the <literal>@Random</literal> qualifier, used for injecting "
+"a random number:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"There is also the <literal>@MaxNumber</literal> qualifier, used for "
+"injecting the maximum number that can be injected:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The application-scoped <literal>Generator</literal> class is responsible for "
+"creating the random number, via a producer method. It also exposes the "
+"maximum possible number via a producer method:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The <literal>Generator</literal> is application scoped, so we don't get a "
 "different random each time."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:168
 #, no-c-format
 msgid ""
 "The package declaration and imports have been excluded from these listings. "
@@ -300,7 +188,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:174
 #, no-c-format
 msgid ""
 "The final bean in the application is the session-scoped <literal>Game</"
@@ -313,7 +200,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:182
 #, no-c-format
 msgid ""
 "You'll notice that we've also added the <literal>@Named</literal> annotation "
@@ -321,123 +207,32 @@
 "bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:187
-#, no-c-format
-msgid ""
-"<![CDATA[@Named\n"
-"@SessionScoped\n"
-"public class Game implements Serializable {\n"
-"\n"
-"   private int number;\n"
-"   private int guess;\n"
-"   private int smallest;\n"
-"   private int biggest;\n"
-"   private int remainingGuesses;\n"
-"\n"
-"   @Inject @MaxNumber private int maxNumber;\n"
-"   @Inject @Random Instance<Integer> randomNumber;\n"
-"   \n"
-"   public Game() {}\n"
-"   \n"
-"   public void check() {\n"
-"      if (guess > number) {\n"
-"         biggest = guess - 1;\n"
-"      }\n"
-"      else if (guess < number) {\n"
-"         smallest = guess + 1;\n"
-"      }\n"
-"      else if (guess == number) {\n"
-"         FacesContext.getCurrentInstance().addMessage(null, new FacesMessage"
-"(\"Correct!\"));\n"
-"      }\n"
-"      remainingGuesses--;\n"
-"   }\n"
-"   \n"
-"   @PostConstruct\n"
-"   public void reset() {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = randomNumber.get();\n"
-"   }\n"
-"   \n"
-"   public void validateNumberRange(FacesContext context,  UIComponent "
-"toValidate, Object value) {\n"
-"      if (remainingGuesses <= 0) {\n"
-"         FacesMessage message = new FacesMessage(\"No guesses left!\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"         return;\n"
-"      }\n"
-"      int input = (Integer) value;\n"
-"\n"
-"      if (input < smallest || input > biggest) {\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"\n"
-"         FacesMessage message = new FacesMessage(\"Invalid guess\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"      }\n"
-"   }\n"
-"\n"
-"   public int getNumber() {\n"
-"      return number;\n"
-"   }\n"
-"   \n"
-"   public int getGuess() {\n"
-"      return guess;\n"
-"   }\n"
-"   \n"
-"   public void setGuess(int guess) {\n"
-"      this.guess = guess;\n"
-"   }\n"
-"   \n"
-"   public int getSmallest() {\n"
-"      return smallest;\n"
-"   }\n"
-"   \n"
-"   public int getBiggest() {\n"
-"      return biggest;\n"
-"   }\n"
-"   \n"
-"   public int getRemainingGuesses() {\n"
-"      return remainingGuesses;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: weldexamples.xml:190
 #, no-c-format
 msgid "The numberguess example in Apache Tomcat or Jetty"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:192
 #, no-c-format
 msgid ""
 "A couple of modifications must be made to the numberguess artifact in order "
 "to deploy it to Tomcat or Jetty. First, Weld must be deployed as a Web "
 "Application library under <literal>WEB-INF/lib</literal> since the servlet "
 "container does not provide the CDI services. For your convenience we provide "
-"a single JAR suitable for running Weld in any servlet container (including "
+"a single jar suitable for running Weld in any servlet container (including "
 "Jetty), <literal>weld-servlet.jar</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:200
 #, no-c-format
 msgid ""
-"You must also include the JARs for JSF, EL, and the common annotations "
+"You must also include the jars for JSF, EL, and the common annotations "
 "(<literal>jsr250-api.jar</literal>), all of which are provided by the Java "
 "EE platform (a Java EE application server). Are you starting to appreciate "
 "why a Java EE platform is worth using?"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:207
 #, no-c-format
 msgid ""
 "Second, we need to explicitly specify the servlet listener in <literal>web."
@@ -445,18 +240,7 @@
 "The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:213
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:215
 #, no-c-format
 msgid ""
 "When Weld boots, it places the <literal>javax.enterprise.inject.spi."
@@ -467,13 +251,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:226
 #, no-c-format
 msgid "The numberguess example for Apache Wicket"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:227
 #, no-c-format
 msgid ""
 "Weld includes a number of portable extensions for JSR-299, including an "
@@ -483,7 +265,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:234
 #, no-c-format
 msgid ""
 "You may want to review the Wicket documentation at <ulink url=\"http://"
@@ -492,7 +273,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:241
 #, no-c-format
 msgid ""
 "Wicket is another environment that relies on the Weld servlet extension. The "
@@ -503,7 +283,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:249
 #, no-c-format
 msgid ""
 "We'll also be using the Eclipse IDE in these examples. Instructions are "
@@ -513,13 +292,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:257
 #, no-c-format
 msgid "Creating the Eclipse project"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:259
 #, no-c-format
 msgid ""
 "To use the Wicket example in Eclipse, you have one of two choices. You can "
@@ -531,17 +308,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:267
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -> Import... -> Maven Projects</"
-"emphasis>. Then, browse to the location of the Wicket numberguess example. "
-"You should see that Eclipse recognizes the existence of a Maven project."
+"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
+"Projects</emphasis>. Then, browse to the location of the Wicket numberguess "
+"example. You should see that Eclipse recognizes the existence of a Maven "
+"project."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:279
 #, no-c-format
 msgid ""
 "This will create a project in your workspace called <literal>weld-wicket-"
@@ -549,7 +325,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:283
 #, no-c-format
 msgid ""
 "You'll notice after importing, the project has a build error. That's because "
@@ -557,21 +332,24 @@
 "<emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> "
 "tab in the window that appears. In the form field labeled \"Active Maven "
 "Profiles (comma separated):\", type <literal>jetty</literal>. That will "
-"enable some extra dependencies that allow the project to compile. You're now "
-"ready to develop!"
+"enable some extra dependencies that allow the project to compile. "
+"Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven "
+"compile plugin when processing resources (recommended)\". That solves an "
+"incompatiblity between the m2eclipse plugin and the Maven enforcer plugin "
+"that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:292
 #, no-c-format
 msgid ""
-"You are also advised to uncheck the box \"Skip Maven compiler when "
-"processing resources\" in the Maven properties screen because of conflicts "
-"with the Maven enforcer plugin."
+"Be sure to uncheck the box \"Skip Maven compile plugin when processing "
+"resources (recommended)\" in the Maven properties screen or else the example "
+"might not run in Eclipse because beans.xml will be missing from the "
+"classpath! See the <ulink url=\"https://issues.sonatype.org/browse/"
+"MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:298
 #, no-c-format
 msgid ""
 "If you are not using the m2eclipse plugin, you have to follow different "
@@ -580,38 +358,26 @@
 "activated, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:304
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/wicket/numberguess\n"
-"mvn -Pjetty eclipse:eclipse]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:306
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -> Import... -> General -> "
-"Existing Projects into Workspace</emphasis>, select the root directory of "
-"the numberguess example, and click Finish. This will create a project in "
+"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
+"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
+"of the numberguess example, and click Finish. This will create a project in "
 "your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:318
 #, no-c-format
 msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:325
 #, no-c-format
 msgid "Running the example from Eclipse"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:327
 #, no-c-format
 msgid ""
 "This project follows the <literal>wicket-quickstart</literal> approach of "
@@ -626,13 +392,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:338
 #, no-c-format
 msgid "Running the example from the command line in JBoss AS or Tomcat"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:340
 #, no-c-format
 msgid ""
 "This example can also be deployed from the command line in a (similar to the "
@@ -642,26 +406,12 @@
 "run:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:346
-#, no-c-format
-msgid "<![CDATA[$> ant deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:348
 #, no-c-format
 msgid "to deploy the example to JBoss AS, and:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:350
-#, no-c-format
-msgid "<![CDATA[$> ant tomcat.deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:352
 #, no-c-format
 msgid ""
 "to deploy the example to Tomcat. You can then access application at <ulink "
@@ -670,33 +420,23 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:357
 #, no-c-format
 msgid ""
 "Alternatively, you can run the application in place on an embedded Jetty "
 "container using the following Maven command:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:362
-#, no-c-format
-msgid "<![CDATA[$> mvn jetty:run -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:364
 #, no-c-format
 msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:371
 #, no-c-format
 msgid "Understanding the code"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:373
 #, no-c-format
 msgid ""
 "The code in the wicket numberguess example is very similar to the JSF-based "
@@ -710,7 +450,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:382
 #, no-c-format
 msgid ""
 "The integration of Weld with Wicket takes advantage of the same qualifier "
@@ -720,13 +459,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:388
 #, no-c-format
 msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:394
 #, no-c-format
 msgid ""
 "Each wicket application must have a <literal>WeldApplication</literal> "
@@ -734,19 +471,7 @@
 "<literal>NumberGuessApplication</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:398
-#, no-c-format
-msgid ""
-"<![CDATA[public class NumberGuessApplication extends WeldApplication {\n"
-"   @Override public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:399
 #, no-c-format
 msgid ""
 "This class specifies which page Wicket should treat as our home page, in our "
@@ -754,7 +479,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:405
 #, no-c-format
 msgid ""
 "In <literal>HomePage</literal>, we see typical Wicket code to set up page "
@@ -762,52 +486,14 @@
 "literal> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:410
-#, no-c-format
-msgid "<![CDATA[@Inject Game game;]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:412
 #, no-c-format
 msgid ""
 "The <literal>Game</literal> bean is can then be used, for example, by the "
 "code for submitting a guess:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:417
-#, no-c-format
-msgid ""
-"<![CDATA[final Component guessButton = new AjaxButton(\"GuessButton\") {\n"
-"   protected void onSubmit(AjaxRequestTarget target, Form form) {\n"
-"      if (game.check()) {\n"
-"         info(\"Correct!\");\n"
-"         setVisible(false);\n"
-"         prompt.setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == 0) {\n"
-"         info(\"Sorry, the answer was \" + game.getNumber());\n"
-"         setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getNumber() > game.getGuess()) {\n"
-"         info(\"Higher!\");\n"
-"      }\n"
-"      else if (game.getNumber() < game.getGuess()) {\n"
-"         info(\"Lower\");\n"
-"      }\n"
-"      target.addComponent(form);\n"
-"   } \n"
-"};      ]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:420
 #, no-c-format
 msgid ""
 "All injections may be serialized; actual storage of the bean is managed by "
@@ -816,7 +502,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:425
 #, no-c-format
 msgid ""
 "Wicket components allow injection, but they <emphasis>cannot</emphasis> use "
@@ -826,7 +511,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:433
 #, no-c-format
 msgid ""
 "The example uses AJAX for processing of button events, and dynamically hides "
@@ -835,7 +519,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:440
 #, no-c-format
 msgid ""
 "In order to activate Wicket for this webapp, the Wicket filter is added to "
@@ -843,29 +526,7 @@
 "<literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:445
-#, no-c-format
-msgid ""
-"<![CDATA[<filter>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-"
-"class>\n"
-"   <init-param>\n"
-"      <param-name>applicationClassName</param-name>\n"
-"      <param-value>org.jboss.weld.examples.wicket.NumberGuessApplication</"
-"param-value>\n"
-"   </init-param>\n"
-"</filter>\n"
-"\n"
-"<filter-mapping>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <url-pattern>/*</url-pattern>\n"
-"</filter-mapping>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:447
 #, no-c-format
 msgid ""
 "The servlet listener is still required, as in the Tomcat example, to "
@@ -876,26 +537,12 @@
 "descriptor to be appended to the <literal>web.xml</literal> configuration."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:455
-#, no-c-format
-msgid ""
-"<![CDATA[<web-app version=\"2.4\" ...>\n"
-"   <listener>\n"
-"      <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"   </listener>\n"
-"</web-app>]]>"
-msgstr ""
-
 #. Tag: title
-#: weldexamples.xml:464
 #, no-c-format
 msgid "The numberguess example for Java SE with Swing"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:466
 #, no-c-format
 msgid ""
 "This example shows how to use the Weld SE extension to in a Java SE based "
@@ -905,19 +552,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:473
 #, no-c-format
 msgid "To run the example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:479
 #, no-c-format
 msgid "Ensure that Maven 2 (version 2.0.10+) is installed and in your PATH"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:484
 #, no-c-format
 msgid ""
 "Ensure that the <literal>JAVA_HOME</literal> environment variable is "
@@ -925,7 +569,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:490
 #, no-c-format
 msgid ""
 "Open a command line or terminal window in the <literal>examples/se/"
@@ -933,19 +576,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:496
 #, no-c-format
 msgid "Execute the following command"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:499
-#, no-c-format
-msgid "mvn -Drun"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:503
 #, no-c-format
 msgid ""
 "Let's have a look at the significant code and configuration files that make "
@@ -953,7 +588,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:508
 #, no-c-format
 msgid ""
 "As usual, there is an empty <literal>beans.xml</literal> file in the root "
@@ -962,7 +596,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:514
 #, no-c-format
 msgid ""
 "The game's main logic is located in <literal>Game.java</literal>. Here is "
@@ -970,293 +603,170 @@
 "the web application version:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:518
+#. Tag: para
 #, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"scope\" coords=\"1\"/> <area id="
-"\"name\" coords=\"2\"/> <area id=\"messages1\" coords=\"26\"/> <area id="
-"\"validation\" coords=\"41\"/> <area id=\"reset\" coords=\"73\"/> </"
-"areaspec> <programlisting role=\"JAVA\"><![CDATA[@ApplicationScoped\n"
-"public class Game\n"
-"{\n"
-"\n"
-"   public static final int MAX_NUM_GUESSES = 10;\n"
-"\n"
-"   private Integer number;\n"
-"   private int guess = 0;\n"
-"   private int smallest = 0;\n"
-"\n"
-"   @Inject\n"
-"   @MaxNumber\n"
-"   private int maxNumber;\n"
-"\n"
-"   private int biggest;\n"
-"   private int remainingGuesses = MAX_NUM_GUESSES;\n"
-"   private boolean validNumberRange = true;\n"
-"\n"
-"   @Inject\n"
-"   Generator rndGenerator;\n"
-"\n"
-"   public Game()\n"
-"   {\n"
-"   }\n"
-"\n"
-"   ...\n"
-"\n"
-"   public boolean isValidNumberRange()\n"
-"   {\n"
-"      return validNumberRange;\n"
-"   }\n"
-"\n"
-"   public boolean isGameWon()\n"
-"   {\n"
-"      return guess == number;\n"
-"   }\n"
-"\n"
-"   public boolean isGameLost()\n"
-"   {\n"
-"      return guess != number && remainingGuesses <= 0;\n"
-"   }\n"
-"\n"
-"   public boolean check()\n"
-"   {\n"
-"      boolean result = false;\n"
-"\n"
-"      if (checkNewNumberRangeIsValid())\n"
-"      {\n"
-"         if (guess > number)\n"
-"         {\n"
-"            biggest = guess - 1;\n"
-"         }\n"
-"\n"
-"         if (guess < number)\n"
-"         {\n"
-"            smallest = guess + 1;\n"
-"         }\n"
-"\n"
-"         if (guess == number)\n"
-"         {\n"
-"            result = true;\n"
-"         }\n"
-"\n"
-"         remainingGuesses--;\n"
-"      }\n"
-"\n"
-"      return result;\n"
-"   }\n"
-"\n"
-"   private boolean checkNewNumberRangeIsValid()\n"
-"   {\n"
-"      return validNumberRange = ((guess >= smallest) && (guess <= "
-"biggest));\n"
-"   }\n"
-"\n"
-"   @PostConstruct\n"
-"   public void reset()\n"
-"   {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = rndGenerator.next();\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"scope\"> <para> The "
-"bean is application scoped rather than session scoped, since an instance of "
-"a Swing application typically represents a single 'session'. </para> </"
-"callout> <callout arearefs=\"name\"> <para> Notice that the bean is not "
-"named, since it doesn't need to be accessed via EL. </para> </callout> "
-"<callout arearefs=\"messages1\"> <para> In Java SE there is no JSF "
-"<literal>FacesContext</literal> to which messages can be added. Instead the "
-"<literal>Game</literal> class provides additional information about the "
-"state of the current game including: </para> <itemizedlist> <listitem> "
-"<para> If the game has been won or lost </para> </listitem> <listitem> "
-"<para> If the most recent guess was invalid </para> </listitem> </"
-"itemizedlist> <para> This allows the Swing UI to query the state of the "
-"game, which it does indirectly via a class called <literal>MessageGenerator</"
-"literal>, in order to determine the appropriate messages to display to the "
-"user during the game. </para> </callout> <callout arearefs=\"validation\"> "
-"<para> Since there is no dedicated validation phase, validation of user "
-"input is performed during the <literal>check()</literal> method. </para> </"
-"callout> <callout arearefs=\"reset\"> <para> The <literal>reset()</literal> "
-"method makes a call to the injected <literal>rndGenerator</literal> in order "
-"to get the random number at the start of each game. Note that it can't use "
-"<literal>Instance.get()</literal> like the JSF example does because there "
-"will not be any active contexts like there are during a JSF request. </para> "
-"</callout> </calloutlist> </programlistingco> <para> The "
-"<literal>MessageGenerator</literal> class depends on the current instance of "
-"<literal>Game</literal> and queries its state in order to determine the "
-"appropriate messages to provide as the prompt for the user's next guess and "
-"the response to the previous guess. The code for <literal>MessageGenerator</"
-"literal> is as follows: </para> <programlistingco> <areaspec> <area id=\"game"
-"\" coords=\"3\"/> <area id=\"challenge\" coords=\"6\"/> <area id=\"result\" "
-"coords=\"17\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA[public "
-"class MessageGenerator\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   public String getChallengeMessage()\n"
-"   {\n"
-"      StringBuilder challengeMsg = new StringBuilder(\"I'm thinking of a "
-"number between \");\n"
-"      challengeMsg.append(game.getSmallest());\n"
-"      challengeMsg.append(\" and \");\n"
-"      challengeMsg.append(game.getBiggest());\n"
-"      challengeMsg.append(\". Can you guess what it is?\");\n"
-"\n"
-"      return challengeMsg.toString();\n"
-"   }\n"
-"\n"
-"   public String getResultMessage()\n"
-"   {\n"
-"      if (game.isGameWon())\n"
-"      {\n"
-"         return \"You guessed it! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (game.isGameLost())\n"
-"      {\n"
-"         return \"You are fail! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (!game.isValidNumberRange())\n"
-"      {\n"
-"         return \"Invalid number range!\";\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == Game.MAX_NUM_GUESSES)\n"
-"      {\n"
-"         return \"What is your first guess?\";\n"
-"      }\n"
-"      else\n"
-"      {\n"
-"         String direction = null;\n"
-"\n"
-"         if (game.getGuess() < game.getNumber())\n"
-"         {\n"
-"            direction = \"Higher\";\n"
-"         }\n"
-"         else\n"
-"         {\n"
-"            direction = \"Lower\";\n"
-"         }\n"
-"\n"
-"         return direction + \"! You have \" + game.getRemainingGuesses() + "
-"\" guesses left.\";\n"
-"      }\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"game\"> <para> The "
-"instance of <literal>Game</literal> for the application is injected here. </"
-"para> </callout> <callout arearefs=\"challenge\"> <para> The <literal>Game</"
-"literal>'s state is interrogated to determine the appropriate challenge "
-"message ... </para> </callout> <callout arearefs=\"result\"> <para> ... and "
-"again to determine whether to congratulate, console or encourage the user to "
-"continue. </para> </callout> </calloutlist> </programlistingco> <para> "
+"The bean is application scoped rather than session scoped, since an instance "
+"of a Swing application typically represents a single 'session'."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Notice that the bean is not named, since it doesn't need to be accessed via "
+"EL."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"In Java SE there is no JSF <literal>FacesContext</literal> to which messages "
+"can be added. Instead the <literal>Game</literal> class provides additional "
+"information about the state of the current game including:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the game has been won or lost"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the most recent guess was invalid"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This allows the Swing UI to query the state of the game, which it does "
+"indirectly via a class called <literal>MessageGenerator</literal>, in order "
+"to determine the appropriate messages to display to the user during the game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Since there is no dedicated validation phase, validation of user input is "
+"performed during the <literal>check()</literal> method."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>reset()</literal> method makes a call to the injected "
+"<literal>rndGenerator</literal> in order to get the random number at the "
+"start of each game. Note that it can't use <literal>Instance.get()</literal> "
+"like the JSF example does because there will not be any active contexts like "
+"there are during a JSF request."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>MessageGenerator</literal> class depends on the current "
+"instance of <literal>Game</literal> and queries its state in order to "
+"determine the appropriate messages to provide as the prompt for the user's "
+"next guess and the response to the previous guess. The code for "
+"<literal>MessageGenerator</literal> is as follows:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The instance of <literal>Game</literal> for the application is injected here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>Game</literal>'s state is interrogated to determine the "
+"appropriate challenge message ..."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"... and again to determine whether to congratulate, console or encourage the "
+"user to continue."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "Finally we come to the <literal>NumberGuessFrame</literal> class which "
-"provides the Swing front end to our guessing game. </para> "
-"<programlistingco> <areaspec> <area id=\"gameIn\" coords=\"3\"/> <area id="
-"\"messagesIn\" coords=\"6\"/> <area id=\"start\" coords=\"9\"/> <area id="
-"\"init\" coords=\"21\"/> <area id=\"guess1\" coords=\"38\"/> <area id="
-"\"replay\" coords=\"48\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA"
-"[public class NumberGuessFrame extends javax.swing.JFrame\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   @Inject\n"
-"   private MessageGenerator msgGenerator;\n"
-"\n"
-"   public void start(@Observes ContainerInitialized event)\n"
-"   {\n"
-"      java.awt.EventQueue.invokeLater(new Runnable()\n"
-"      {\n"
-"         public void run()\n"
-"         {\n"
-"            initComponents();\n"
-"            setVisible(true);\n"
-"         }\n"
-"      });\n"
-"   }\n"
-"\n"
-"   private void initComponents()\n"
-"   {\n"
-"\n"
-"      buttonPanel = new javax.swing.JPanel();\n"
-"      mainMsgPanel = new javax.swing.JPanel();\n"
-"      mainLabel = new javax.swing.JLabel();\n"
-"      messageLabel = new javax.swing.JLabel();\n"
-"      guessText = new javax.swing.JTextField();\n"
-"      ...\n"
-"      mainLabel.setText(msgGenerator.getChallengeMessage());\n"
-"      mainMsgPanel.add(mainLabel);\n"
-"\n"
-"      messageLabel.setText(msgGenerator.getResultMessage());\n"
-"      mainMsgPanel.add(messageLabel);\n"
-"      ...\n"
-"   }\n"
-"\n"
-"   private void guessButtonActionPerformed( java.awt.event.ActionEvent "
-"evt )\n"
-"   {\n"
-"      int guess =  Integer.parseInt(guessText.getText());\n"
-"      game.setGuess( guess );\n"
-"      game.check();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void replayBtnActionPerformed(java.awt.event.ActionEvent evt)\n"
-"   {\n"
-"      game.reset();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void refreshUI() {\n"
-"      mainLabel.setText( msgGenerator.getChallengeMessage() );\n"
-"      messageLabel.setText( msgGenerator.getResultMessage() );\n"
-"      guessText.setText( \"\" );\n"
-"      guessesLeftBar.setValue( game.getRemainingGuesses() );\n"
-"      guessText.requestFocus();\n"
-"   }\n"
-"\n"
-"   // swing components\n"
-"   private javax.swing.JPanel borderPanel;\n"
-"   ...\n"
-"   private javax.swing.JButton replayBtn;\n"
-"\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"gameIn\"> <para> The "
-"injected instance of the game (logic and state). </para> </callout> <callout "
-"arearefs=\"messagesIn\"> <para> The injected message generator for UI "
-"messages. </para> </callout> <callout arearefs=\"start\"> <para> This "
-"application is started in the prescribed Weld SE way, by observing the "
-"<literal>ContainerInitialized</literal> event. </para> </callout> <callout "
-"arearefs=\"init\"> <para> This method initializes all of the Swing "
-"components. Note the use of the <literal>msgGenerator</literal> here. </"
-"para> </callout> <callout arearefs=\"guess1\"> <para> "
+"provides the Swing front end to our guessing game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected instance of the game (logic and state)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected message generator for UI messages."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This application is started in the prescribed Weld SE way, by observing the "
+"<literal>ContainerInitialized</literal> event."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This method initializes all of the Swing components. Note the use of the "
+"<literal>msgGenerator</literal> here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
-"button is clicked, and it does the following: </para> <itemizedlist> "
-"<listitem> <para> Gets the guess entered by the user and sets it as the "
-"current guess in the <literal>Game</literal> </para> </listitem> <listitem> "
-"<para> Calls <literal>game.check()</literal> to validate and perform one "
-"'turn' of the game </para> </listitem> <listitem> <para> Calls "
-"<literal>refreshUI</literal>. If there were validation errors with the "
+"button is clicked, and it does the following:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Gets the guess entered by the user and sets it as the current guess in the "
+"<literal>Game</literal>"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
+"the game"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>refreshUI</literal>. If there were validation errors with the "
 "input, this will have been captured during <literal>game.check()</literal> "
 "and as such will be reflected in the messages returned by "
 "<literal>MessageGenerator</literal> and subsequently presented to the user. "
 "If there are no validation errors then the user will be told to guess again "
 "(higher or lower) or that the game has ended either in a win (correct guess) "
-"or a loss (ran out of guesses). </para> </listitem> </itemizedlist> </"
-"callout> <callout arearefs=\"replay\"> <para> "
+"or a loss (ran out of guesses)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>replayBtnActionPerformed</literal> simply calls <literal>game.reset"
-"()</literal> to start a new game and refreshes the messages in the UI. </"
-"para> </callout> </calloutlist> </programlistingco>"
+"()</literal> to start a new game and refreshes the messages in the UI."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:716
 #, no-c-format
 msgid "The translator example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:718
 #, no-c-format
 msgid ""
 "The translator example will take any sentences you enter, and translate them "
@@ -1265,52 +775,29 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:723
 #, no-c-format
 msgid ""
-"The translator example is built as an EAR and contains EJBs. As a result, "
+"The translator example is built as an ear and contains EJBs. As a result, "
 "it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:729
 #, no-c-format
 msgid ""
-"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a WAR, which "
+"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a war, which "
 "will make this structure much simpler! Still, there are other advantages of "
-"using an EAR."
+"using an ear."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:735
 #, no-c-format
 msgid ""
-"First, let's take a look at the EAR aggregator, which is located in the "
+"First, let's take a look at the ear aggregator, which is located in the "
 "example's <literal>ear</literal> directory. Maven automatically generates "
 "the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:740
-#, no-c-format
-msgid ""
-"<![CDATA[<plugin>\n"
-"   <groupId>org.apache.maven.plugins</groupId>\n"
-"   <artifactId>maven-ear-plugin</artifactId>\n"
-"   <configuration>\n"
-"      <modules>\n"
-"         <webModule>\n"
-"            <groupId>org.jboss.weld.examples.jsf.translator</groupId>\n"
-"            <artifactId>weld-jsf-translator-war</artifactId>\n"
-"            <contextRoot>/weld-translator</contextRoot>\n"
-"         </webModule>\n"
-"      </modules>\n"
-"   </configuration>\n"
-"</plugin>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:742
 #, no-c-format
 msgid ""
 "This configuration overrides the web context path, resulting in this "
@@ -1319,44 +806,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:748
 #, no-c-format
 msgid ""
 "If you weren't using Maven to generate these files, you would need "
 "<literal>META-INF/application.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:753
-#, no-c-format
-msgid ""
-"<![CDATA[<application version=\"5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/application_5.xsd\">\n"
-"\n"
-"  <display-name>weld-jsf-translator-ear</display-name>\n"
-"  <description>The Weld JSF translator example (EAR)</description>\n"
-"  \n"
-"  <module>\n"
-"    <web>\n"
-"      <web-uri>weld-translator.war</web-uri>\n"
-"      <context-root>/weld-translator</context-root>\n"
-"    </web>\n"
-"  </module>\n"
-"  <module>\n"
-"    <ejb>weld-translator.jar</ejb>\n"
-"  </module>\n"
-"</application>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:756
 #, no-c-format
 msgid ""
-"Next, lets look at the WAR, which is located in the example's <literal>war</"
+"Next, lets look at the war, which is located in the example's <literal>war</"
 "literal> directory. Just as in the numberguess example, we have a "
 "<literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</"
 "literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/"
@@ -1364,7 +823,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:762
 #, no-c-format
 msgid ""
 "More interesting is the JSF view used to translate text. Just as in the "
@@ -1372,41 +830,7 @@
 "here for brevity):"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:767
-#, no-c-format
-msgid ""
-"<![CDATA[<h:form id=\"translator\">\n"
-"\n"
-"   <table>\n"
-"      <tr align=\"center\" style=\"font-weight: bold\">\n"
-"         <td>\n"
-"            Your text\n"
-"         </td>\n"
-"         <td>\n"
-"            Translation\n"
-"         </td>\n"
-"      </tr>\n"
-"      <tr>\n"
-"         <td>\n"
-"            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
-"required=\"true\" rows=\"5\" cols=\"80\"/>\n"
-"         </td>\n"
-"         <td>\n"
-"            <h:outputText value=\"#{translator.translatedText}\"/>\n"
-"         </td>\n"
-"      </tr>\n"
-"   </table>\n"
-"   <div>\n"
-"      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
-"{translator.translate}\"/>\n"
-"   </div>\n"
-"   \n"
-"</h:form>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:769
 #, no-c-format
 msgid ""
 "The user can enter some text in the left-hand textarea, and hit the "
@@ -1414,7 +838,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:774
 #, no-c-format
 msgid ""
 "Finally, let's look at the EJB module, which is located in the example's "
@@ -1424,7 +847,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:780
 #, no-c-format
 msgid ""
 "We've saved the most interesting bit to last, the code! The project has two "
@@ -1436,7 +858,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:787
 #, no-c-format
 msgid ""
 "Both <literal>SentenceParser</literal> and <literal>TextTranslator</literal> "
@@ -1444,33 +865,7 @@
 "injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:792
-#, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator implements Serializable { \n"
-"\n"
-"   private SentenceParser sentenceParser; \n"
-"\n"
-"   @EJB private Translator translator; \n"
-"   \n"
-"   @Inject public TextTranslator(SentenceParser sentenceParser) { \n"
-"      this.sentenceParser = sentenceParser; \n"
-"   }\n"
-"   \n"
-"   public String translate(String text) { \n"
-"      StringBuilder sb = new StringBuilder(); \n"
-"      for (String sentence: sentenceParser.parse(text)) { \n"
-"         sb.append(translator.translate(sentence)).append(\". \"); \n"
-"      } \n"
-"      return sb.toString().trim(); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:794
 #, no-c-format
 msgid ""
 "<literal>TextTranslator</literal> uses the simple bean (really just a plain "
@@ -1481,22 +876,7 @@
 "convincing enough to anyone who doesn't understand Latin!"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:802
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator { \n"
-"\n"
-"   public String translate(String sentence) { \n"
-"      return \"Lorem ipsum dolor sit amet\"; \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:804
 #, no-c-format
 msgid ""
 "Finally, there is UI orientated controller. This is a request scoped, named, "
@@ -1505,44 +885,7 @@
 "and setters for all the fields on the page."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:810
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"@RequestScoped\n"
-"@Named(\"translator\")\n"
-"public class TranslatorControllerBean implements TranslatorController {\n"
-"\n"
-"   @Inject private TextTranslator translator;\n"
-"   \n"
-"   private String inputText;\n"
-"   \n"
-"   private String translatedText;\n"
-"   \n"
-"   public void translate() {\n"
-"      translatedText = translator.translate(inputText);\n"
-"   }\n"
-"   \n"
-"   public String getText() {\n"
-"      return inputText;\n"
-"   }\n"
-"   \n"
-"   public void setText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"   \n"
-"   public String getTranslatedText() {\n"
-"      return translatedText;\n"
-"   }\n"
-"   \n"
-"   @Remove public void remove() {}\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:814
 #, no-c-format
 msgid ""
 "That concludes our short tour of the Weld starter examples. For more "

Modified: doc/trunk/reference/fr-FR/xml.po
===================================================================
--- doc/trunk/reference/fr-FR/xml.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/fr-FR/xml.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-02-07 14:53+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: xml.xml:5
 #, fuzzy, no-c-format
 msgid "Defining beans using XML"
 msgstr "Définir des Web Beans en utilisant XML"
 
 #. Tag: para
-#: xml.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "So far, we've seen plenty of examples of beans declared using annotations. "
@@ -32,20 +30,17 @@
 "utiliser les annotations pour définir un Web Bean:"
 
 #. Tag: para
-#: xml.xml:14
 #, no-c-format
 msgid "when the implementation class comes from some preexisting library, or"
 msgstr "quand la class d'implémentation provient d'une librairie existante, ou"
 
 #. Tag: para
-#: xml.xml:19
 #, fuzzy, no-c-format
 msgid "when there should be multiple beans with the same implementation class."
 msgstr ""
 "quand il y aurait plusieurs Web Beans ayant la même classe d'implémentation."
 
 #. Tag: para
-#: xml.xml:25
 #, no-c-format
 msgid ""
 "One way to address these problems is to write a producer method. Weld offers "
@@ -55,7 +50,6 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:31
 #, fuzzy, no-c-format
 msgid ""
 "Many frameworks use XML to provide metadata relating to Java classes. "
@@ -72,7 +66,6 @@
 "nom de class ou de membre comme nom de l'élément XML."
 
 #. Tag: para
-#: xml.xml:38
 #, no-c-format
 msgid ""
 "The advantage of this approach is that you can write an XML schema that "
@@ -89,13 +82,11 @@
 "explicite."
 
 #. Tag: title
-#: xml.xml:46
 #, fuzzy, no-c-format
 msgid "Declaring beans"
 msgstr "Déclarer des classes Web Beans"
 
 #. Tag: para
-#: xml.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "For each Java package, Weld defines a corresponding XML namespace. The "
@@ -110,7 +101,6 @@
 "mydomain.myapp</literal>."
 
 #. Tag: para
-#: xml.xml:54
 #, no-c-format
 msgid ""
 "Java types belonging to a package are referred to using an XML element in "
@@ -126,7 +116,6 @@
 "membres sont spécifiés par des attributs de l'élément."
 
 #. Tag: para
-#: xml.xml:61
 #, no-c-format
 msgid ""
 "For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
@@ -135,24 +124,7 @@
 "Par exemple, l'élément <literal>&lt;util:Date/&gt;</literal> dans le "
 "fragment XML suivant référencela class <literal>java.util.Date</literal>:"
 
-#. Tag: programlisting
-#: xml.xml:66
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:util=\"urn:java:java.util\">\n"
-"   <util:Date/>\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
-"          xmlns:util=\"urn:java:java.util\">\n"
-"\n"
-"    <util:Date/>\n"
-"\n"
-"</WebBeans>]]>"
-
 #. Tag: para
-#: xml.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "And this is all the code we need to declare that <literal>Date</literal> is "
@@ -164,20 +136,12 @@
 "<literal>Date</literal> peut maintenant être injectée par n'importe quel "
 "autre Web Bean:"
 
-#. Tag: programlisting
-#: xml.xml:73
-#, fuzzy, no-c-format
-msgid "<![CDATA[private @Inject Date date;]]>"
-msgstr "<![CDATA[@Current Date date]]>"
-
 #. Tag: title
-#: xml.xml:78
 #, fuzzy, no-c-format
 msgid "Declaring bean metadata"
 msgstr "Déclarer les métadonnées d'un Web Bean"
 
 #. Tag: para
-#: xml.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "We can declare the scope, deployment type and interceptor binding types "
@@ -187,68 +151,14 @@
 "liaison d'intercepteurs en utilisant les éléments enfants directs de la "
 "déclaration du Web Bean:"
 
-#. Tag: programlisting
-#: xml.xml:85
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"   <SessionScoped/>\n"
-"   <myfwk:Transactional requiresNew=\"true\"/>\n"
-"   <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
-msgstr ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"    <SessionScoped/>\n"
-"    <myfwk:Transactional requiresNew=\"true\"/>\n"
-"    <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
-
 #. Tag: para
-#: xml.xml:87
 #, fuzzy, no-c-format
 msgid "We use exactly the same approach to specify names and qualifiers:"
 msgstr ""
 "Nous utilisons exactement la même approche pour spécifier les noms et les "
 "types de liaison:"
 
-#. Tag: programlisting
-#: xml.xml:89
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<util:Date>\n"
-"   <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <SessionScoped/>\n"
-"   <myapp:Login/>\n"
-"   <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:SystemStart/>\n"
-"   <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
-msgstr ""
-"<![CDATA[<util:Date>\n"
-"    <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"    <SessionScoped/>\n"
-"    <myapp:Login/>\n"
-"    <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"    <ApplicationScoped/>\n"
-"    <myapp:SystemStart/>\n"
-"    <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
-
 #. Tag: para
-#: xml.xml:91
 #, fuzzy, no-c-format
 msgid ""
 "Where <literal>@Login</literal> and <literal>@SystemStart</literal> are "
@@ -257,40 +167,12 @@
 "Où <literal>@Login</literal> et <literal>@SystemStart</literal> sont des "
 "types d'annotations de liaison."
 
-#. Tag: programlisting
-#: xml.xml:95
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[private @Inject Date currentTime;\n"
-"private @Login Date loginTime;\n"
-"private @SystemStart Date systemStartTime;]]>"
-msgstr ""
-"<![CDATA[@Current Date currentTime;\n"
-"@Login Date loginTime;\n"
-"@SystemStart Date systemStartTime;]]>"
-
 #. Tag: para
-#: xml.xml:97
 #, fuzzy, no-c-format
 msgid "As usual, a bean may support multiple qualifier types:"
 msgstr "Comme d'habitude, un Web Bean supporte plusieurs types de liaison:"
 
-#. Tag: programlisting
-#: xml.xml:99
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"   <myapp:PayByCheque/>\n"
-"   <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
-msgstr ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"    <myapp:PayByCheque/>\n"
-"    <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
-
 #. Tag: para
-#: xml.xml:101
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors and decorators are beans as well, so they may be declared just "
@@ -299,74 +181,29 @@
 "Les intercepteurs et les décorateurs sont juste de Web Beans simples, donc "
 "ils peuvent être déclarés comme n'importe quel Web Bean simple:"
 
-#. Tag: programlisting
-#: xml.xml:105
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"   <Interceptor/>\n"
-"   <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
-msgstr ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"    <Interceptor/>\n"
-"    <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
-
 #. Tag: title
-#: xml.xml:110
 #, fuzzy, no-c-format
 msgid "Declaring bean members"
 msgstr "Déclarer des membres de Web Beans"
 
 #. Tag: para
-#: xml.xml:112
 #, no-c-format
 msgid "TODO!"
 msgstr "TODO!"
 
 #. Tag: title
-#: xml.xml:119
 #, fuzzy, no-c-format
 msgid "Declaring inline beans"
 msgstr "Déclarer des Web Beans à la volée"
 
 #. Tag: para
-#: xml.xml:121
 #, fuzzy, no-c-format
 msgid "Weld lets us define a bean at an injection point. For example:"
 msgstr ""
 "Les Web Beans nous permettent de définir un Web Bean à un point d'injection. "
 "Par exemple:"
 
-#. Tag: programlisting
-#: xml.xml:123
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:System>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:admin>\n"
-"      <myapp:Name>\n"
-"         <myapp:firstname>Gavin</myapp:firstname>\n"
-"         <myapp:lastname>King</myapp:lastname>\n"
-"         <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"      </myapp:Name>\n"
-"   </myapp:admin>\n"
-"</myapp:System>]]>"
-msgstr ""
-"<![CDATA[<myapp:System>\n"
-"    <ApplicationScoped/>\n"
-"    <myapp:admin>\n"
-"        <myapp:Name>\n"
-"            <myapp:firstname>Gavin</myapp:firstname>\n"
-"            <myapp:lastname>King</myapp:lastname>\n"
-"            <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"        </myapp:Name>\n"
-"    </myapp:admin>\n"
-"</myapp:System>]]>"
-
 #. Tag: para
-#: xml.xml:125
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
@@ -382,7 +219,6 @@
 "seulement au point d'injection spécifique où il a été déclaré."
 
 #. Tag: para
-#: xml.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "This simple but powerful feature allows the Weld XML format to be used to "
@@ -395,13 +231,11 @@
 "approche!"
 
 #. Tag: title
-#: xml.xml:139
 #, no-c-format
 msgid "Using a schema"
 msgstr "Utiliser un schéma"
 
 #. Tag: para
-#: xml.xml:141
 #, fuzzy, no-c-format
 msgid ""
 "If we want our XML document format to be authored by people who aren't Java "
@@ -413,39 +247,7 @@
 "nous devons fournir un schéma. Ecrire ou utiliser le schéma n'a rien de "
 "spécifique aux Web Beans."
 
-#. Tag: programlisting
-#: xml.xml:147
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/beans-"
-"1.0.xsd\n"
-"   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"   <myapp:System>\n"
-"      ...\n"
-"   </myapp:System>\n"
-"\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
-"          xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"          xsi:schemaLocation=\"urn:java:javax.webbeans http://java.sun.com/"
-"jee/web-beans-1.0.xsd\n"
-"                              urn:java:com.mydomain.myapp http://mydomain."
-"com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"    <myapp:System>\n"
-"        ...\n"
-"    </myapp:System>\n"
-"\n"
-"</WebBeans>]]>"
-
 #. Tag: para
-#: xml.xml:149
 #, fuzzy, no-c-format
 msgid ""
 "Writing an XML schema is quite tedious. Therefore, the Weld project will "
@@ -456,6 +258,159 @@
 "Beans RI fournira un outil qui génèrera automatiquement le schéma XML à "
 "partir du code Java compilé."
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:util=\"urn:java:java.util\">\n"
+#~ "   <util:Date/>\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
+#~ "          xmlns:util=\"urn:java:java.util\">\n"
+#~ "\n"
+#~ "    <util:Date/>\n"
+#~ "\n"
+#~ "</WebBeans>]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[private @Inject Date date;]]>"
+#~ msgstr "<![CDATA[@Current Date date]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "   <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "    <SessionScoped/>\n"
+#~ "    <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "    <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "   <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myapp:Login/>\n"
+#~ "   <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:SystemStart/>\n"
+#~ "   <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "    <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "    <SessionScoped/>\n"
+#~ "    <myapp:Login/>\n"
+#~ "    <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "    <ApplicationScoped/>\n"
+#~ "    <myapp:SystemStart/>\n"
+#~ "    <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[private @Inject Date currentTime;\n"
+#~ "private @Login Date loginTime;\n"
+#~ "private @SystemStart Date systemStartTime;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Current Date currentTime;\n"
+#~ "@Login Date loginTime;\n"
+#~ "@SystemStart Date systemStartTime;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "   <myapp:PayByCheque/>\n"
+#~ "   <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "    <myapp:PayByCheque/>\n"
+#~ "    <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "   <Interceptor/>\n"
+#~ "   <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "    <Interceptor/>\n"
+#~ "    <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:admin>\n"
+#~ "      <myapp:Name>\n"
+#~ "         <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "         <myapp:lastname>King</myapp:lastname>\n"
+#~ "         <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "      </myapp:Name>\n"
+#~ "   </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "    <ApplicationScoped/>\n"
+#~ "    <myapp:admin>\n"
+#~ "        <myapp:Name>\n"
+#~ "            <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "            <myapp:lastname>King</myapp:lastname>\n"
+#~ "            <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "        </myapp:Name>\n"
+#~ "    </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/"
+#~ "beans-1.0.xsd\n"
+#~ "   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "   <myapp:System>\n"
+#~ "      ...\n"
+#~ "   </myapp:System>\n"
+#~ "\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
+#~ "          xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "          xsi:schemaLocation=\"urn:java:javax.webbeans http://java.sun."
+#~ "com/jee/web-beans-1.0.xsd\n"
+#~ "                              urn:java:com.mydomain.myapp http://mydomain."
+#~ "com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "    <myapp:System>\n"
+#~ "        ...\n"
+#~ "    </myapp:System>\n"
+#~ "\n"
+#~ "</WebBeans>]]>"
+
 #~ msgid "In either of these cases, Web Beans gives us two options:"
 #~ msgstr "Dans tous ces cas, les Web Beans nous offrent deux possibilités:"
 

Modified: doc/trunk/reference/it-IT/Author_Group.po
===================================================================
--- doc/trunk/reference/it-IT/Author_Group.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/Author_Group.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-23 21:11+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -13,123 +13,137 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Tag: author
-#: Author_Group.xml:5
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Gavin</firstname> <surname>King</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+msgid "Gavin"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:8
 #, no-c-format
 msgid "JSR-299: Contexts and Dependency Injection Lead"
 msgstr "JSR-299: Contexts and Dependency Injection Lead"
 
-#. Tag: author
-#: Author_Group.xml:14
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+msgid "Pete"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:17
 #, no-c-format
 msgid "Weld (JSR-299 RI) Lead"
 msgstr "Weld (JSR-299 RI) Lead"
 
-#. Tag: author
-#: Author_Group.xml:24
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
-msgstr "<firstname>Dan</firstname> <surname>Allen</surname>"
+msgid "Dan"
+msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:31
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>David</firstname> <surname>Allen</surname>"
-msgstr "<firstname>David</firstname> <surname>Allen</surname>"
+msgid "David"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:35
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
-msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+msgid "Nicola"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:38
-#: Author_Group.xml:67
 #, no-c-format
 msgid "Italian Translation"
 msgstr "Traduzione italiana"
 
-#. Tag: othercredit
-#: Author_Group.xml:40
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
-msgstr "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+msgid "Gladys"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:43
 #, no-c-format
 msgid "Spanish Translation"
 msgstr "Traduzione spagnola"
 
-#. Tag: othercredit
-#: Author_Group.xml:48
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
-msgstr "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+msgid "Eun-Ju"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:51
 #, no-c-format
 msgid "Korean Translation"
 msgstr "Traduzione coreana"
 
-#. Tag: othercredit
-#: Author_Group.xml:56
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
-msgstr "<firstname>Terry</firstname> <surname>Chuang</surname>"
+msgid "Terry"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:59
 #, no-c-format
 msgid "Traditional Chinese Translation"
 msgstr "Traduzione cinese (tradizionale)"
 
-#. Tag: othercredit
-#: Author_Group.xml:64
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
-msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+msgid "Francesco"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:69
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
-msgstr "<firstname>Sean</firstname> <surname>Wu</surname>"
+msgid "Sean"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:72
 #, no-c-format
 msgid "Simplified Chinese Translation"
 msgstr "Traduzione cinese semplificato"
 
+#~ msgid "<firstname>Gavin</firstname> <surname>King</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#~ msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
+#~ msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>Dan</firstname> <surname>Allen</surname>"
+
+#~ msgid "<firstname>David</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>David</firstname> <surname>Allen</surname>"
+
+#~ msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+#~ msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+
+#~ msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+#~ msgstr "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+
+#~ msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+#~ msgstr "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+
+#~ msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
+#~ msgstr "<firstname>Terry</firstname> <surname>Chuang</surname>"
+
+#~ msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+#~ msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+
+#~ msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
+#~ msgstr "<firstname>Sean</firstname> <surname>Wu</surname>"
+
 #~ msgid ""
 #~ "<jobtitle>JSR-299 specification lead</jobtitle> <orgname>Red Hat "
 #~ "Middleware LLC</orgname>"
 #~ msgstr ""
 #~ "<jobtitle>JSR-299 specification lead</jobtitle> <orgname>Red Hat "
 #~ "Middleware LLC</orgname>"
+
 #~ msgid ""
 #~ "<jobtitle>Web Beans (JSR-299 Reference Implementation) lead </jobtitle> "
 #~ "<orgname>Red Hat Middleware LLC</orgname>"
 #~ msgstr ""
 #~ "<jobtitle>Web Beans (JSR-299 Reference Implementation) lead </jobtitle> "
 #~ "<orgname>Red Hat Middleware LLC</orgname>"
+
 #~ msgid "Red Hat Middleware LLC"
 #~ msgstr "Red Hat Middleware LLC"
+
 #~ msgid "Kava Community"
 #~ msgstr "Kava Community"
-

Modified: doc/trunk/reference/it-IT/Book_Info.po
===================================================================
--- doc/trunk/reference/it-IT/Book_Info.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/Book_Info.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-23 21:12+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,35 +14,41 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: Book_Info.xml:4
 #, no-c-format
 msgid "Weld - JSR-299 Reference Implementation"
 msgstr "Weld - JSR-299 Implementazione di riferimento"
 
 #. Tag: subtitle
-#: Book_Info.xml:5
 #, no-c-format
-msgid "JSR-299: The new Java standard for dependency injection and contextual lifecycle management"
-msgstr "JSR-299: Il nuovo standard Java per la dependency injection e la gestione contestuale del ciclo di vita"
+msgid ""
+"JSR-299: The new Java standard for dependency injection and contextual "
+"lifecycle management"
+msgstr ""
+"JSR-299: Il nuovo standard Java per la dependency injection e la gestione "
+"contestuale del ciclo di vita"
 
 #~ msgid "Web Beans: Java Contexts and Dependency Injection"
 #~ msgstr "Web Beans: Contesti Java e Dependency Injection"
+
 #~ msgid "Introduction to Web Beans"
 #~ msgstr "Introduzione a Web Beans"
+
 #~ msgid "<firstname>Gavin</firstname> <surname>King</surname>"
 #~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
 #~ msgid ""
 #~ "<jobtitle>Web Beans (JSR-299) specification lead</jobtitle> <orgname>Red "
 #~ "Hat Middleware LLC</orgname>"
 #~ msgstr ""
 #~ "<jobtitle>Responsabile della specifica di Web Beans (JSR-299)</jobtitle> "
 #~ "<orgname>Red Hat Middleware LLC</orgname>"
+
 #~ msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
 #~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
 #~ msgid ""
 #~ "<jobtitle>Web Beans (JSR-299) Reference Implementation lead</jobtitle> "
 #~ "<orgname>Red Hat Middleware LLC</orgname>"
 #~ msgstr ""
 #~ "<jobtitle>Responsabile per l'implementazione della documentazione Web "
 #~ "Beans (JSR-299)</jobtitle> <orgname>Red Hat Middleware LLC</orgname>"
-

Modified: doc/trunk/reference/it-IT/beans.po
===================================================================
--- doc/trunk/reference/it-IT/beans.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/beans.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-24 16:04+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: beans.xml:4
 #, no-c-format
 msgid "More about beans"
 msgstr "Ulteriori informazioni sui bean"
 
 #. Tag: para
-#: beans.xml:6
 #, no-c-format
 msgid ""
 "A bean is usually an application class that contains business logic. It may "
@@ -32,7 +30,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:13
 #, no-c-format
 msgid ""
 "Let's back up a second. What does it really mean to be <emphasis>contextual</"
@@ -45,7 +42,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:21
 #, no-c-format
 msgid ""
 "However, like a stateless or singleton model, but <emphasis>unlike</"
@@ -55,19 +51,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:29
 #, no-c-format
 msgid "the lifecycle of each instance of the bean and"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:32
 #, no-c-format
 msgid "which clients share a reference to a particular instance of the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:36
 #, no-c-format
 msgid ""
 "For a given thread in a CDI application, there may be an <emphasis>active "
@@ -78,7 +71,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:43
 #, no-c-format
 msgid ""
 "Clients (for example, other beans) executing in the same context will see "
@@ -87,7 +79,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:49
 #, no-c-format
 msgid ""
 "One great advantage of the contextual model is that it allows stateful beans "
@@ -99,46 +90,39 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:58
 #, no-c-format
 msgid "they interact via well-defined public APIs"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:61
 #, no-c-format
 msgid "their lifecycles are completely decoupled"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:65
 #, no-c-format
 msgid ""
 "We can replace one bean with another different bean that implements the same "
 "interface and has a different lifecycle (a different scope) without "
 "affecting the other bean implementation. In fact, CDI defines a simple "
 "facility for overriding bean implementations at deployment time, as we will "
-"see in <xref linkend=\"alternatives\"/>."
+"see in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:71
 #, no-c-format
 msgid ""
 "Note that not all clients of a bean are beans themselves. Other objects such "
-"as servlets or message-driven beans&#8212;which are by nature not "
-"injectable, contextual objects&#8212;may also obtain references to beans by "
-"injection."
+"as servlets or message-driven beans—which are by nature not injectable, "
+"contextual objects—may also obtain references to beans by injection."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:78
 #, no-c-format
 msgid "The anatomy of a bean"
 msgstr "Anatomia di un bean"
 
 #. Tag: para
-#: beans.xml:80
 #, no-c-format
 msgid ""
 "Enough hand-waving. More formally, the anatomy of a bean, according to the "
@@ -146,67 +130,56 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:84
 #, no-c-format
 msgid "A bean comprises the following attributes:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:87
 #, no-c-format
 msgid "A (nonempty) set of bean types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:88
 #, no-c-format
 msgid "A (nonempty) set of qualifiers"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:89
 #, no-c-format
 msgid "A scope"
 msgstr "Uno scope"
 
 #. Tag: para
-#: beans.xml:90
 #, no-c-format
 msgid "Optionally, a bean EL name"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:91
 #, no-c-format
 msgid "A set of interceptor bindings"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:92
 #, no-c-format
 msgid "A bean implementation"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:95
 #, no-c-format
 msgid "Furthermore, a bean may or may not be an alternative."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:99
 #, no-c-format
 msgid "Let's see what all this new terminology means."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:102
 #, no-c-format
 msgid "Bean types, qualifiers and dependency injection"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:104
 #, no-c-format
 msgid ""
 "Beans usually acquire references to other beans via dependency injection. "
@@ -215,19 +188,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:110
 #, no-c-format
 msgid "a bean type, together with"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:111
 #, no-c-format
 msgid "a set of qualifiers."
 msgstr "un set di qualificatori."
 
 #. Tag: para
-#: beans.xml:114
 #, no-c-format
 msgid ""
 "A bean type is a user-defined class or interface; a type that is client-"
@@ -237,24 +207,7 @@
 "types:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:120
-#, no-c-format
-msgid ""
-"<![CDATA[public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-
 #. Tag: para
-#: beans.xml:122
 #, no-c-format
 msgid ""
 "The bean types are <literal>BookShop</literal>, <literal>Business</literal> "
@@ -264,7 +217,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:128
 #, no-c-format
 msgid ""
 "Meanwhile, this session bean has only the local interfaces "
@@ -273,35 +225,17 @@
 "<literal>BookShopBean</literal> is not a client-visible type."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"public class BookShopBean \n"
-"      extends Business \n"
-"      implements BookShop, Auditable {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateful\n"
-"public class BookShopBean \n"
-"      extends Business \n"
-"      implements BookShop, Auditable {\n"
-"   ...\n"
-"}]]>"
-
 #. Tag: para
-#: beans.xml:137
 #, no-c-format
 msgid ""
-"Most bean types you can probably figure out. One gotcha is primitive types. "
-"All primitive types are assumed to be identical to their corresponding "
-"wrapper types in <literal>java.lang</literal>."
+"The bean types of a session bean include local interfaces and the bean class "
+"local view (if any). EJB remote interfaces are not considered bean types of "
+"a session bean. You can't inject an EJB using its remote interface unless "
+"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
+"linkend=\"resources\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:143
 #, no-c-format
 msgid ""
 "Bean types may be restricted to an explicit set by annotating the bean with "
@@ -311,26 +245,7 @@
 "<literal>java.lang.Object</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:149
-#, no-c-format
-msgid ""
-"<![CDATA[@Typed(Shop.class)\n"
-"public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Typed(Shop.class)\n"
-"public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-
 #. Tag: para
-#: beans.xml:151
 #, no-c-format
 msgid ""
 "Sometimes, a bean type alone does not provide enough information for the "
@@ -345,7 +260,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:160
 #, no-c-format
 msgid ""
 "A qualifier is a user-defined annotation that is itself annotated "
@@ -354,22 +268,7 @@
 "string-based names. Here's an example of a qualifier annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:166
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface CreditCard {}]]>"
-msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface CreditCard {}]]>"
-
 #. Tag: para
-#: beans.xml:168
 #, no-c-format
 msgid ""
 "You may not be used to seeing the definition of an annotation. In fact, this "
@@ -379,7 +278,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:175
 #, no-c-format
 msgid ""
 "Pay attention to the names of the built-in annotations in CDI and EJB. "
@@ -389,7 +287,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:182
 #, no-c-format
 msgid ""
 "Now that we have defined a qualifier annotation, we can use it to "
@@ -398,14 +295,7 @@
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:188
-#, no-c-format
-msgid "<![CDATA[@Inject @CreditCard PaymentProcessor paymentProcessor]]>"
-msgstr "<![CDATA[@Inject @CreditCard PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: beans.xml:191
 #, no-c-format
 msgid ""
 "If an injection point does not explicitly specify a qualifier, it has the "
@@ -413,7 +303,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:197
 #, no-c-format
 msgid ""
 "For each injection point, the container searches for a bean which satisfies "
@@ -423,7 +312,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:203
 #, no-c-format
 msgid ""
 "How do we specify that qualifiers of a bean? By annotating the bean class, "
@@ -432,20 +320,7 @@
 "Therefore, it satisfies our qualified injection point:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:209
-#, no-c-format
-msgid ""
-"<![CDATA[@CreditCard\n"
-"public class CreditCardPaymentProcessor \n"
-"    implements PaymentProcessor { ... }]]>"
-msgstr ""
-"<![CDATA[@CreditCard\n"
-"public class CreditCardPaymentProcessor \n"
-"    implements PaymentProcessor { ... }]]>"
-
 #. Tag: para
-#: beans.xml:212
 #, no-c-format
 msgid ""
 "If a bean does not explicitly specify a qualifier, it has the default "
@@ -453,23 +328,20 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:225
 #, no-c-format
 msgid ""
 "That's not quite the end of the story. CDI also defines a simple "
 "<emphasis>resolution rule</emphasis> that helps the container decide what to "
 "do if there is more than one bean that satisfies a particular contract. "
-"We'll get into the details in <xref linkend=\"injection\"/>."
+"We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:245
 #, no-c-format
 msgid "Scope"
 msgstr "Scope"
 
 #. Tag: para
-#: beans.xml:248
 #, no-c-format
 msgid ""
 "The <emphasis>scope</emphasis> of a bean defines the lifecycle and "
@@ -480,25 +352,13 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:255
 #, no-c-format
 msgid ""
 "For example, any web application may have <emphasis>session scoped</"
 "emphasis> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:259
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-"<![CDATA[public @SessionScoped\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-
 #. Tag: para
-#: beans.xml:261
 #, no-c-format
 msgid ""
 "An instance of a session-scoped bean is bound to a user session and is "
@@ -506,7 +366,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:265
 #, no-c-format
 msgid ""
 "Keep in mind that once a bean is bound to a context, it remains in that "
@@ -517,7 +376,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:273
 #, no-c-format
 msgid ""
 "If a scope is not explicitly specified, then the bean belongs to a special "
@@ -527,19 +385,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:279
 #, no-c-format
-msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\"/>."
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:284
 #, no-c-format
 msgid "EL name"
 msgstr "Nome EL"
 
 #. Tag: para
-#: beans.xml:286
 #, no-c-format
 msgid ""
 "If you want to reference a bean in non-Java code that supports Unified EL "
@@ -548,43 +403,18 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:291
 #, no-c-format
 msgid ""
 "The EL name is specified using the <literal>@Named</literal> annotation, as "
 "shown here:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:295
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named(\"cart\")\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-"<![CDATA[public @SessionScoped @Named(\"cart\")\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-
 #. Tag: para
-#: beans.xml:297
 #, no-c-format
 msgid "Now we can easily use the bean in any JSF or JSP page:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:299
-#, no-c-format
-msgid ""
-"<![CDATA[<h:dataTable value=\"#{cart.lineItems}\" var=\"item\">\n"
-"   ...\n"
-"</h:dataTable>]]>"
-msgstr ""
-"<![CDATA[<h:dataTable value=\"#{cart.lineItems}\" var=\"item\">\n"
-"   ...\n"
-"</h:dataTable>]]>"
-
 #. Tag: para
-#: beans.xml:302
 #, no-c-format
 msgid ""
 "The <literal>@Named</literal> annotation is not what makes the class a bean. "
@@ -594,25 +424,13 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:309
 #, no-c-format
 msgid ""
 "We can let CDI choose a name for us by leaving off the value of the "
 "<literal>@Named</literal> annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:313
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-"<![CDATA[public @SessionScoped @Named\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-
 #. Tag: para
-#: beans.xml:315
 #, no-c-format
 msgid ""
 "The name defaults to the unqualified class name, decapitalized; in this "
@@ -620,13 +438,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:325
 #, no-c-format
 msgid "Alternatives"
 msgstr "Alternative"
 
 #. Tag: para
-#: beans.xml:327
 #, no-c-format
 msgid ""
 "We've already seen how qualifiers let us choose between multiple "
@@ -638,44 +454,30 @@
 "literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:335
-#, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class MockPaymentProcessor extends PaymentProcessorImpl { ... }]]>"
-msgstr ""
-"<![CDATA[public @Alternative\n"
-"class MockPaymentProcessor extends PaymentProcessorImpl { ... }]]>"
-
 #. Tag: para
-#: beans.xml:337
 #, no-c-format
 msgid ""
 "We normally annotate a bean <literal>@Alternative</literal> only when there "
 "is some other implementation of an interface it implements (or of any of its "
 "bean types). We can choose between alternatives at deployment time by "
 "<emphasis>selecting</emphasis> an alternative in the CDI deployment "
-"descriptor <literal>META-INF/beans.xml</literal> of the JAR or Java EE "
+"descriptor <literal>META-INF/beans.xml</literal> of the jar or Java EE "
 "module that uses it. Different modules can specify that they use different "
 "alternatives."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:345
 #, no-c-format
 msgid ""
-"We cover alternatives in more detail in <xref linkend=\"alternatives\"/>."
+"We cover alternatives in more detail in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:352
 #, no-c-format
 msgid "Interceptor binding types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:354
 #, no-c-format
 msgid ""
 "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, "
@@ -686,7 +488,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:361
 #, no-c-format
 msgid ""
 "The way that interceptors were defined in Java EE 5 was counter-intuitive. "
@@ -703,7 +504,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:372
 #, no-c-format
 msgid ""
 "CDI provides a new approach to binding interceptors to beans that introduces "
@@ -713,7 +513,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:378
 #, no-c-format
 msgid ""
 "An interceptor binding type is a user-defined annotation that is itself "
@@ -722,60 +521,21 @@
 "two classes."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:383
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Inherited\n"
-"@Target( { TYPE, METHOD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBinding\n"
-"@Inherited\n"
-"@Target( { TYPE, METHOD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-
 #. Tag: para
-#: beans.xml:385
 #, no-c-format
 msgid ""
 "The interceptor that implements transaction management declares this "
 "annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[public @Transactional @Interceptor\n"
-"class TransactionInterceptor { ... }]]>"
-msgstr ""
-"<![CDATA[public @Transactional @Interceptor\n"
-"class TransactionInterceptor { ... }]]>"
-
 #. Tag: para
-#: beans.xml:391
 #, no-c-format
 msgid ""
 "We can apply the interceptor to a bean by annotating the bean class with the "
 "same interceptor binding type:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:395
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Transactional\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-"<![CDATA[public @SessionScoped @Transactional\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-
 #. Tag: para
-#: beans.xml:397
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
@@ -784,32 +544,28 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:402
 #, no-c-format
 msgid ""
 "Interceptors are deployment-specific. (We don't need a "
 "<literal>TransactionInterceptor</literal> in our unit tests!) By default, an "
 "interceptor is disabled. We can enable an interceptor using the CDI "
-"deployment descriptor <literal>META-INF/beans.xml</literal> of the JAR or "
+"deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or "
 "Java EE module. This is also where we specify the interceptor ordering."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:409
 #, no-c-format
 msgid ""
 "We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
-"\"interceptors\"/> and <xref linkend=\"decorators\"/>."
+"\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:419
 #, no-c-format
 msgid "What kinds of classes are beans?"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:421
 #, no-c-format
 msgid ""
 "We've already seen two types of beans: JavaBeans and EJB session beans. Is "
@@ -818,13 +574,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:428
 #, no-c-format
 msgid "Managed beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:430
 #, no-c-format
 msgid ""
 "A managed bean is a Java class. The basic lifecycle and semantics of a "
@@ -836,19 +590,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:441
 #, no-c-format
 msgid "It is not a non-static inner class."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:444
 #, no-c-format
 msgid "It is a concrete class, or is annotated <literal>@Decorator</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:447
 #, no-c-format
 msgid ""
 "It is not annotated with an EJB component-defining annotation or declared as "
@@ -856,7 +607,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:453
 #, no-c-format
 msgid ""
 "It does not implement <literal>javax.enterprise.inject.spi.Extension</"
@@ -864,34 +614,41 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:456
 #, no-c-format
-msgid "It has an appropriate constructor&#8212;either:"
+msgid "It has an appropriate constructor—either:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:461
 #, no-c-format
 msgid "the class has a constructor with no parameters, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:464
 #, no-c-format
 msgid "the class declares a constructor annotated <literal>@Inject</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:472
 #, no-c-format
 msgid ""
+"According to this definition, JPA entities are technically managed beans. "
+"However, entities have their own special lifecycle, state and identity model "
+"and are usually instantiated by JPA or using <literal>new</literal>. "
+"Therefore we don't recommend directly injecting an entity class. We "
+"especially recommend against assigning a scope other than "
+"<literal>@Dependent</literal> to an entity class, since JPA is not able to "
+"persist injected CDI proxies."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The unrestricted set of bean types for a managed bean contains the bean "
 "class, every superclass and all interfaces it implements directly or "
 "indirectly."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:475
 #, no-c-format
 msgid ""
 "If a managed bean has a public field, it must have the default scope "
@@ -899,7 +656,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:477
 #, no-c-format
 msgid ""
 "Managed beans support the <literal>@PostConstruct</literal> and "
@@ -907,7 +663,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:480
 #, no-c-format
 msgid ""
 "Session beans are also, technically, managed beans. However, since they have "
@@ -917,13 +672,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:489
 #, no-c-format
 msgid "Session beans"
 msgstr "Session bean"
 
 #. Tag: para
-#: beans.xml:491
 #, no-c-format
 msgid ""
 "Session beans belong to the EJB specification. They have a special "
@@ -936,7 +689,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:500
 #, no-c-format
 msgid ""
 "Message-driven and entity beans are by nature non-contextual objects and may "
@@ -948,7 +700,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:508
 #, no-c-format
 msgid ""
 "The unrestricted set of bean types for a session bean contains all local "
@@ -960,7 +711,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:516
 #, no-c-format
 msgid ""
 "There's no reason to explicitly declare the scope of a stateless session "
@@ -971,20 +721,18 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:520
 #, no-c-format
 msgid ""
 "Stateful session beans may define a <emphasis>remove method</emphasis>, "
 "annotated <literal>@Remove</literal>, that is used by the application to "
 "indicate that an instance should be destroyed. However, for a contextual "
-"instance of the bean&#8212;an instance under the control of CDI&#8212;this "
-"method may only be called by the application if the bean has scope "
-"<literal>@Dependent</literal>. For beans with other scopes, the application "
-"must let the container destroy the bean."
+"instance of the bean—an instance under the control of CDI—this method may "
+"only be called by the application if the bean has scope <literal>@Dependent</"
+"literal>. For beans with other scopes, the application must let the "
+"container destroy the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:528
 #, no-c-format
 msgid ""
 "So, when should we use a session bean instead of a plain managed bean? "
@@ -992,19 +740,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:535
 #, no-c-format
 msgid "method-level transaction management and security,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:538
 #, no-c-format
 msgid "concurrency management,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:541
 #, no-c-format
 msgid ""
 "instance-level passivation for stateful session beans and instance-pooling "
@@ -1012,19 +757,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:545
 #, no-c-format
 msgid "remote or web service invocation, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:548
 #, no-c-format
 msgid "timers and asynchronous methods,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:552
 #, no-c-format
 msgid ""
 "When we don't need any of these things, an ordinary managed bean will serve "
@@ -1032,7 +774,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:554
 #, no-c-format
 msgid ""
 "Many beans (including any <literal>@SessionScoped</literal> or "
@@ -1042,7 +783,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:560
 #, no-c-format
 msgid ""
 "Beans which hold references to heavy-weight resources, or hold a lot of "
@@ -1052,7 +792,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:566
 #, no-c-format
 msgid ""
 "Finally, it's usually obvious when method-level transaction management, "
@@ -1061,7 +800,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:571
 #, no-c-format
 msgid ""
 "The point we're trying to make is: use a session bean when you need the "
@@ -1074,7 +812,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:579
 #, no-c-format
 msgid ""
 "On the other hand, don't be scared to use session beans just because you've "
@@ -1087,13 +824,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:590
 #, no-c-format
 msgid "Producer methods"
 msgstr "Metodi produttori"
 
 #. Tag: para
-#: beans.xml:592
 #, no-c-format
 msgid ""
 "Not everything that needs to be injected can be boiled down to a bean class "
@@ -1105,7 +840,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:600
 #, no-c-format
 msgid ""
 "A <emphasis>producer method</emphasis> is a method that acts as a source of "
@@ -1116,74 +850,31 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:607
 #, no-c-format
 msgid ""
 "A producer method is declared by annotating a method of a bean class with "
 "the <literal>@Produces</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:612
-#, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class RandomNumberGenerator {\n"
-"   \n"
-"   private Random random = new Random(System.currentTimeMillis());\n"
-"       \n"
-"   @Produces @Named @Random int getRandomNumber() {\n"
-"      return random.nextInt(100);\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped\n"
-"public class RandomNumberGenerator {\n"
-"   \n"
-"   private Random random = new Random(System.currentTimeMillis());\n"
-"       \n"
-"   @Produces @Named @Random int getRandomNumber() {\n"
-"      return random.nextInt(100);\n"
-"   }\n"
-"   \n"
-"}]]>"
-
 #. Tag: para
-#: beans.xml:614
 #, no-c-format
 msgid ""
 "We can't write a bean class that is itself a random number. But we can "
 "certainly write a method that returns a random number. By making the method "
-"a producer method, we allow the return value of the method&#8212;in this "
-"case an <literal>Integer</literal>&#8212;to be injected. We can even specify "
-"a qualifier&#8212;in this case <literal>@Random</literal>, a scope&#8212;"
-"which in this case defaults to <literal>@Dependent</literal>, and an EL "
-"name&#8212;which in this case defaults to <literal>randomNumber</literal> "
-"according to the JavaBeans property name convention. Now we can get a random "
-"number anywhere:"
+"a producer method, we allow the return value of the method—in this case an "
+"<literal>Integer</literal>—to be injected. We can even specify a qualifier—"
+"in this case <literal>@Random</literal>, a scope—which in this case defaults "
+"to <literal>@Dependent</literal>, and an EL name—which in this case defaults "
+"to <literal>randomNumber</literal> according to the JavaBeans property name "
+"convention. Now we can get a random number anywhere:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:623
-#, no-c-format
-msgid "<![CDATA[@Inject @Random int randomNumber;]]>"
-msgstr "<![CDATA[@Inject @Random int randomNumber;]]>"
-
 #. Tag: para
-#: beans.xml:625
 #, no-c-format
 msgid "Even in a Unified EL expression:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:629
-#, no-c-format
-msgid "<![CDATA[<p>Your raffle number is #{randomNumber}.</p>]]>"
-msgstr "<![CDATA[<p>Your raffle number is #{randomNumber}.</p>]]>"
-
 #. Tag: para
-#: beans.xml:631
 #, no-c-format
 msgid ""
 "A producer method must be a non-abstract method of a managed bean class or "
@@ -1193,13 +884,11 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:637
 #, no-c-format
 msgid "The bean types of a producer method depend upon the method return type:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:643
 #, no-c-format
 msgid ""
 "If the return type is an interface, the unrestricted set of bean types "
@@ -1208,7 +897,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:649
 #, no-c-format
 msgid ""
 "If a return type is primitive or is a Java array type, the unrestricted set "
@@ -1217,7 +905,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:655
 #, no-c-format
 msgid ""
 "If the return type is a class, the unrestricted set of bean types contains "
@@ -1226,66 +913,43 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:662
 #, no-c-format
 msgid ""
-"If the producer method has method parameters, the container will look for a "
-"bean that satisfies the type and qualifiers of each parameter and pass it to "
-"the method automatically&#8212;another form of dependency injection."
+"Producer methods and fields may have a primitive bean type. For the purpose "
+"of resolving dependencies, primitive types are considered to be identical to "
+"their corresponding wrapper types in <literal>java.lang</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:668
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Produces Set<Roles> getRoles(User user) {\n"
-"   return user.getRoles();\n"
-"}]]>"
+"If the producer method has method parameters, the container will look for a "
+"bean that satisfies the type and qualifiers of each parameter and pass it to "
+"the method automatically—another form of dependency injection."
 msgstr ""
-"<![CDATA[@Produces Set<Roles> getRoles(User user) {\n"
-"   return user.getRoles();\n"
-"}]]>"
 
 #. Tag: para
-#: beans.xml:670
 #, no-c-format
 msgid ""
 "We'll talk much more about producer methods in <xref linkend="
-"\"producermethods\"/>."
+"\"producermethods\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:675
 #, no-c-format
 msgid "Producer fields"
 msgstr "Campi produttori"
 
 #. Tag: para
-#: beans.xml:677
 #, no-c-format
 msgid ""
 "A <emphasis>producer field</emphasis> is a simpler alternative to a producer "
 "method. A producer field is declared by annotating a field of a bean class "
-"with the <literal>@Produces</literal> annotation&#8212;the same annotation "
-"used for producer methods."
+"with the <literal>@Produces</literal> annotation—the same annotation used "
+"for producer methods."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:683
-#, no-c-format
-msgid ""
-"<![CDATA[public class Shop {\n"
-"   @Produces PaymentProcessor paymentProcessor = ....;\n"
-"   @Produces @Catalog List<Product> products = ....;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Shop {\n"
-"   @Produces PaymentProcessor paymentProcessor = ....;\n"
-"   @Produces @Catalog List<Product> products = ....;\n"
-"}]]>"
-
 #. Tag: para
-#: beans.xml:685
 #, no-c-format
 msgid ""
 "The rules for determining the bean types of a producer field parallel the "
@@ -1293,415 +957,199 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:689
 #, no-c-format
 msgid ""
 "A producer field is really just a shortcut that lets us avoid writing a "
 "useless getter method. However, in addition to convenience, producer fields "
 "serve a specific purpose as an adaptor for Java EE component environment "
 "injection, but to learn more about that, you'll have to wait until <xref "
-"linkend=\"resources\"/>. Because we can't wait to get to work on some "
+"linkend=\"resources\" />. Because we can't wait to get to work on some "
 "examples."
 msgstr ""
 
-#. Tag: title
-#: beans.xml:701
-#, no-c-format
-msgid "The (minimal) bean descriptor"
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[public class BookShop \n"
+#~ "      extends Business \n"
+#~ "      implements Shop<Book> {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class BookShop \n"
+#~ "      extends Business \n"
+#~ "      implements Shop<Book> {\n"
+#~ "   ...\n"
+#~ "}]]>"
 
-#. Tag: para
-#: beans.xml:703
-#, no-c-format
-msgid ""
-"First, it's important to understand that the XML bean descriptor in CDI "
-"(beans.xml) is not there to define beans in XML, like in other popular bean "
-"containers. Rather, you use this file to enable CDI services for the current "
-"bean archive that is difficult to define consistently in Java or which you "
-"don't want to define in Java (e.g., to accomodate testing)."
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[@Stateful\n"
+#~ "public class BookShopBean \n"
+#~ "      extends Business \n"
+#~ "      implements BookShop, Auditable {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateful\n"
+#~ "public class BookShopBean \n"
+#~ "      extends Business \n"
+#~ "      implements BookShop, Auditable {\n"
+#~ "   ...\n"
+#~ "}]]>"
 
-#. Tag: para
-#: beans.xml:710
-#, no-c-format
-msgid ""
-"For example, the XML is used to enable interceptors (which are disabled by "
-"default) and define interceptor ordering. So the bean descriptor "
-"<emphasis>complements</emphasis> the metadata that is provided in the Java "
-"language syntax. (You may still want to define beans in XML for other "
-"reasons, but that is the concern of an extension)."
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[@Typed(Shop.class)\n"
+#~ "public class BookShop \n"
+#~ "      extends Business \n"
+#~ "      implements Shop<Book> {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Typed(Shop.class)\n"
+#~ "public class BookShop \n"
+#~ "      extends Business \n"
+#~ "      implements Shop<Book> {\n"
+#~ "   ...\n"
+#~ "}]]>"
 
-#. Tag: para
-#: beans.xml:717
-#, no-c-format
-msgid ""
-"Let's first ask why the beans.xml is required, then look at what services it "
-"is used used to enable."
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface CreditCard {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface CreditCard {}]]>"
 
-#. Tag: title
-#: beans.xml:722
-#, no-c-format
-msgid "Why is beans.xml required?"
-msgstr ""
+#~ msgid "<![CDATA[@Inject @CreditCard PaymentProcessor paymentProcessor]]>"
+#~ msgstr "<![CDATA[@Inject @CreditCard PaymentProcessor paymentProcessor]]>"
 
-#. Tag: para
-#: beans.xml:724
-#, no-c-format
-msgid ""
-"You may be wondering, if beans are not described using XML, why do we need "
-"beans.xml at all, particularly if you don't have anything that you would "
-"need the bean descriptor to enable (alternatives, interceptors or "
-"decorators)?"
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[@CreditCard\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "    implements PaymentProcessor { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@CreditCard\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "    implements PaymentProcessor { ... }]]>"
 
-#. Tag: para
-#: beans.xml:730
-#, no-c-format
-msgid "There are two things about CDI that we need to keep in mind:"
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[public @SessionScoped\n"
+#~ "class ShoppingCart implements Serializable { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @SessionScoped\n"
+#~ "class ShoppingCart implements Serializable { ... }]]>"
 
-#. Tag: para
-#: beans.xml:736
-#, no-c-format
-msgid ""
-"CDI does not require any special declaration for a Java class to be injected "
-"- that's right, no annotation or XML declaration at all!"
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[public @SessionScoped @Named(\"cart\")\n"
+#~ "class ShoppingCart implements Serializable { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @SessionScoped @Named(\"cart\")\n"
+#~ "class ShoppingCart implements Serializable { ... }]]>"
 
-#. Tag: para
-#: beans.xml:742
-#, no-c-format
-msgid ""
-"CDI does not define any special kind of module - CDI beans can be deployed "
-"in a library JAR, EJB JAR, WAR, RAR, or JVM classpath directory."
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[<h:dataTable value=\"#{cart.lineItems}\" var=\"item\">\n"
+#~ "   ...\n"
+#~ "</h:dataTable>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<h:dataTable value=\"#{cart.lineItems}\" var=\"item\">\n"
+#~ "   ...\n"
+#~ "</h:dataTable>]]>"
 
-#. Tag: para
-#: beans.xml:749
-#, no-c-format
-msgid ""
-"The CDI specification calls the process of identifying beans in modules "
-"<emphasis>bean discovery</emphasis>."
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[public @SessionScoped @Named\n"
+#~ "class ShoppingCart implements Serializable { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @SessionScoped @Named\n"
+#~ "class ShoppingCart implements Serializable { ... }]]>"
 
-#. Tag: para
-#: beans.xml:753
-#, no-c-format
-msgid ""
-"So there are potentially a lot of classes in the classpath which might be "
-"beans! We don't want to force the container to scan every one of those "
-"classes at startup and build its internal metamodel for each of them. This "
-"really could make bean discovery very slow."
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class MockPaymentProcessor extends PaymentProcessorImpl { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class MockPaymentProcessor extends PaymentProcessorImpl { ... }]]>"
 
-#. Tag: para
-#: beans.xml:759
-#, no-c-format
-msgid ""
-"But there's another reason we need to give the user some control over which "
-"classes are available for injection. We don't want every class in the "
-"classpath to potentially match an injection point, including classes that "
-"were never intended to be injected into things. This would force the "
-"developer to have to use qualifiers much more often to disambiguate "
-"injection points."
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Inherited\n"
+#~ "@Target( { TYPE, METHOD })\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Inherited\n"
+#~ "@Target( { TYPE, METHOD })\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
 
-#. Tag: para
-#: beans.xml:766
-#, no-c-format
-msgid "So we have two choices. We could have the developer:"
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[public @Transactional @Interceptor\n"
+#~ "class TransactionInterceptor { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @Transactional @Interceptor\n"
+#~ "class TransactionInterceptor { ... }]]>"
 
-#. Tag: para
-#: beans.xml:772
-#, no-c-format
-msgid "explicitly exclude modules which do not contain beans, or"
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[public @SessionScoped @Transactional\n"
+#~ "class ShoppingCart implements Serializable { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @SessionScoped @Transactional\n"
+#~ "class ShoppingCart implements Serializable { ... }]]>"
 
-#. Tag: para
-#: beans.xml:775
-#, no-c-format
-msgid "explicitly declare modules which do contain beans."
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped\n"
+#~ "public class RandomNumberGenerator {\n"
+#~ "   \n"
+#~ "   private Random random = new Random(System.currentTimeMillis());\n"
+#~ "       \n"
+#~ "   @Produces @Named @Random int getRandomNumber() {\n"
+#~ "      return random.nextInt(100);\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped\n"
+#~ "public class RandomNumberGenerator {\n"
+#~ "   \n"
+#~ "   private Random random = new Random(System.currentTimeMillis());\n"
+#~ "       \n"
+#~ "   @Produces @Named @Random int getRandomNumber() {\n"
+#~ "      return random.nextInt(100);\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "}]]>"
 
-#. Tag: para
-#: beans.xml:779
-#, no-c-format
-msgid ""
-"It should be clear that the second option is a much better way to go. Thus, "
-"CDI has the notion of a bean archive. A bean archive is just a module that "
-"has a file named beans.xml in the META-INF directory. The container looks "
-"for beans in bean archives. It ignores other modules."
-msgstr ""
+#~ msgid "<![CDATA[@Inject @Random int randomNumber;]]>"
+#~ msgstr "<![CDATA[@Inject @Random int randomNumber;]]>"
 
-#. Tag: para
-#: beans.xml:785
-#, no-c-format
-msgid ""
-"Now, you might be wondering if we've got the granularity wrong here. Why "
-"should module be the right criteria to use for including/excluding a class. "
-"Why not consider:"
-msgstr ""
+#~ msgid "<![CDATA[<p>Your raffle number is #{randomNumber}.</p>]]>"
+#~ msgstr "<![CDATA[<p>Your raffle number is #{randomNumber}.</p>]]>"
 
-#. Tag: para
-#: beans.xml:792
-#, no-c-format
-msgid "a class-level annotation,"
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[@Produces Set<Roles> getRoles(User user) {\n"
+#~ "   return user.getRoles();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces Set<Roles> getRoles(User user) {\n"
+#~ "   return user.getRoles();\n"
+#~ "}]]>"
 
-#. Tag: para
-#: beans.xml:795
-#, no-c-format
-msgid "the package,"
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[public class Shop {\n"
+#~ "   @Produces PaymentProcessor paymentProcessor = ....;\n"
+#~ "   @Produces @Catalog List<Product> products = ....;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Shop {\n"
+#~ "   @Produces PaymentProcessor paymentProcessor = ....;\n"
+#~ "   @Produces @Catalog List<Product> products = ....;\n"
+#~ "}]]>"
 
-#. Tag: para
-#: beans.xml:798
-#, no-c-format
-msgid "some type it implements or extends, or"
-msgstr ""
+#, fuzzy
+#~ msgid "alternatives"
+#~ msgstr "Alternative"
 
-#. Tag: para
-#: beans.xml:801
-#, no-c-format
-msgid "some naming convention."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:805
-#, no-c-format
-msgid ""
-"We've got the first option covered. Annotate a bean <literal>@Alternative</"
-"literal>, or with an alternative stereotype, and it will be considered "
-"disabled by CDI, as long as you don't explicitly enable it in beans.xml. "
-"That's not quite the same thing as excluding the class from scanning "
-"altogether, but it's close. (One difference is that a portable extension "
-"with still get a <literal>ProcessAnnotatedType</literal> event for that "
-"class)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:813
-#, no-c-format
-msgid ""
-"A future version of CDI might allow you to declare excluded packages in "
-"beans.xml. Excluding a bean by type or naming convention isn't really that "
-"appealing. In the world of CDI, we use stereotypes for identifying "
-"architectural roles. We don't use marker interfaces or naming conventions. "
-"Names really shouldn't affect functionality as it is too fragile."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:820
-#, no-c-format
-msgid "Enough theory, what elements are available in beans.xml?"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:826
-#, no-c-format
-msgid "Bean descriptor schema"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:828
-#, no-c-format
-msgid ""
-"If you don't need to activate any interceptors, decorators or alternatives "
-"(you just have plain beans that you need to use in an archive), the beans."
-"xml file can be <emphasis>empty</emphasis>. If you do have one of these "
-"requirements, then you need to start popularing the descriptor."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:834
-#, no-c-format
-msgid ""
-"The root element of a beans.xml file is <literal>beans</literal>, with the "
-"following <ulink url=\"http://anonsvn.jboss.org/repos/weld/api/trunk/cdi/src/"
-"main/resources/beans.xsd\">schema</ulink>:"
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:839
-#, no-c-format
-msgid ""
-"<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<beans xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee \n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"</beans>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:841
-#, no-c-format
-msgid ""
-"The <literal>beans</literal> element can have one or more of each of the "
-"following children:"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:847
-#, no-c-format
-msgid "interceptors"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:850
-#, no-c-format
-msgid "decorators"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:853
-#, fuzzy, no-c-format
-msgid "alternatives"
-msgstr "Alternative"
-
-#. Tag: para
-#: beans.xml:857
-#, no-c-format
-msgid "Let's look at each element in detail."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:862
-#, no-c-format
-msgid "&lt;interceptors&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:864
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled interceptors bound via interceptor "
-"bindings. An interceptor must be explicitly enabled by listing the fully "
-"qualified class name in a child &lt;class&gt; element of &lt;"
-"interceptors&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:870
-#, no-c-format
-msgid ""
-"There may be zero or more interceptor class elements. The order of the class "
-"declarations determines the interceptor ordering. Interceptors which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an interceptor "
-"class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:877
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.intercept.SecurityInterceptor</class>\n"
-"   <class>com.acme.intercept.TransactionInterceptor</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:883
-#, no-c-format
-msgid "&lt;decorators&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:885
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled decorators. A decorator must be "
-"explicitly enabled by listing the fully qualified class name in a child &lt;"
-"class&gt; element of &lt;decorators&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:891
-#, no-c-format
-msgid ""
-"There may be zero or more decorator class elements. The order of the class "
-"declarations determines the decorator ordering. Decorators which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an decorator class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:898
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.decorate.BigAccountDecorator</class>\n"
-"   <class>com.acme.decorate.SpecialGiftDecorator</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:903
-#, fuzzy, no-c-format
-msgid "&lt;alternatives&gt;"
-msgstr "Alternative"
-
-#. Tag: para
-#: beans.xml:905
-#, no-c-format
-msgid ""
-"An alternative is a bean that must be explicitly declared in the beans.xml "
-"file if it should be available for lookup, injection or EL resolution. By "
-"default, a bean archive has no active alternatives. An alternative must be "
-"explicitly declared using the fully qualified bean class name or stereotype "
-"class name in either a child &lt;class&gt; or &lt;stereotype&gt; element of "
-"&lt;alternatives&gt;, respectively."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:913
-#, no-c-format
-msgid ""
-"An alternative is selected for the bean archive if either: the alternative "
-"is a managed bean or session bean and the bean class of the bean is listed, "
-"or the alternative is a producer method, field or resource, and the bean "
-"class that declares the method or field is listed, or any "
-"<literal>@Alternative</literal> stereotype of the alternative is listed."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:920
-#, no-c-format
-msgid ""
-"There may be zero or more alternative bean class elements. The same class "
-"may not be listed twice. And of course, the class must exist and it must be "
-"an alternative bean class."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:925
-#, no-c-format
-msgid ""
-"There may also be zero or more <literal>@Alternative</literal> stereotype "
-"elements. The same stereotype may not be listed twice. And of course, the "
-"stereotype class must exist and it must be an stereotype annotation."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:931
-#, no-c-format
-msgid ""
-"<![CDATA[<stereotypes>\n"
-"   <class>com.acme.business.MockPaymentProcessor</class>\n"
-"   <stereotype>com.acme.stereotype.Mock</stereotype>\n"
-"</stereotypes>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:935
-#, no-c-format
-msgid ""
-"And that's it! A very simple schema, used only to activate and order CDI "
-"services."
-msgstr ""
+#, fuzzy
+#~ msgid "&lt;alternatives&gt;"
+#~ msgstr "Alternative"

Modified: doc/trunk/reference/it-IT/decorators.po
===================================================================
--- doc/trunk/reference/it-IT/decorators.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/decorators.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-23 21:13+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,316 +14,361 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: decorators.xml:5
 #, no-c-format
 msgid "Decorators"
 msgstr "Decoratori"
 
 #. Tag: para
-#: decorators.xml:7
 #, fuzzy, no-c-format
-msgid "Interceptors are a powerful way to capture and separate concerns which are <emphasis>orthogonal</emphasis> to the application (and type system). Any interceptor is able to intercept invocations of any Java type. This makes them perfect for solving technical concerns such as transaction management, security and call logging. However, by nature, interceptors are unaware of the actual semantics of the events they intercept. Thus, interceptors aren't an appropriate tool for separating business-related concerns."
-msgstr "Gli interceptor sono un potente modo per catturare e separare i concern (N.d.T. un concern è un particolare concetto o area di interesse) che sono <emphasis>ortogonali</emphasis> al sistema tipo. Qualsiasi interceptor è capace di intercettare le invocazioni di qualsiasi tipo Java. Questo li rende perfetti per risolvere concern tecnici quali gestione delle transazioni e la sicurezza. Comunque, per natura, gli interceptor non sono consapevoli dell'attuale semantica degli eventi che intercettano. Quindi gli interceptor non sono il giusto strumento per separare i concern di tipo business."
+msgid ""
+"Interceptors are a powerful way to capture and separate concerns which are "
+"<emphasis>orthogonal</emphasis> to the application (and type system). Any "
+"interceptor is able to intercept invocations of any Java type. This makes "
+"them perfect for solving technical concerns such as transaction management, "
+"security and call logging. However, by nature, interceptors are unaware of "
+"the actual semantics of the events they intercept. Thus, interceptors aren't "
+"an appropriate tool for separating business-related concerns."
+msgstr ""
+"Gli interceptor sono un potente modo per catturare e separare i concern (N.d."
+"T. un concern è un particolare concetto o area di interesse) che sono "
+"<emphasis>ortogonali</emphasis> al sistema tipo. Qualsiasi interceptor è "
+"capace di intercettare le invocazioni di qualsiasi tipo Java. Questo li "
+"rende perfetti per risolvere concern tecnici quali gestione delle "
+"transazioni e la sicurezza. Comunque, per natura, gli interceptor non sono "
+"consapevoli dell'attuale semantica degli eventi che intercettano. Quindi gli "
+"interceptor non sono il giusto strumento per separare i concern di tipo "
+"business."
 
 # ...concerns that cut across many disparate types = ?
 #. Tag: para
-#: decorators.xml:15
 #, fuzzy, no-c-format
-msgid "The reverse is true of <emphasis>decorators</emphasis>. A decorator intercepts invocations only for a certain Java interface, and is therefore aware of all the semantics attached to that interface. Since decorators directly implement operations with business semantics, it makes them the perfect tool for modeling some kinds of business concerns. It also means that a decorator doesn't have the generality of an interceptor. Decorators aren't able to solve technical concerns that cut across many disparate types. Interceptors and decorators, though similar in many ways, are complementary. Let's look at some cases where decorators fit the bill."
-msgstr "Il contrario è vero per i <emphasis>decoratori</emphasis>. Un decoratore intercetta le invocazioni solamente per una certa interfaccia Java, e quindi è consapevole della semantica legata a questa. Ciò rende i decoratori uno strumento perfetto per modellare alcuni tipi di concern di business. E significa pure che un decoratore non ha la generalità di un interceptor. I decoratori non sono capaci di risolvere i concern tecnici che agiscono per diversi tipi."
+msgid ""
+"The reverse is true of <emphasis>decorators</emphasis>. A decorator "
+"intercepts invocations only for a certain Java interface, and is therefore "
+"aware of all the semantics attached to that interface. Since decorators "
+"directly implement operations with business semantics, it makes them the "
+"perfect tool for modeling some kinds of business concerns. It also means "
+"that a decorator doesn't have the generality of an interceptor. Decorators "
+"aren't able to solve technical concerns that cut across many disparate "
+"types. Interceptors and decorators, though similar in many ways, are "
+"complementary. Let's look at some cases where decorators fit the bill."
+msgstr ""
+"Il contrario è vero per i <emphasis>decoratori</emphasis>. Un decoratore "
+"intercetta le invocazioni solamente per una certa interfaccia Java, e quindi "
+"è consapevole della semantica legata a questa. Ciò rende i decoratori uno "
+"strumento perfetto per modellare alcuni tipi di concern di business. E "
+"significa pure che un decoratore non ha la generalità di un interceptor. I "
+"decoratori non sono capaci di risolvere i concern tecnici che agiscono per "
+"diversi tipi."
 
 #. Tag: para
-#: decorators.xml:24
 #, no-c-format
 msgid "Suppose we have an interface that represents accounts:"
 msgstr "Supponiamo di avere un'interfaccia che rappresenti degli account:"
 
-#. Tag: programlisting
-#: decorators.xml:26
-#, no-c-format
+#. Tag: para
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[public interface Account {\n"
-"   public BigDecimal getBalance();\n"
-"   public User getOwner();\n"
-"   public void withdraw(BigDecimal amount);\n"
-"   public void deposit(BigDecimal amount);\n"
-"}]]>"
+"Several different beans in our system implement the <literal>Account</"
+"literal> interface. However, we have a common legal requirement that; for "
+"any kind of account, large transactions must be recorded by the system in a "
+"special log. This is a perfect job for a decorator."
 msgstr ""
-"<![CDATA[public interface Account {\n"
-"   public BigDecimal getBalance();\n"
-"   public User getOwner();\n"
-"   public void withdraw(BigDecimal amount);\n"
-"   public void deposit(BigDecimal amount);\n"
-"}]]>"
+"Parecchi Web Beans del nostro sistema implementano l'interfaccia "
+"<literal>Account</literal>. Abbiamo come comune requisito legale, per ogni "
+"tipo di account, che le transazioni lunghe vengano registrate dal sistema in "
+"uno speciale log. Questo è un lavoro perfetto per un decoratore."
 
 #. Tag: para
-#: decorators.xml:28
 #, fuzzy, no-c-format
-msgid "Several different beans in our system implement the <literal>Account</literal> interface. However, we have a common legal requirement that; for any kind of account, large transactions must be recorded by the system in a special log. This is a perfect job for a decorator."
-msgstr "Parecchi Web Beans del nostro sistema implementano l'interfaccia <literal>Account</literal>. Abbiamo come comune requisito legale, per ogni tipo di account, che le transazioni lunghe vengano registrate dal sistema in uno speciale log. Questo è un lavoro perfetto per un decoratore."
-
-#. Tag: para
-#: decorators.xml:34
-#, fuzzy, no-c-format
-msgid "A decorator is a bean (possibly even an abstract class) that implements the type it decorates and is annotated <literal>@Decorator</literal>."
-msgstr "Un decorator è un semplice Web Beans che implementa il tipo che decora ed è annotato con <literal>@Decorator</literal>.\""
-
-#. Tag: programlisting
-#: decorators.xml:39
-#, no-c-format
 msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   ...\n"
-"}]]>"
+"A decorator is a bean (possibly even an abstract class) that implements the "
+"type it decorates and is annotated <literal>@Decorator</literal>."
 msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   ...\n"
-"}]]>"
+"Un decorator è un semplice Web Beans che implementa il tipo che decora ed è "
+"annotato con <literal>@Decorator</literal>.\""
 
 #. Tag: para
-#: decorators.xml:41
 #, no-c-format
-msgid "The decorator implements the methods of the decorated type that it wants to intercept."
-msgstr ""
-
-#. Tag: programlisting
-#: decorators.xml:45
-#, no-c-format
 msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      ...\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      ...\n"
-"   }\n"
-"}]]>"
+"The decorator implements the methods of the decorated type that it wants to "
+"intercept."
 msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      ...\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      ...\n"
-"   }\n"
-"}]]>"
 
 #. Tag: para
-#: decorators.xml:47
 #, fuzzy, no-c-format
-msgid "Unlike other beans, a decorator may be an abstract class. Therefore, if there's nothing special the decorator needs to do for a particular method of the decorated interface, you don't need to implement that method."
-msgstr "Diversamente dai semplici Web Beans, un decoratore può essere una classe astratta. Se un decoratore non ha niente da fare per un particolare metodo, allora non occorre implementare quel metodo."
+msgid ""
+"Unlike other beans, a decorator may be an abstract class. Therefore, if "
+"there's nothing special the decorator needs to do for a particular method of "
+"the decorated interface, you don't need to implement that method."
+msgstr ""
+"Diversamente dai semplici Web Beans, un decoratore può essere una classe "
+"astratta. Se un decoratore non ha niente da fare per un particolare metodo, "
+"allora non occorre implementare quel metodo."
 
 #. Tag: para
-#: decorators.xml:52
 #, fuzzy, no-c-format
-msgid "Interceptors for a method are called before decorators that apply to the method."
-msgstr "Gli interceptor per un metodo sono chiamati prima dei decoratori che vengono applicati a tali metodo."
+msgid ""
+"Interceptors for a method are called before decorators that apply to the "
+"method."
+msgstr ""
+"Gli interceptor per un metodo sono chiamati prima dei decoratori che vengono "
+"applicati a tali metodo."
 
 #. Tag: title
-#: decorators.xml:57
 #, no-c-format
 msgid "Delegate object"
 msgstr "Oggetto delegate"
 
 #. Tag: para
-#: decorators.xml:59
 #, no-c-format
-msgid "Decorators have a special injection point, called the <emphasis>delegate injection point</emphasis>, with the same type as the beans they decorate, and the annotation <literal>@Delegate</literal>. There must be exactly one delegate injection point, which can be a constructor parameter, initializer method parameter or injected field."
-msgstr ""
-
-#. Tag: programlisting
-#: decorators.xml:65
-#, no-c-format
 msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"   ...\n"
-"}]]>"
+"Decorators have a special injection point, called the <emphasis>delegate "
+"injection point</emphasis>, with the same type as the beans they decorate, "
+"and the annotation <literal>@Delegate</literal>. There must be exactly one "
+"delegate injection point, which can be a constructor parameter, initializer "
+"method parameter or injected field."
 msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"   ...\n"
-"}]]>"
 
 #. Tag: para
-#: decorators.xml:67
 #, fuzzy, no-c-format
 msgid "A decorator is bound to any bean which:"
 msgstr "Un decorator è legato ad un qualsiasi Web Bean che:"
 
 #. Tag: para
-#: decorators.xml:71
 #, fuzzy, no-c-format
 msgid "has the type of the delegate injection point as a bean type, and"
 msgstr "ha il tipo di attributo delegate come un tipo API, e"
 
 #. Tag: para
-#: decorators.xml:74
 #, fuzzy, no-c-format
 msgid "has all qualifiers that are declared at the delegate injection point."
-msgstr "ha tutti i tipi di binding che sono dichiarati dall'attributo delegate."
+msgstr ""
+"ha tutti i tipi di binding che sono dichiarati dall'attributo delegate."
 
 #. Tag: para
-#: decorators.xml:78
 #, fuzzy, no-c-format
-msgid "This delegate injection point specifies that the decorator is bound to all beans that implement <literal>Account</literal>:"
-msgstr "Quest'attributo delegate specifica che ildecorator è legao a tutti i Web Beans che implementano <literal>Account</literal>:"
+msgid ""
+"This delegate injection point specifies that the decorator is bound to all "
+"beans that implement <literal>Account</literal>:"
+msgstr ""
+"Quest'attributo delegate specifica che ildecorator è legao a tutti i Web "
+"Beans che implementano <literal>Account</literal>:"
 
-#. Tag: programlisting
-#: decorators.xml:83
-#, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
-msgstr "<![CDATA[@Inject @Delegate @Any Account account;]]>"
-
 # E' corretto tradurre BOUND con LEGATO in questo particolare contesto?
 # ....rivedere alcune frasi sopra.
 #. Tag: para
-#: decorators.xml:85
 #, fuzzy, no-c-format
-msgid "A delegate injection point may specify any number of qualifier annotations. The decorator will only be bound to beans with the same qualifiers."
-msgstr "Un attributo delegato può specificare un'annotazione di binding. E quindi il decoratore verrà associato a Web Beans con lo stesso binding."
+msgid ""
+"A delegate injection point may specify any number of qualifier annotations. "
+"The decorator will only be bound to beans with the same qualifiers."
+msgstr ""
+"Un attributo delegato può specificare un'annotazione di binding. E quindi il "
+"decoratore verrà associato a Web Beans con lo stesso binding."
 
-#. Tag: programlisting
-#: decorators.xml:90
-#, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
-msgstr "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
-
 #. Tag: para
-#: decorators.xml:92
 #, fuzzy, no-c-format
-msgid "The decorator may invoke the delegate object, which has much the same effect as calling <literal>InvocationContext.proceed()</literal> from an interceptor. The main difference is that the decorator can invoke <emphasis>any</emphasis> business method on the delegate object."
-msgstr "Il decoratore può invocare l'attributo delegate, il ché ha lo stesso effetto come chiamare <literal>InvocationContext.proceed()</literal> da un interceptor."
-
-#. Tag: programlisting
-#: decorators.xml:98
-#, no-c-format
 msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      account.withdraw(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedWithdrawl(amount) );\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      account.deposit(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedDeposit(amount) );\n"
-"      }\n"
-"   }\n"
-"}]]>"
+"The decorator may invoke the delegate object, which has much the same effect "
+"as calling <literal>InvocationContext.proceed()</literal> from an "
+"interceptor. The main difference is that the decorator can invoke "
+"<emphasis>any</emphasis> business method on the delegate object."
 msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      account.withdraw(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedWithdrawl(amount) );\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      account.deposit(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedDeposit(amount) );\n"
-"      }\n"
-"   }\n"
-"}]]>"
+"Il decoratore può invocare l'attributo delegate, il ché ha lo stesso effetto "
+"come chiamare <literal>InvocationContext.proceed()</literal> da un "
+"interceptor."
 
 #. Tag: title
-#: decorators.xml:103
 #, no-c-format
 msgid "Enabling decorators"
 msgstr "Abilitare i decoratori"
 
 #. Tag: para
-#: decorators.xml:105
 #, no-c-format
-msgid "By default, all decorators are disabled. We need to <emphasis>enable</emphasis> our decorator in the <literal>beans.xml</literal> descriptor of a bean archive. This activation only applies to the beans in that archive."
-msgstr ""
-
-#. Tag: programlisting
-#: decorators.xml:111
-#, no-c-format
 msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <decorators>\n"
-"         <class>org.mycompany.myapp.LargeTransactionDecorator</class>\n"
-"   </decorators>\n"
-"</beans>]]>"
+"By default, all decorators are disabled. We need to <emphasis>enable</"
+"emphasis> our decorator in the <literal>beans.xml</literal> descriptor of a "
+"bean archive. This activation only applies to the beans in that archive."
 msgstr ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <decorators>\n"
-"         <class>org.mycompany.myapp.LargeTransactionDecorator</class>\n"
-"   </decorators>\n"
-"</beans>]]>"
 
 # Rivedere la frase?
 #. Tag: para
-#: decorators.xml:113
 #, fuzzy, no-c-format
-msgid "This declaration serves the same purpose for decorators that the <literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
-msgstr "Per i decoratori questa dichiarazione provvede alle stesse finalità di quanto la dichiarazione <literal>&lt;Interceptors&gt;</literal> fa per gli interceptor."
+msgid ""
+"This declaration serves the same purpose for decorators that the "
+"<literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
+msgstr ""
+"Per i decoratori questa dichiarazione provvede alle stesse finalità di "
+"quanto la dichiarazione <literal>&lt;Interceptors&gt;</literal> fa per gli "
+"interceptor."
 
 #. Tag: para
-#: decorators.xml:120
 #, no-c-format
-msgid "it enables us to specify a total ordering for all decorators in our system, ensuring deterministic behavior, and"
-msgstr "Consente di specificare un ordinamento totale per tutti i decoratori del sistema, assicurando un comportamento deterministico, e"
+msgid ""
+"it enables us to specify a total ordering for all decorators in our system, "
+"ensuring deterministic behavior, and"
+msgstr ""
+"Consente di specificare un ordinamento totale per tutti i decoratori del "
+"sistema, assicurando un comportamento deterministico, e"
 
 #. Tag: para
-#: decorators.xml:126
 #, no-c-format
 msgid "it lets us enable or disable decorator classes at deployment time."
-msgstr "consente di abilitare o disabilitare le classi decorato durante la fase di deploy."
+msgstr ""
+"consente di abilitare o disabilitare le classi decorato durante la fase di "
+"deploy."
 
 #~ msgid ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "   public BigDecimal getBalance();\n"
+#~ "   public User getOwner();\n"
+#~ "   public void withdraw(BigDecimal amount);\n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "   public BigDecimal getBalance();\n"
+#~ "   public User getOwner();\n"
+#~ "   public void withdraw(BigDecimal amount);\n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   ...\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "   ...\n"
+#~ "}]]>"
+
+#~ msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
+#~ msgstr "<![CDATA[@Inject @Delegate @Any Account account;]]>"
+
+#~ msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
+#~ msgstr "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      account.withdraw(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      account.deposit(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedDeposit(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      account.withdraw(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      account.deposit(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedDeposit(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<beans\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
+#~ "   <decorators>\n"
+#~ "         <class>org.mycompany.myapp.LargeTransactionDecorator</class>\n"
+#~ "   </decorators>\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<beans\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
+#~ "   <decorators>\n"
+#~ "         <class>org.mycompany.myapp.LargeTransactionDecorator</class>\n"
+#~ "   </decorators>\n"
+#~ "</beans>]]>"
+
+#~ msgid ""
 #~ "All decorators have a <emphasis>delegate attribute</emphasis>. The type "
 #~ "and binding types of the delegate attribute determine which Web Beans the "
 #~ "decorator is bound to. The delegate attribute type must implement or "
@@ -333,10 +378,10 @@
 #~ "tipo ed i tipi di binding dell'attributo delegato determinano a quali Web "
 #~ "Beans è legato il decoratore. Il tipo di attributo delegato deve "
 #~ "implementare o estendere tutte le interfacce implementate dal decoratore."
+
 #~ msgid ""
 #~ "We need to <emphasis>enable</emphasis> our decorator in <literal>web-"
 #~ "beans.xml</literal>."
 #~ msgstr ""
 #~ "Occorre <emphasis>abilitare</emphasis> il decoratore in <literal>web-"
 #~ "beans.xml</literal>."
-

Modified: doc/trunk/reference/it-IT/dependencies.po
===================================================================
--- doc/trunk/reference/it-IT/dependencies.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/dependencies.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-23 21:15+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: dependencies.xml:5
 #, no-c-format
 msgid "Weld project dependencies"
 msgstr "Dipendenze del progetto Weld"
 
 #. Tag: para
-#: dependencies.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "This section lists compile-time and runtime dependencies for Weld. This list "
@@ -34,105 +32,91 @@
 "quest'appendice."
 
 #. Tag: title
-#: dependencies.xml:13
 #, no-c-format
 msgid "Artifacts coming from Sun"
 msgstr "Artifact provenienti da Sun"
 
 #. Tag: para
-#: dependencies.xml:21 dependencies.xml:110
 #, no-c-format
 msgid "Artifact"
 msgstr "Artifact"
 
 #. Tag: para
-#: dependencies.xml:24 dependencies.xml:113
 #, no-c-format
 msgid "Scope"
 msgstr "Scope"
 
-#. Tag: literal
-#: dependencies.xml:33
-#, no-c-format
-msgid "javax.ejb:ejb-api:3.1"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>javax.ejb:ejb-api:3.1</literal>"
 msgstr "javax.ejb:ejb-api:3.1"
 
 #. Tag: para
-#: dependencies.xml:36 dependencies.xml:44 dependencies.xml:52
-#: dependencies.xml:60 dependencies.xml:68 dependencies.xml:76
-#: dependencies.xml:128
 #, no-c-format
 msgid "compile"
 msgstr "compile"
 
-#. Tag: literal
-#: dependencies.xml:41
-#, no-c-format
-msgid "javax.faces:jsf-api:2.0"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>javax.faces:jsf-api:2.0</literal>"
 msgstr "javax.faces:jsf-api:2.0"
 
-#. Tag: literal
-#: dependencies.xml:49
-#, no-c-format
-msgid "javax.el:el-api:2.1"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>javax.el:el-api:2.1</literal>"
 msgstr "javax.el:el-api:2.1"
 
-#. Tag: literal
-#: dependencies.xml:57
-#, no-c-format
-msgid "javax.persistence:persistence-api:2.0"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>javax.persistence:persistence-api:2.0</literal>"
 msgstr "javax.persistence:persistence-api:2.0"
 
-#. Tag: literal
-#: dependencies.xml:65
-#, no-c-format
-msgid "javax.servlet:servlet-api:3.0"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>javax.servlet:servlet-api:3.0</literal>"
 msgstr "javax.servlet:servlet-api:3.0"
 
-#. Tag: literal
-#: dependencies.xml:73
-#, no-c-format
-msgid "javax.interceptor:interceptor-api:1.1"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>javax.interceptor:interceptor-api:1.1</literal>"
 msgstr "javax.interceptor:interceptor-api:1.1"
 
-#. Tag: literal
-#: dependencies.xml:81
-#, no-c-format
-msgid "org.glasfish.web:el-impl:2.1.2"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>org.glasfish.web:el-impl:2.1.2</literal>"
 msgstr "org.glasfish.web:el-impl:2.1.2"
 
 #. Tag: para
-#: dependencies.xml:84 dependencies.xml:92
 #, no-c-format
 msgid "runtime"
 msgstr "runtime"
 
-#. Tag: literal
-#: dependencies.xml:89
-#, no-c-format
-msgid "javax.faces:jsf-impl:2.0.x"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>javax.faces:jsf-impl:2.0.x</literal>"
 msgstr "javax.faces:jsf-impl:2.0.x"
 
 #. Tag: title
-#: dependencies.xml:101
 #, no-c-format
 msgid "Artifacts coming from Hibernate"
 msgstr "Artifact provenienti da Hibernate"
 
 #. Tag: para
-#: dependencies.xml:116
 #, no-c-format
 msgid "Notes"
 msgstr "Note"
 
-#. Tag: literal
-#: dependencies.xml:125
-#, no-c-format
-msgid "javax.validation:validation-api"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>javax.validation:validation-api</literal>"
 msgstr "javax.validation:validation-api"
 
-#. Tag: ulink
-#: dependencies.xml:131
+#. Tag: para
 #, no-c-format
-msgid "BVAL-193"
-msgstr "BVAL-193"
+msgid ""
+"<ulink url=\"http://opensource.atlassian.com/projects/hibernate/browse/BVAL-"
+"193\">BVAL-193</ulink>"
+msgstr ""
+
+#~ msgid "BVAL-193"
+#~ msgstr "BVAL-193"

Modified: doc/trunk/reference/it-IT/ee.po
===================================================================
--- doc/trunk/reference/it-IT/ee.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/ee.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-23 21:16+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: ee.xml:4
 #, no-c-format
 msgid "Java EE integration"
 msgstr "Integrazione Java EE"
 
 #. Tag: para
-#: ee.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "CDI is fully integrated into the Java EE environment. Beans have access to "
@@ -36,13 +34,11 @@
 "che non sono Web Beans."
 
 #. Tag: title
-#: ee.xml:13
 #, no-c-format
 msgid "Built-in beans"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:15
 #, no-c-format
 msgid ""
 "In the Java EE environment, the container provides the following built-in "
@@ -50,20 +46,17 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:22
 #, no-c-format
 msgid "the current JTA <literal>UserTransaction</literal>,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:27
 #, no-c-format
 msgid ""
 "a <literal>Principal</literal> representing the current caller identity,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:32
 #, no-c-format
 msgid ""
 "the default <ulink url=\"http://jcp.org/en/jsr/detail?id=303\">Bean "
@@ -71,7 +64,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:38
 #, no-c-format
 msgid ""
 "a <literal>Validator</literal> for the default <literal>ValidationFactory</"
@@ -79,7 +71,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:45
 #, no-c-format
 msgid ""
 "The CDI specification does not require the servlet context objects, "
@@ -95,32 +86,18 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:57
 #, no-c-format
 msgid ""
 "Oh, you <emphasis>really</emphasis> want to inject the "
 "<literal>FacesContext</literal>? Alright then, try this producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[class FacesContextProducer {\n"
-"   @Produces @RequestScoped FacesContext getFacesContext() {\n"
-"      return FacesContext.getCurrentInstance();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: ee.xml:67
 #, fuzzy, no-c-format
 msgid "Injecting Java EE resources into a bean"
 msgstr "Iniettare risorse Java EE in un Web Bean"
 
 #. Tag: para
-#: ee.xml:69
 #, fuzzy, no-c-format
 msgid ""
 "All managed beans may take advantage of Java EE component environment "
@@ -135,46 +112,7 @@
 "già visto un paio di esempi a riguardo, sebbene non ci siamo soffermati "
 "molto a suo tempo."
 
-#. Tag: programlisting
-#: ee.xml:76
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @Resource UserTransaction transaction;\n"
-"\n"
-"   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"throws Exception { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @Resource UserTransaction transaction;\n"
-"\n"
-"   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"throws Exception { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: ee.xml:78
-#, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Login implements Serializable {\n"
-"   @Inject Credentials credentials;\n"
-"   @PersistenceContext EntityManager userDatabase;\n"
-"    ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped\n"
-"public class Login implements Serializable {\n"
-"   @Inject Credentials credentials;\n"
-"   @PersistenceContext EntityManager userDatabase;\n"
-"    ...\n"
-"}]]>"
-
 #. Tag: para
-#: ee.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "The Java EE <literal>@PostConstruct</literal> and <literal>@PreDestroy</"
@@ -189,7 +127,6 @@
 "eseguita."
 
 #. Tag: para
-#: ee.xml:86
 #, no-c-format
 msgid ""
 "Of course, we advise that component environment injection be used to define "
@@ -197,13 +134,11 @@
 msgstr ""
 
 #. Tag: title
-#: ee.xml:94
 #, fuzzy, no-c-format
 msgid "Calling a bean from a servlet"
 msgstr "Chiamare un Web Bean da un servlet"
 
 #. Tag: para
-#: ee.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
@@ -213,54 +148,7 @@
 "si inietti il Web Bean utilizzando l'injection del campo Web Bean o del "
 "metodo inizializzatore."
 
-#. Tag: programlisting
-#: ee.xml:101
-#, no-c-format
-msgid ""
-"<![CDATA[public class Login extends HttpServlet {\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject Login login;\n"
-"\n"
-"   @Override\n"
-"   public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"      throws ServletException, IOException {\n"
-"      credentials.setUsername(request.getParameter(\"username\")):\n"
-"      credentials.setPassword(request.getParameter(\"password\")):\n"
-"      login.login();\n"
-"      if ( login.isLoggedIn() ) {\n"
-"         response.sendRedirect(\"/home.jsp\");\n"
-"      }\n"
-"      else {\n"
-"         response.sendRedirect(\"/loginError.jsp\");\n"
-"      }\n"
-"   }\n"
-"            \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Login extends HttpServlet {\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject Login login;\n"
-"\n"
-"   @Override\n"
-"   public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"      throws ServletException, IOException {\n"
-"      credentials.setUsername(request.getParameter(\"username\")):\n"
-"      credentials.setPassword(request.getParameter(\"password\")):\n"
-"      login.login();\n"
-"      if ( login.isLoggedIn() ) {\n"
-"         response.sendRedirect(\"/home.jsp\");\n"
-"      }\n"
-"      else {\n"
-"         response.sendRedirect(\"/loginError.jsp\");\n"
-"      }\n"
-"   }\n"
-"            \n"
-"}]]>"
-
 #. Tag: para
-#: ee.xml:103
 #, fuzzy, no-c-format
 msgid ""
 "Since instances of servlets are shared across all incoming threads, the bean "
@@ -273,13 +161,11 @@
 "<literal>Login</literal> per la richiesta corrente e la sessione HTTP."
 
 #. Tag: title
-#: ee.xml:112
 #, fuzzy, no-c-format
 msgid "Calling a bean from a message-driven bean"
 msgstr "Chiamare un Web Bean da un Message-Driven Bean"
 
 #. Tag: para
-#: ee.xml:114
 #, no-c-format
 msgid ""
 "CDI injection applies to all EJBs, even when they aren't managed beans. In "
@@ -289,39 +175,13 @@
 
 # Web Beans interceptor bindings =?
 #. Tag: para
-#: ee.xml:119
 #, fuzzy, no-c-format
 msgid "You can even use CDI interceptor bindings for message-driven Beans."
 msgstr ""
 "Si possono perfino associare degli interceptor Web Beans ai Message-Driven "
 "Beans."
 
-#. Tag: programlisting
-#: ee.xml:121
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"   @Inject Inventory inventory;\n"
-"   @PersistenceContext EntityManager em;\n"
-"\n"
-"   public void onMessage(Message message) {\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"   @Inject Inventory inventory;\n"
-"   @PersistenceContext EntityManager em;\n"
-"\n"
-"   public void onMessage(Message message) {\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-
 #. Tag: para
-#: ee.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "Please note that there is no session or conversation context available when "
@@ -336,19 +196,16 @@
 "literal> sono disponibili."
 
 #. Tag: para
-#: ee.xml:129
 #, no-c-format
 msgid "But how about beans which <emphasis>send</emphasis> JMS messages?"
 msgstr ""
 
 #. Tag: title
-#: ee.xml:136
 #, no-c-format
 msgid "JMS endpoints"
 msgstr "Endpoint JMS"
 
 #. Tag: para
-#: ee.xml:138
 #, no-c-format
 msgid ""
 "Sending messages using JMS can be quite complex, because of the number of "
@@ -372,141 +229,20 @@
 "ciclo di vita e modello di thread di cui bisogna (pre)occuparsi."
 
 #. Tag: para
-#: ee.xml:147
 #, no-c-format
 msgid ""
 "You can use producer fields and methods to prepare all of these resources "
 "for injection into a bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[public class OrderResources {\n"
-"   @Resource(name=\"jms/ConnectionFactory\")\n"
-"   private ConnectionFactory connectionFactory;\n"
-"  \n"
-"   @Resource(name=\"jms/OrderQueue\")\n"
-"   private Queue orderQueue;\n"
-"  \n"
-"   @Produces @OrderConnection\n"
-"   public Connection createOrderConnection() throws JMSException {\n"
-"    return connectionFactory.createConnection();\n"
-"   }\n"
-"  \n"
-"   public void closeOrderConnection(@Disposes @OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      connection.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderSession\n"
-"   public Session createOrderSession(@OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      return connection.createSession(true, Session.AUTO_ACKNOWLEDGE);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderSession(@Disposes @OrderSession Session session)\n"
-"         throws JMSException {\n"
-"      session.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderMessageProducer\n"
-"   public MessageProducer createOrderMessageProducer(@OrderSession Session "
-"session)\n"
-"         throws JMSException {\n"
-"      return session.createProducer(orderQueue);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderMessageProducer(@Disposes @OrderMessageProducer "
-"MessageProducer producer)\n"
-"         throws JMSException {\n"
-"      producer.close();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class OrderResources {\n"
-"   @Resource(name=\"jms/ConnectionFactory\")\n"
-"   private ConnectionFactory connectionFactory;\n"
-"  \n"
-"   @Resource(name=\"jms/OrderQueue\")\n"
-"   private Queue orderQueue;\n"
-"  \n"
-"   @Produces @OrderConnection\n"
-"   public Connection createOrderConnection() throws JMSException {\n"
-"    return connectionFactory.createConnection();\n"
-"   }\n"
-"  \n"
-"   public void closeOrderConnection(@Disposes @OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      connection.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderSession\n"
-"   public Session createOrderSession(@OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      return connection.createSession(true, Session.AUTO_ACKNOWLEDGE);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderSession(@Disposes @OrderSession Session session)\n"
-"         throws JMSException {\n"
-"      session.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderMessageProducer\n"
-"   public MessageProducer createOrderMessageProducer(@OrderSession Session "
-"session)\n"
-"         throws JMSException {\n"
-"      return session.createProducer(orderQueue);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderMessageProducer(@Disposes @OrderMessageProducer "
-"MessageProducer producer)\n"
-"         throws JMSException {\n"
-"      producer.close();\n"
-"   }\n"
-"}]]>"
-
 #. Tag: para
-#: ee.xml:153
 #, no-c-format
 msgid ""
 "In this example, we can just inject the prepared <literal>MessageProducer</"
 "literal>, <literal>Connection</literal> or <literal>QueueSession</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:158
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject Order order;\n"
-"@Inject @OrderMessageProducer MessageProducer producer;\n"
-"@Inject @OrderSession QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"   MapMessage msg = orderSession.createMapMessage();\n"
-"   msg.setLong(\"orderId\", order.getId());\n"
-"   ...\n"
-"   producer.send(msg);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Inject Order order;\n"
-"@Inject @OrderMessageProducer MessageProducer producer;\n"
-"@Inject @OrderSession QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"   MapMessage msg = orderSession.createMapMessage();\n"
-"   msg.setLong(\"orderId\", order.getId());\n"
-"   ...\n"
-"   producer.send(msg);\n"
-"}]]>"
-
 #. Tag: para
-#: ee.xml:164
 #, fuzzy, no-c-format
 msgid ""
 "The lifecycle of the injected JMS objects is completely controlled by the "
@@ -516,22 +252,20 @@
 "manager Web Bean."
 
 #. Tag: title
-#: ee.xml:171
 #, no-c-format
 msgid "Packaging and deployment"
 msgstr "Packaging and deployment"
 
 #. Tag: para
-#: ee.xml:173
 #, fuzzy, no-c-format
 msgid ""
 "CDI doesn't define any special deployment archive. You can package beans in "
-"JARs, EJB-JARs or WARs&#8212;any deployment location in the application "
-"classpath. However, the archive must be a \"bean archive\". That means each "
-"archive that contains beans <emphasis>must</emphasis> include a file named "
+"jars, ejb jars or wars—any deployment location in the application classpath. "
+"However, the archive must be a \"bean archive\". That means each archive "
+"that contains beans <emphasis>must</emphasis> include a file named "
 "<literal>beans.xml</literal> in the <literal>META-INF</literal> directory of "
 "the classpath or <literal>WEB-INF</literal> directory of the web root (for "
-"WAR archives). The file may be empty. Beans deployed in archives that do not "
+"war archives). The file may be empty. Beans deployed in archives that do not "
 "have a <literal>beans.xml</literal> file will not be available for use in "
 "the application."
 msgstr ""
@@ -545,7 +279,6 @@
 "per l'uso nell'applicazione."
 
 #. Tag: para
-#: ee.xml:182
 #, fuzzy, no-c-format
 msgid ""
 "In an embeddable EJB container, beans may be deployed in any location in "
@@ -558,6 +291,216 @@
 "file <literal>web-beans.xml</literal>."
 
 #~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "throws Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "throws Exception { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login implements Serializable {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @PersistenceContext EntityManager userDatabase;\n"
+#~ "    ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login implements Serializable {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @PersistenceContext EntityManager userDatabase;\n"
+#~ "    ...\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class Login extends HttpServlet {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject Login login;\n"
+#~ "\n"
+#~ "   @Override\n"
+#~ "   public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "      throws ServletException, IOException {\n"
+#~ "      credentials.setUsername(request.getParameter(\"username\")):\n"
+#~ "      credentials.setPassword(request.getParameter(\"password\")):\n"
+#~ "      login.login();\n"
+#~ "      if ( login.isLoggedIn() ) {\n"
+#~ "         response.sendRedirect(\"/home.jsp\");\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "            \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Login extends HttpServlet {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject Login login;\n"
+#~ "\n"
+#~ "   @Override\n"
+#~ "   public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "      throws ServletException, IOException {\n"
+#~ "      credentials.setUsername(request.getParameter(\"username\")):\n"
+#~ "      credentials.setPassword(request.getParameter(\"password\")):\n"
+#~ "      login.login();\n"
+#~ "      if ( login.isLoggedIn() ) {\n"
+#~ "         response.sendRedirect(\"/home.jsp\");\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "            \n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "   @Inject Inventory inventory;\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "   public void onMessage(Message message) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "   @Inject Inventory inventory;\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "   public void onMessage(Message message) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class OrderResources {\n"
+#~ "   @Resource(name=\"jms/ConnectionFactory\")\n"
+#~ "   private ConnectionFactory connectionFactory;\n"
+#~ "  \n"
+#~ "   @Resource(name=\"jms/OrderQueue\")\n"
+#~ "   private Queue orderQueue;\n"
+#~ "  \n"
+#~ "   @Produces @OrderConnection\n"
+#~ "   public Connection createOrderConnection() throws JMSException {\n"
+#~ "    return connectionFactory.createConnection();\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   public void closeOrderConnection(@Disposes @OrderConnection Connection "
+#~ "connection)\n"
+#~ "         throws JMSException {\n"
+#~ "      connection.close();\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   @Produces @OrderSession\n"
+#~ "   public Session createOrderSession(@OrderConnection Connection "
+#~ "connection)\n"
+#~ "         throws JMSException {\n"
+#~ "      return connection.createSession(true, Session.AUTO_ACKNOWLEDGE);\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   public void closeOrderSession(@Disposes @OrderSession Session "
+#~ "session)\n"
+#~ "         throws JMSException {\n"
+#~ "      session.close();\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   @Produces @OrderMessageProducer\n"
+#~ "   public MessageProducer createOrderMessageProducer(@OrderSession "
+#~ "Session session)\n"
+#~ "         throws JMSException {\n"
+#~ "      return session.createProducer(orderQueue);\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   public void closeOrderMessageProducer(@Disposes @OrderMessageProducer "
+#~ "MessageProducer producer)\n"
+#~ "         throws JMSException {\n"
+#~ "      producer.close();\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class OrderResources {\n"
+#~ "   @Resource(name=\"jms/ConnectionFactory\")\n"
+#~ "   private ConnectionFactory connectionFactory;\n"
+#~ "  \n"
+#~ "   @Resource(name=\"jms/OrderQueue\")\n"
+#~ "   private Queue orderQueue;\n"
+#~ "  \n"
+#~ "   @Produces @OrderConnection\n"
+#~ "   public Connection createOrderConnection() throws JMSException {\n"
+#~ "    return connectionFactory.createConnection();\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   public void closeOrderConnection(@Disposes @OrderConnection Connection "
+#~ "connection)\n"
+#~ "         throws JMSException {\n"
+#~ "      connection.close();\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   @Produces @OrderSession\n"
+#~ "   public Session createOrderSession(@OrderConnection Connection "
+#~ "connection)\n"
+#~ "         throws JMSException {\n"
+#~ "      return connection.createSession(true, Session.AUTO_ACKNOWLEDGE);\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   public void closeOrderSession(@Disposes @OrderSession Session "
+#~ "session)\n"
+#~ "         throws JMSException {\n"
+#~ "      session.close();\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   @Produces @OrderMessageProducer\n"
+#~ "   public MessageProducer createOrderMessageProducer(@OrderSession "
+#~ "Session session)\n"
+#~ "         throws JMSException {\n"
+#~ "      return session.createProducer(orderQueue);\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   public void closeOrderMessageProducer(@Disposes @OrderMessageProducer "
+#~ "MessageProducer producer)\n"
+#~ "         throws JMSException {\n"
+#~ "      producer.close();\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Inject Order order;\n"
+#~ "@Inject @OrderMessageProducer MessageProducer producer;\n"
+#~ "@Inject @OrderSession QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "   MapMessage msg = orderSession.createMapMessage();\n"
+#~ "   msg.setLong(\"orderId\", order.getId());\n"
+#~ "   ...\n"
+#~ "   producer.send(msg);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Inject Order order;\n"
+#~ "@Inject @OrderMessageProducer MessageProducer producer;\n"
+#~ "@Inject @OrderSession QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "   MapMessage msg = orderSession.createMapMessage();\n"
+#~ "   msg.setLong(\"orderId\", order.getId());\n"
+#~ "   ...\n"
+#~ "   producer.send(msg);\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "There is one restriction to be aware of here: <literal>@PersistenceContext"
 #~ "(type=EXTENDED)</literal> is not supported for simple Web Beans."
 #~ msgstr ""

Modified: doc/trunk/reference/it-IT/environments.po
===================================================================
--- doc/trunk/reference/it-IT/environments.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/environments.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-23 21:17+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -15,22 +15,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: environments.xml:4
 #, fuzzy, no-c-format
 msgid "Application servers and environments supported by Weld"
 msgstr "Application Server ed ambienti supportati da Web Beans"
 
 #. Tag: title
-#: environments.xml:7
 #, fuzzy, no-c-format
 msgid "Using Weld with JBoss AS"
 msgstr "Usare Web Beans con JBoss AS"
 
 #. Tag: para
-#: environments.xml:9
 #, no-c-format
 msgid ""
-"If you are using JBoss AS 5.2, no additional configuration is required to "
+"If you are using JBoss AS 6.0, no additional configuration is required to "
 "use Weld (or CDI for that matter). All you need to do is make your "
 "application a bean bean archive by adding <literal>META-INF/beans.xml</"
 "literal> to the classpath or <literal>WEB-INF/beans.xml</literal> to the web "
@@ -38,52 +35,39 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:15
 #, no-c-format
 msgid ""
 "Unfortunately, you can't use Weld with earlier versions of JBoss AS since "
 "they are missing key libraries. If you want to learn how to upgrade the "
-"built-in support on JBoss AS 5.2, then read on."
+"built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:20
 #, no-c-format
 msgid ""
-"Upgrading the Weld add-on is easy. The Weld distribution has a build that "
-"can take care of this task for you in a single command. First, we need to "
-"tell Weld where JBoss AS is located. Create a new file named <literal>local."
-"build.properties</literal> in the examples directory of the Weld "
-"distribution and assign the path of your JBoss AS installation to the "
-"property key <literal>jboss.home</literal>, as follows:"
+"If there is a newer release of Weld than what is included in the latest "
+"JBoss AS 6 release, upgrading the Weld add-on is easy. The Weld distribution "
+"includes a build script that can take care of this task for you in a single "
+"command."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:27
+#. Tag: para
 #, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"
-msgstr "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"
+msgid ""
+"First, we need to tell Weld where JBoss AS is located. This information is "
+"communicated by assigning the <literal>JBOSS_HOME</literal> environment "
+"variable. In a bash shell, you can assign the environment variable as "
+"follows:"
+msgstr ""
 
 #. Tag: para
-#: environments.xml:29
 #, no-c-format
 msgid ""
 "Now we can install the Weld deployer from the <literal>jboss-as</literal> "
 "directory of the Weld distribution:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:33
-#, no-c-format
-msgid ""
-"$> cd jboss-as\n"
-"$> ant update"
-msgstr ""
-"$> cd jboss-as\n"
-"$> ant update"
-
 #. Tag: para
-#: environments.xml:36
 #, fuzzy, no-c-format
 msgid ""
 "A new deployer, <literal>weld.deployer</literal> is added to JBoss AS. This "
@@ -98,13 +82,11 @@
 "sono installati nell'applicazione."
 
 #. Tag: title
-#: environments.xml:46
 #, no-c-format
 msgid "GlassFish"
 msgstr "GlassFish"
 
 #. Tag: para
-#: environments.xml:48
 #, no-c-format
 msgid ""
 "Weld is also built into GlassFish from V3 onwards. Since GlassFish V3 is the "
@@ -115,13 +97,11 @@
 msgstr ""
 
 #. Tag: title
-#: environments.xml:56
 #, fuzzy, no-c-format
 msgid "Servlet containers (such as Tomcat or Jetty)"
 msgstr "Servlet Container (come Tomcat o Jetty)"
 
 #. Tag: para
-#: environments.xml:58
 #, fuzzy, no-c-format
 msgid ""
 "While JSR-299 does not require support for servlet environments, Weld can be "
@@ -131,7 +111,6 @@
 "6.1."
 
 #. Tag: para
-#: environments.xml:64
 #, fuzzy, no-c-format
 msgid ""
 "There is a major limitation to using a servlet container. Weld doesn't "
@@ -145,7 +124,6 @@
 "eventi transazionali nei Servlet container."
 
 #. Tag: para
-#: environments.xml:72
 #, fuzzy, no-c-format
 msgid ""
 "Weld should be used as a web application library in a servlet container. You "
@@ -161,62 +139,52 @@
 "literal> è un \"sovra-jar\" fornito per comodità. Invece, è possibile usare "
 "i suoi jar componenti:"
 
-#. Tag: literal
-#: environments.xml:84
+#. Tag: para
 #, no-c-format
-msgid "jsr299-api.jar"
-msgstr "jsr299-api.jar"
+msgid "<literal>jsr299-api.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:89
+#. Tag: para
 #, no-c-format
-msgid "weld-api.jar"
-msgstr "weld-api.jar"
+msgid "<literal>weld-api.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:94
+#. Tag: para
 #, no-c-format
-msgid "weld-spi.jar"
-msgstr "weld-spi.jar"
+msgid "<literal>weld-spi.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:99
+#. Tag: para
 #, no-c-format
-msgid "weld-core.jar"
-msgstr "weld-core.jar"
+msgid "<literal>weld-core.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:104
-#, no-c-format
-msgid "weld-logging.jar"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>weld-logging.jar</literal>"
 msgstr "weld-logging.jar"
 
-#. Tag: literal
-#: environments.xml:109
-#, no-c-format
-msgid "weld-servlet-int.jar"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>weld-servlet-int.jar</literal>"
 msgstr "weld-servlet-int.jar"
 
-#. Tag: literal
-#: environments.xml:114
+#. Tag: para
 #, no-c-format
-msgid "javassist.jar"
-msgstr "javassist.jar"
+msgid "<literal>javassist.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:119
+#. Tag: para
 #, no-c-format
-msgid "dom4j.jar"
-msgstr "dom4j.jar"
+msgid "<literal>dom4j.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:124
-#, no-c-format
-msgid "google-collections.jar"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>google-collections.jar</literal>"
 msgstr "google-collections.jar"
 
 #. Tag: para
-#: environments.xml:129
 #, fuzzy, no-c-format
 msgid ""
 "You also need to explicitly specify the servlet listener (used to boot Weld, "
@@ -227,28 +195,12 @@
 "Web Beans, e controllare la sua interazione con le richieste) in "
 "<literal>web.xml</literal>:"
 
-#. Tag: programlisting
-#: environments.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-
 #. Tag: title
-#: environments.xml:137
 #, no-c-format
 msgid "Tomcat"
 msgstr "Tomcat"
 
 #. Tag: para
-#: environments.xml:139
 #, fuzzy, no-c-format
 msgid ""
 "Tomcat has a read-only JNDI, so Weld can't automatically bind the "
@@ -260,26 +212,7 @@
 "associare il Manager. Per associare il Manager a JNDI occorre popolare "
 "<literal>META-INF/context.xml</literal> con i seguenti contesti:"
 
-#. Tag: programlisting
-#: environments.xml:145
-#, no-c-format
-msgid ""
-"<![CDATA[<Context>\n"
-"   <Resource name=\"BeanManager\" \n"
-"      auth=\"Container\"\n"
-"      type=\"javax.enterprise.inject.spi.BeanManager\"\n"
-"      factory=\"org.jboss.weld.resources.ManagerObjectFactory\"/>\n"
-"</Context>]]>"
-msgstr ""
-"<![CDATA[<Context>\n"
-"   <Resource name=\"BeanManager\" \n"
-"      auth=\"Container\"\n"
-"      type=\"javax.enterprise.inject.spi.BeanManager\"\n"
-"      factory=\"org.jboss.weld.resources.ManagerObjectFactory\"/>\n"
-"</Context>]]>"
-
 #. Tag: para
-#: environments.xml:147
 #, no-c-format
 msgid ""
 "and make it available to your deployment by adding this to the bottom of "
@@ -288,26 +221,7 @@
 "e renderlo disponibile nel proprio deploy aggiungendo questo in fondo a "
 "<literal>web.xml</literal>:"
 
-#. Tag: programlisting
-#: environments.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[<resource-env-ref>\n"
-"   <resource-env-ref-name>BeanManager</resource-env-ref-name>\n"
-"   <resource-env-ref-type>\n"
-"      javax.enterprise.inject.spi.BeanManager\n"
-"   </resource-env-ref-type>\n"
-"</resource-env-ref>]]>"
-msgstr ""
-"<![CDATA[<resource-env-ref>\n"
-"   <resource-env-ref-name>BeanManager</resource-env-ref-name>\n"
-"   <resource-env-ref-type>\n"
-"      javax.enterprise.inject.spi.BeanManager\n"
-"   </resource-env-ref-type>\n"
-"</resource-env-ref>]]>"
-
 #. Tag: para
-#: environments.xml:153
 #, fuzzy, no-c-format
 msgid ""
 "Tomcat only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -319,7 +233,6 @@
 "Manager</literal>"
 
 #. Tag: para
-#: environments.xml:158
 #, fuzzy, no-c-format
 msgid ""
 "Weld also supports Servlet injection in Tomcat. To enable this, place the "
@@ -331,24 +244,12 @@
 "$TOMCAT_HOME/lib</literal>, ed aggiungere il seguente codice a <literal>META-"
 "INF/context.xml</literal>:"
 
-#. Tag: programlisting
-#: environments.xml:164
-#, no-c-format
-msgid ""
-"<![CDATA[<Listener className=\"org.jboss.weld.environment.tomcat."
-"WeldLifecycleListener\"/>]]>"
-msgstr ""
-"<![CDATA[<Listener className=\"org.jboss.weld.environment.tomcat."
-"WeldLifecycleListener\"/>]]>"
-
 #. Tag: title
-#: environments.xml:169
 #, no-c-format
 msgid "Jetty"
 msgstr "Jetty"
 
 #. Tag: para
-#: environments.xml:171
 #, fuzzy, no-c-format
 msgid ""
 "Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind "
@@ -360,50 +261,7 @@
 "occorre popolare <literal>META-INF/jetty-env.xml</literal> con i seguenti "
 "contesti:"
 
-#. Tag: programlisting
-#: environments.xml:176
-#, no-c-format
-msgid ""
-"<![CDATA[<!DOCTYPE Configure PUBLIC \"-//Mort Bay Consulting//DTD Configure//"
-"EN\"\n"
-"   \"http://jetty.mortbay.org/configure.dtd\">\n"
-"<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext"
-"\">\n"
-"   <New id=\"BeanManager\" class=\"org.mortbay.jetty.plus.naming.Resource"
-"\">\n"
-"      <Arg><Ref id=\"webAppCtx\"/></Arg> \n"
-"      <Arg>BeanManager</Arg>\n"
-"      <Arg>\n"
-"         <New class=\"javax.naming.Reference\">\n"
-"            <Arg>javax.enterprise.inject.spi.BeanManager</Arg> \n"
-"            <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>\n"
-"            <Arg/>\n"
-"         </New>\n"
-"      </Arg>\n"
-"   </New>\n"
-"</Configure>]]>"
-msgstr ""
-"<![CDATA[<!DOCTYPE Configure PUBLIC \"-//Mort Bay Consulting//DTD Configure//"
-"EN\"\n"
-"   \"http://jetty.mortbay.org/configure.dtd\">\n"
-"<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext"
-"\">\n"
-"   <New id=\"BeanManager\" class=\"org.mortbay.jetty.plus.naming.Resource"
-"\">\n"
-"      <Arg><Ref id=\"webAppCtx\"/></Arg> \n"
-"      <Arg>BeanManager</Arg>\n"
-"      <Arg>\n"
-"         <New class=\"javax.naming.Reference\">\n"
-"            <Arg>javax.enterprise.inject.spi.BeanManager</Arg> \n"
-"            <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>\n"
-"            <Arg/>\n"
-"         </New>\n"
-"      </Arg>\n"
-"   </New>\n"
-"</Configure>]]>"
-
 #. Tag: para
-#: environments.xml:178
 #, no-c-format
 msgid ""
 "Notice that Jetty doesn't not have built-in support for an <literal>javax."
@@ -417,7 +275,6 @@
 "wrap."
 
 #. Tag: para
-#: environments.xml:184
 #, fuzzy, no-c-format
 msgid ""
 "Jetty only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -429,19 +286,16 @@
 "Manager</literal>"
 
 #. Tag: para
-#: environments.xml:189
 #, fuzzy, no-c-format
 msgid "Weld does not currently support Servlet injection in Jetty."
 msgstr "Web Beans non supporta attualmente l'injection dei servlet in Jetty."
 
 #. Tag: title
-#: environments.xml:198
 #, no-c-format
 msgid "Java SE"
 msgstr "Java SE"
 
 #. Tag: para
-#: environments.xml:200
 #, fuzzy, no-c-format
 msgid ""
 "In addition to improved integration of the Enterprise Java stack, the "
@@ -460,7 +314,6 @@
 "qualsiasi caratteristica Enterprise Edition."
 
 #. Tag: para
-#: environments.xml:208
 #, fuzzy, no-c-format
 msgid ""
 "When executing in the SE environment the following features of Weld are "
@@ -470,7 +323,6 @@
 "Beans:"
 
 #. Tag: para
-#: environments.xml:214
 #, no-c-format
 msgid ""
 "Managed beans with <literal>@PostConstruct</literal> and "
@@ -478,13 +330,11 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:220
 #, no-c-format
 msgid "Dependency injection with qualifiers and alternatives"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:225
 #, no-c-format
 msgid ""
 "<literal>@Application</literal>, <literal>@Dependent</literal> and "
@@ -492,43 +342,36 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:231
 #, no-c-format
 msgid "Interceptors and decorators"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:236
 #, no-c-format
 msgid "Stereotypes"
 msgstr "Stereotipi"
 
 #. Tag: para
-#: environments.xml:241
 #, no-c-format
 msgid "Events"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:246
 #, no-c-format
 msgid "Portable extension support"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:252
 #, no-c-format
 msgid "EJB beans are not supported."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:257
 #, fuzzy, no-c-format
 msgid "CDI SE Module"
 msgstr "Module Web Beans SE"
 
 #. Tag: para
-#: environments.xml:259
 #, fuzzy, no-c-format
 msgid ""
 "Weld provides an extension which will boot a CDI bean manager in Java SE, "
@@ -544,26 +387,12 @@
 "parametri da linea di comando possono essere iniettati usando una delle "
 "seguenti:"
 
-#. Tag: programlisting
-#: environments.xml:264
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters List<String> params;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: environments.xml:266
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters String[] paramsArray;]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:268
 #, no-c-format
 msgid "The second form is useful for compatibility with existing classes."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:273
 #, fuzzy, no-c-format
 msgid ""
 "The command line parameters do not become available for injection until the "
@@ -579,42 +408,16 @@
 "<literal>StartMain</literal>."
 
 #. Tag: para
-#: environments.xml:282
 #, fuzzy, no-c-format
 msgid "Here's an example of a simple CDI SE application:"
 msgstr "Ecco un esempio di una semplice applicazione Web Beans SE:"
 
-#. Tag: programlisting
-#: environments.xml:286
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Singleton\n"
-"public class HelloWorld\n"
-"{\n"
-"   public void printHello(@Observes ContainerInitialized event, @Parameters "
-"List<String> parameters) {\n"
-"       System.out.println(\"Hello \" + parameters.get(0));\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped\n"
-"public class HelloWorld\n"
-"{\n"
-"   @Inject @Parameters List<String> parameters;\n"
-"\n"
-"   public void printHello(@Observes ContainerInitialized event) {\n"
-"       System.out.println(\"Hello \" + parameters.get(0));\n"
-"   }\n"
-"}]]>"
-
 #. Tag: title
-#: environments.xml:292
 #, no-c-format
 msgid "Bootstrapping CDI SE"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:294
 #, fuzzy, no-c-format
 msgid "CDI SE applications can be bootstrapped in the following ways."
 msgstr ""
@@ -622,13 +425,11 @@
 "main."
 
 #. Tag: title
-#: environments.xml:300
 #, no-c-format
 msgid "The ContainerInitialized Event"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:302
 #, no-c-format
 msgid ""
 "Thanks to the power of CDI's typesafe event model, application developers "
@@ -640,7 +441,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:310
 #, fuzzy, no-c-format
 msgid ""
 "In this case your application can be started by calling the provided main "
@@ -649,20 +449,12 @@
 "Le applicazioni Web Beans SE vengono avviate eseguendo il seguente metodo "
 "main."
 
-#. Tag: programlisting
-#: environments.xml:313
-#, no-c-format
-msgid "<![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]>"
-msgstr "<![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]>"
-
 #. Tag: title
-#: environments.xml:319
 #, no-c-format
 msgid "Programatic Bootstrap API"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:321
 #, no-c-format
 msgid ""
 "For added flexibility, CDI SE also comes with a bootstrap API which can be "
@@ -671,90 +463,65 @@
 "classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:327
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class Weld\n"
-"{\n"
-"\n"
-"   /** Boots Weld and creates and returns a WeldContainer instance, through "
-"which\n"
-"    * beans and events can be accesed. */\n"
-"   public WeldContainer initialize() {...}\n"
-"\n"
-"   /** Convenience method for shutting down the container. */\n"
-"   public void shutdown() {...}\n"
-"\n"
-"}]]>"
+"Here's an example application main method which uses this API to initialize "
+"a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:329
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class WeldContainer\n"
-"{\n"
-"\n"
-"   /** Provides access to all beans within the application. */\n"
-"   public Instance<Object> instance() {...}\n"
-"\n"
-"   /** Provides access to all events within the application. */\n"
-"   public Event<Object> event() {...}\n"
-"\n"
-"   /** Provides direct access to the BeanManager. */\n"
-"   public BeanManager getBeanManager() {...}\n"
-"\n"
-"}]]>"
+"Alternatively the application could be started by firing a custom event "
+"which would then be observed by another simple bean. The following example "
+"fires <literal>MyEvent</literal> on startup."
 msgstr ""
 
-#. Tag: para
-#: environments.xml:331
+#. Tag: title
 #, no-c-format
-msgid ""
-"Here's an example application main method which uses this API to initialize "
-"a bean of type <literal>MyApplicationBean</literal>."
+msgid "Thread Context"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:334
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.instance().select(MyApplicationBean.class).get();\n"
-"   weld.shutdown();\n"
-"}]]>"
+"In contrast to Java EE applications, Java SE applications place no "
+"restrictions on developers regarding the creation and usage of threads. "
+"Therefore Weld SE provides a custom scope annotation, "
+"<literal>@ThreadScoped</literal>, and corresponding context implementation "
+"which can be used to bind bean instances to the current thread. It is "
+"intended to be used in scenarios where you might otherwise use "
+"<literal>ThreadLocal</literal>, and does in fact use <literal>ThreadLocal</"
+"literal> under the hood."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:336
 #, no-c-format
 msgid ""
-"Alternatively the application could be started by firing a custom event "
-"which would then be observed by another simple bean. The following example "
-"fires <literal>MyEvent</literal> on startup."
+"To use the @ThreadScoped annotation you need to enable the "
+"<literal>RunnableDecorator</literal> which 'listens' for all executions of "
+"<literal>Runnable.run()</literal> and decorates them by setting up the "
+"thread context beforehand, bound to the current thread, and destroying the "
+"context afterwards."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:340
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.event().select(MyEvent.class).fire( new MyEvent() );\n"
-"   weld.shutdown();\n"
-"}]]>"
+"It is not necessary to use @ThreadScoped in all multithreaded applications. "
+"The thread context is not intended as a replacement for defining your own "
+"application-specific contexts. It is generally only useful in situtations "
+"where you would otherwise have used ThreadLocal directly, which are "
+"typically rare."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:348
 #, no-c-format
 msgid "Setting the Classpath"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:350
 #, no-c-format
 msgid ""
 "Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld "
@@ -763,6 +530,145 @@
 "classes and dependant jars, is the Weld SE jar."
 msgstr ""
 
+#~ msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"
+#~ msgstr "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"
+
+#~ msgid ""
+#~ "$> cd jboss-as\n"
+#~ "$> ant update"
+#~ msgstr ""
+#~ "$> cd jboss-as\n"
+#~ "$> ant update"
+
+#~ msgid "jsr299-api.jar"
+#~ msgstr "jsr299-api.jar"
+
+#~ msgid "weld-api.jar"
+#~ msgstr "weld-api.jar"
+
+#~ msgid "weld-spi.jar"
+#~ msgstr "weld-spi.jar"
+
+#~ msgid "weld-core.jar"
+#~ msgstr "weld-core.jar"
+
+#~ msgid "javassist.jar"
+#~ msgstr "javassist.jar"
+
+#~ msgid "dom4j.jar"
+#~ msgstr "dom4j.jar"
+
+#~ msgid ""
+#~ "<![CDATA[<listener>\n"
+#~ "   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
+#~ "class>\n"
+#~ "</listener>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<listener>\n"
+#~ "   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
+#~ "class>\n"
+#~ "</listener>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<Context>\n"
+#~ "   <Resource name=\"BeanManager\" \n"
+#~ "      auth=\"Container\"\n"
+#~ "      type=\"javax.enterprise.inject.spi.BeanManager\"\n"
+#~ "      factory=\"org.jboss.weld.resources.ManagerObjectFactory\"/>\n"
+#~ "</Context>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<Context>\n"
+#~ "   <Resource name=\"BeanManager\" \n"
+#~ "      auth=\"Container\"\n"
+#~ "      type=\"javax.enterprise.inject.spi.BeanManager\"\n"
+#~ "      factory=\"org.jboss.weld.resources.ManagerObjectFactory\"/>\n"
+#~ "</Context>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<resource-env-ref>\n"
+#~ "   <resource-env-ref-name>BeanManager</resource-env-ref-name>\n"
+#~ "   <resource-env-ref-type>\n"
+#~ "      javax.enterprise.inject.spi.BeanManager\n"
+#~ "   </resource-env-ref-type>\n"
+#~ "</resource-env-ref>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<resource-env-ref>\n"
+#~ "   <resource-env-ref-name>BeanManager</resource-env-ref-name>\n"
+#~ "   <resource-env-ref-type>\n"
+#~ "      javax.enterprise.inject.spi.BeanManager\n"
+#~ "   </resource-env-ref-type>\n"
+#~ "</resource-env-ref>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<Listener className=\"org.jboss.weld.environment.tomcat."
+#~ "WeldLifecycleListener\"/>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<Listener className=\"org.jboss.weld.environment.tomcat."
+#~ "WeldLifecycleListener\"/>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<!DOCTYPE Configure PUBLIC \"-//Mort Bay Consulting//DTD "
+#~ "Configure//EN\"\n"
+#~ "   \"http://jetty.mortbay.org/configure.dtd\">\n"
+#~ "<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext"
+#~ "\">\n"
+#~ "   <New id=\"BeanManager\" class=\"org.mortbay.jetty.plus.naming.Resource"
+#~ "\">\n"
+#~ "      <Arg><Ref id=\"webAppCtx\"/></Arg> \n"
+#~ "      <Arg>BeanManager</Arg>\n"
+#~ "      <Arg>\n"
+#~ "         <New class=\"javax.naming.Reference\">\n"
+#~ "            <Arg>javax.enterprise.inject.spi.BeanManager</Arg> \n"
+#~ "            <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>\n"
+#~ "            <Arg/>\n"
+#~ "         </New>\n"
+#~ "      </Arg>\n"
+#~ "   </New>\n"
+#~ "</Configure>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<!DOCTYPE Configure PUBLIC \"-//Mort Bay Consulting//DTD "
+#~ "Configure//EN\"\n"
+#~ "   \"http://jetty.mortbay.org/configure.dtd\">\n"
+#~ "<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext"
+#~ "\">\n"
+#~ "   <New id=\"BeanManager\" class=\"org.mortbay.jetty.plus.naming.Resource"
+#~ "\">\n"
+#~ "      <Arg><Ref id=\"webAppCtx\"/></Arg> \n"
+#~ "      <Arg>BeanManager</Arg>\n"
+#~ "      <Arg>\n"
+#~ "         <New class=\"javax.naming.Reference\">\n"
+#~ "            <Arg>javax.enterprise.inject.spi.BeanManager</Arg> \n"
+#~ "            <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>\n"
+#~ "            <Arg/>\n"
+#~ "         </New>\n"
+#~ "      </Arg>\n"
+#~ "   </New>\n"
+#~ "</Configure>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Singleton\n"
+#~ "public class HelloWorld\n"
+#~ "{\n"
+#~ "   public void printHello(@Observes ContainerInitialized event, "
+#~ "@Parameters List<String> parameters) {\n"
+#~ "       System.out.println(\"Hello \" + parameters.get(0));\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped\n"
+#~ "public class HelloWorld\n"
+#~ "{\n"
+#~ "   @Inject @Parameters List<String> parameters;\n"
+#~ "\n"
+#~ "   public void printHello(@Observes ContainerInitialized event) {\n"
+#~ "       System.out.println(\"Hello \" + parameters.get(0));\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid "<![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]>"
+#~ msgstr "<![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]>"
+
 #~ msgid "Typesafe Dependency Injection"
 #~ msgstr "Iniezioni di dipendenza typesafe"
 

Modified: doc/trunk/reference/it-IT/events.po
===================================================================
--- doc/trunk/reference/it-IT/events.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/events.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-23 21:18+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,607 +14,717 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: events.xml:4
 #, no-c-format
 msgid "Events"
 msgstr "Eventi"
 
 #. Tag: para
-#: events.xml:6
 #, no-c-format
-msgid "Dependency injection enables loose-coupling by allowing the implementation of the injected bean type to vary, either a deployment time or runtime. Events go one step further, allowing beans to interact with no compile time dependency at all. Event <emphasis>producers</emphasis> raise events that are delivered to event <emphasis>observers</emphasis> by the container."
+msgid ""
+"Dependency injection enables loose-coupling by allowing the implementation "
+"of the injected bean type to vary, either a deployment time or runtime. "
+"Events go one step further, allowing beans to interact with no compile time "
+"dependency at all. Event <emphasis>producers</emphasis> raise events that "
+"are delivered to event <emphasis>observers</emphasis> by the container."
 msgstr ""
 
 #. Tag: para
-#: events.xml:13
 #, no-c-format
-msgid "This basic schema might sound like the familiar observer/observable pattern, but there are a couple of twists:"
+msgid ""
+"This basic schema might sound like the familiar observer/observable pattern, "
+"but there are a couple of twists:"
 msgstr ""
 
 #. Tag: para
-#: events.xml:18
 #, no-c-format
-msgid "not only are event producers decoupled from observers; observers are completely decoupled from producers,"
-msgstr "non solo i produttori di eventi sono disaccoppiati dagli osservatori; gli osservatori sono completamente disaccoppiati dai produttori,"
+msgid ""
+"not only are event producers decoupled from observers; observers are "
+"completely decoupled from producers,"
+msgstr ""
+"non solo i produttori di eventi sono disaccoppiati dagli osservatori; gli "
+"osservatori sono completamente disaccoppiati dai produttori,"
 
 #. Tag: para
-#: events.xml:22
 #, no-c-format
-msgid "observers can specify a combination of \"selectors\" to narrow the set of event notifications they will receive, and"
-msgstr "gli osservatori possono specificare una combinazione di \"selettori\" per restringere il set di notifiche di eventi da ricevere, e"
+msgid ""
+"observers can specify a combination of \"selectors\" to narrow the set of "
+"event notifications they will receive, and"
+msgstr ""
+"gli osservatori possono specificare una combinazione di \"selettori\" per "
+"restringere il set di notifiche di eventi da ricevere, e"
 
 #. Tag: para
-#: events.xml:28
 #, fuzzy, no-c-format
-msgid "observers can be notified immediately, or can specify that delivery of the event should be delayed until the end of the current transaction."
-msgstr "gli osservatori possono essere notificati immediatamente, o possono specificare che la consegna degli eventi venga ritardata fino alla fine della transazione conrrente"
+msgid ""
+"observers can be notified immediately, or can specify that delivery of the "
+"event should be delayed until the end of the current transaction."
+msgstr ""
+"gli osservatori possono essere notificati immediatamente, o possono "
+"specificare che la consegna degli eventi venga ritardata fino alla fine "
+"della transazione conrrente"
 
 #. Tag: para
-#: events.xml:35
 #, no-c-format
-msgid "The CDI event notification facility uses more or less the same typesafe approach that we've already seen with the dependency injection service."
+msgid ""
+"The CDI event notification facility uses more or less the same typesafe "
+"approach that we've already seen with the dependency injection service."
 msgstr ""
 
 #. Tag: title
-#: events.xml:39
 #, fuzzy, no-c-format
 msgid "Event payload"
 msgstr "Produttori di eventi"
 
 #. Tag: para
-#: events.xml:41
 #, no-c-format
-msgid "The event object carries state from producer to consumer. The event object is nothing more than an instance of a concrete Java class. (The only restriction is that an event type may not contain type variables). An event may be assigned qualifiers, which allows observers to distinguish it from other events of the same type. The qualifiers function like topic selectors, allowing an observer to narrow the set of events it observes."
+msgid ""
+"The event object carries state from producer to consumer. The event object "
+"is nothing more than an instance of a concrete Java class. (The only "
+"restriction is that an event type may not contain type variables). An event "
+"may be assigned qualifiers, which allows observers to distinguish it from "
+"other events of the same type. The qualifiers function like topic selectors, "
+"allowing an observer to narrow the set of events it observes."
 msgstr ""
 
 #. Tag: para
-#: events.xml:48
 #, no-c-format
-msgid "An event qualifier is just a normal qualifier, defined using <literal>@Qualifier</literal>. Here's an example:"
-msgstr ""
-
-#. Tag: programlisting
-#: events.xml:52
-#, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({FIELD, PARAMETER})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated {}]]>"
+"An event qualifier is just a normal qualifier, defined using "
+"<literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Target({FIELD, PARAMETER})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated {}]]>"
 
 #. Tag: title
-#: events.xml:57
 #, no-c-format
 msgid "Event observers"
 msgstr "Osservatori di eventi"
 
 #. Tag: para
-#: events.xml:59
 #, fuzzy, no-c-format
-msgid "An <emphasis>observer method</emphasis> is a method of a bean with a parameter annotated <literal>@Observes</literal>."
-msgstr "Un <emphasis>metodo osservatore</emphasis> è un metodo di un Web Bean con un parametro annotato <literal>@Observes</literal>."
+msgid ""
+"An <emphasis>observer method</emphasis> is a method of a bean with a "
+"parameter annotated <literal>@Observes</literal>."
+msgstr ""
+"Un <emphasis>metodo osservatore</emphasis> è un metodo di un Web Bean con un "
+"parametro annotato <literal>@Observes</literal>."
 
-#. Tag: programlisting
-#: events.xml:64
-#, no-c-format
-msgid "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) { ... }]]>"
-msgstr "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:66
 #, fuzzy, no-c-format
-msgid "The annotated parameter is called the <emphasis>event parameter</emphasis>. The type of the event parameter is the observed <emphasis>event type</emphasis>, in this case <literal>Document</literal>. The event parameter may also specify qualifiers."
-msgstr "Il parametro annotato viene chiamato <emphasis>parametro evento</emphasis>. Il tipo di parametro evento è il <emphasis>tipo evento</emphasis> osservato. I metodi osservatori possono anche specificare dei \"selettori\", che sono solo istanze di tipi di binding di Web Beans. Quando un tipo di binding viene usato come selettore di eventi viene chiamato <emphasis>tipo binding di evento</emphasis>. "
+msgid ""
+"The annotated parameter is called the <emphasis>event parameter</emphasis>. "
+"The type of the event parameter is the observed <emphasis>event type</"
+"emphasis>, in this case <literal>Document</literal>. The event parameter may "
+"also specify qualifiers."
+msgstr ""
+"Il parametro annotato viene chiamato <emphasis>parametro evento</emphasis>. "
+"Il tipo di parametro evento è il <emphasis>tipo evento</emphasis> osservato. "
+"I metodi osservatori possono anche specificare dei \"selettori\", che sono "
+"solo istanze di tipi di binding di Web Beans. Quando un tipo di binding "
+"viene usato come selettore di eventi viene chiamato <emphasis>tipo binding "
+"di evento</emphasis>. "
 
-#. Tag: programlisting
-#: events.xml:72
-#: events.xml:240
-#, no-c-format
-msgid "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document document) { ... }]]>"
-msgstr "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:74
 #, fuzzy, no-c-format
-msgid "An observer method need not specify any event qualifiers&#8212;in this case it is interested in <emphasis>all</emphasis> events of a particular type. If it does specify qualifiers, it's only interested in events which have those qualifiers."
-msgstr "Un metodo osservatore non ha bisogno di specificare alcun binding di evento &#151; in questo caso è interessato a <emphasis>tutti</emphasis> gli eventi di un particolare tipo. Se specifica dei binding di evento, è solamente interessato agli eventi che hanno anche gli stessi binding di evento."
+msgid ""
+"An observer method need not specify any event qualifiers—in this case it is "
+"interested in <emphasis>all</emphasis> events of a particular type. If it "
+"does specify qualifiers, it's only interested in events which have those "
+"qualifiers."
+msgstr ""
+"Un metodo osservatore non ha bisogno di specificare alcun binding di evento "
+"&#151; in questo caso è interessato a <emphasis>tutti</emphasis> gli eventi "
+"di un particolare tipo. Se specifica dei binding di evento, è solamente "
+"interessato agli eventi che hanno anche gli stessi binding di evento."
 
 #. Tag: para
-#: events.xml:80
 #, fuzzy, no-c-format
-msgid "The observer method may have additional parameters, which are injection points:"
-msgstr "Il metodo osservatore può avere parametri addizionali che vengono iniettati secondo la solita semantica di iniezione del parametro del metodo Web Beans."
+msgid ""
+"The observer method may have additional parameters, which are injection "
+"points:"
+msgstr ""
+"Il metodo osservatore può avere parametri addizionali che vengono iniettati "
+"secondo la solita semantica di iniezione del parametro del metodo Web Beans."
 
-#. Tag: programlisting
-#: events.xml:84
-#, no-c-format
-msgid "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document document, User user) { ... }]]>"
-msgstr "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document document, User user) { ... }]]>"
-
 #. Tag: title
-#: events.xml:89
 #, no-c-format
 msgid "Event producers"
 msgstr "Produttori di eventi"
 
 #. Tag: para
-#: events.xml:91
 #, no-c-format
-msgid "Event producers fire events using an instance of the parameterized <literal>Event</literal> interface. An instance of this interface is obtained by injection:"
+msgid ""
+"Event producers fire events using an instance of the parameterized "
+"<literal>Event</literal> interface. An instance of this interface is "
+"obtained by injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:96
-#, no-c-format
-msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
-msgstr "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
-
 #. Tag: para
-#: events.xml:98
 #, fuzzy, no-c-format
-msgid "A producer raises events by calling the <literal>fire()</literal> method of the <literal>Event</literal> interface, passing the event object:"
-msgstr "Un produttore solleva eventi chiamando il metodo <literal>fire()</literal> dell'intefaccia <literal>Event</literal>, passando un <emphasis>oggetto evento</emphasis>:"
+msgid ""
+"A producer raises events by calling the <literal>fire()</literal> method of "
+"the <literal>Event</literal> interface, passing the event object:"
+msgstr ""
+"Un produttore solleva eventi chiamando il metodo <literal>fire()</literal> "
+"dell'intefaccia <literal>Event</literal>, passando un <emphasis>oggetto "
+"evento</emphasis>:"
 
-#. Tag: programlisting
-#: events.xml:103
-#, no-c-format
-msgid "<![CDATA[documentEvent.fire(document);]]>"
-msgstr "<![CDATA[documentEvent.fire(document);]]>"
-
 #. Tag: para
-#: events.xml:105
 #, fuzzy, no-c-format
 msgid "This particular event will be delivered to every observer method that:"
 msgstr "L'evento verrà consegnato ad ogni metodo osservatore che:"
 
 #. Tag: para
-#: events.xml:111
 #, fuzzy, no-c-format
-msgid "has an event parameter to which the event object (the <literal>Document</literal>) is assignable, and"
+msgid ""
+"has an event parameter to which the event object (the <literal>Document</"
+"literal>) is assignable, and"
 msgstr "ha un parametro evento a cui l'oggetto evento è assegnabile, e"
 
 #. Tag: para
-#: events.xml:115
 #, fuzzy, no-c-format
 msgid "specifies no qualifiers."
 msgstr "non specifica binding d'evento."
 
 #. Tag: para
-#: events.xml:119
 #, fuzzy, no-c-format
-msgid "The container simply calls all the observer methods, passing the event object as the value of the event parameter. If any observer method throws an exception, the container stops calling observer methods, and the exception is rethrown by the <literal>fire()</literal> method."
-msgstr "Il manager Web Bean chiama semplicemente tutti i metodi osservatori, passando l'oggento evento come valore del parametro evento. Se il metodo osservatore lancia un'eccezione, il manager Web Bean smette di chiamare i metodi osservatori, e l'eccezione viene rilanciata dal metodo <literal>fire()</literal>."
+msgid ""
+"The container simply calls all the observer methods, passing the event "
+"object as the value of the event parameter. If any observer method throws an "
+"exception, the container stops calling observer methods, and the exception "
+"is rethrown by the <literal>fire()</literal> method."
+msgstr ""
+"Il manager Web Bean chiama semplicemente tutti i metodi osservatori, "
+"passando l'oggento evento come valore del parametro evento. Se il metodo "
+"osservatore lancia un'eccezione, il manager Web Bean smette di chiamare i "
+"metodi osservatori, e l'eccezione viene rilanciata dal metodo <literal>fire()"
+"</literal>."
 
 #. Tag: para
-#: events.xml:125
 #, no-c-format
 msgid "Qualifiers can be applied to an event in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: events.xml:131
 #, no-c-format
 msgid "by annotating the <literal>Event</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: events.xml:134
 #, no-c-format
-msgid "by passing qualifiers to the <literal>select()</literal> of <literal>Event</literal>."
+msgid ""
+"by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
+"literal>."
 msgstr ""
 
 #. Tag: para
-#: events.xml:138
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is far simpler:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:142
-#, no-c-format
-msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
-msgstr "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
-
 #. Tag: para
-#: events.xml:144
 #, fuzzy, no-c-format
-msgid "Then, every event fired via this instance of <literal>Event</literal> has the event qualifier <literal>@Updated</literal>. The event is delivered to every observer method that:"
-msgstr "Quindi ciascun evento sollevato tramite quest'istanza di <literal>Event</literal> ha annotato l'event binding. L'evento verrà consegnato ad ogni metodo osservatore che:"
+msgid ""
+"Then, every event fired via this instance of <literal>Event</literal> has "
+"the event qualifier <literal>@Updated</literal>. The event is delivered to "
+"every observer method that:"
+msgstr ""
+"Quindi ciascun evento sollevato tramite quest'istanza di <literal>Event</"
+"literal> ha annotato l'event binding. L'evento verrà consegnato ad ogni "
+"metodo osservatore che:"
 
 #. Tag: para
-#: events.xml:151
 #, no-c-format
 msgid "has an event parameter to which the event object is assignable, and"
 msgstr "ha un parametro evento a cui l'oggetto evento è assegnabile, e"
 
 #. Tag: para
-#: events.xml:154
 #, fuzzy, no-c-format
-msgid "does not have any event qualifier <emphasis>except</emphasis> for the event qualifiers that match those specified at the <literal>Event</literal> injection point."
-msgstr "non specifica alcun event binding <emphasis>tranne</emphasis> per gli event binding passati a <literal>fire()</literal>."
+msgid ""
+"does not have any event qualifier <emphasis>except</emphasis> for the event "
+"qualifiers that match those specified at the <literal>Event</literal> "
+"injection point."
+msgstr ""
+"non specifica alcun event binding <emphasis>tranne</emphasis> per gli event "
+"binding passati a <literal>fire()</literal>."
 
 #. Tag: para
-#: events.xml:161
 #, no-c-format
-msgid "The downside of annotating the injection point is that we can't specify the qualifier dynamically. CDI lets us obtain a qualifier instance by subclassing the helper class <literal>AnnotationLiteral</literal>. That way, we can pass the qualifier to the <literal>select()</literal> method of <literal>Event</literal>."
+msgid ""
+"The downside of annotating the injection point is that we can't specify the "
+"qualifier dynamically. CDI lets us obtain a qualifier instance by "
+"subclassing the helper class <literal>AnnotationLiteral</literal>. That way, "
+"we can pass the qualifier to the <literal>select()</literal> method of "
+"<literal>Event</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:167
-#, no-c-format
-msgid "<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire(document);]]>"
-msgstr "<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire(document);]]>"
-
 #. Tag: para
-#: events.xml:169
 #, no-c-format
-msgid "Events can have multiple event qualifiers, assembled using any combination of annotations at the <literal>Event</literal> injection point and qualifier instances passed to the <literal>select()</literal> method."
+msgid ""
+"Events can have multiple event qualifiers, assembled using any combination "
+"of annotations at the <literal>Event</literal> injection point and qualifier "
+"instances passed to the <literal>select()</literal> method."
 msgstr ""
 
 #. Tag: title
-#: events.xml:178
 #, fuzzy, no-c-format
 msgid "Conditional observer methods"
 msgstr "Osservatori transazionali"
 
 #. Tag: para
-#: events.xml:180
 #, no-c-format
-msgid "By default, if there is no instance of an observer in the current context, the container will instantiate the observer in order to deliver an event to it. This behavior isn't always desirable. We may want to deliver events only to instances of the observer that already exist in the current contexts."
+msgid ""
+"By default, if there is no instance of an observer in the current context, "
+"the container will instantiate the observer in order to deliver an event to "
+"it. This behavior isn't always desirable. We may want to deliver events only "
+"to instances of the observer that already exist in the current contexts."
 msgstr ""
 
 #. Tag: para
-#: events.xml:186
 #, no-c-format
-msgid "A conditional observer is specified by adding <literal>receive = IF_EXISTS</literal> to the <literal>@Observes</literal> annotation."
+msgid ""
+"A conditional observer is specified by adding <literal>receive = IF_EXISTS</"
+"literal> to the <literal>@Observes</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:191
-#, no-c-format
-msgid "<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = IF_EXISTS) @Updated Document d) { ... }]]>"
-msgstr "<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = IF_EXISTS) @Updated Document d) { ... }]]>"
-
 #. Tag: para
-#: events.xml:193
 #, no-c-format
-msgid "A bean with scope <literal>@Dependent</literal> cannot be a conditional observer, since it would never be called!"
+msgid ""
+"A bean with scope <literal>@Dependent</literal> cannot be a conditional "
+"observer, since it would never be called!"
 msgstr ""
 
 #. Tag: title
-#: events.xml:200
 #, fuzzy, no-c-format
 msgid "Event qualifiers with members"
 msgstr "Event binding con membri"
 
 #. Tag: para
-#: events.xml:202
 #, fuzzy, no-c-format
 msgid "An event qualifier type may have annotation members:"
 msgstr "Un tipo di event binding può avere membri annotati:"
 
-#. Tag: programlisting
-#: events.xml:204
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"   RoleType value();\n"
-"}]]>"
+"The member value is used to narrow the messages delivered to the observer:"
 msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"   RoleType value();\n"
-"}]]>"
+"Il valore del membro è usato per restringere i messaggi consegnati "
+"all'osservatore:"
 
 #. Tag: para
-#: events.xml:206
-#, no-c-format
-msgid "The member value is used to narrow the messages delivered to the observer:"
-msgstr "Il valore del membro è usato per restringere i messaggi consegnati all'osservatore:"
-
-#. Tag: programlisting
-#: events.xml:208
-#, no-c-format
-msgid "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) { ... }]]>"
-msgstr "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) { ... }]]>"
-
-#. Tag: para
-#: events.xml:210
 #, fuzzy, no-c-format
-msgid "Event qualifier type members may be specified statically by the event producer, via annotations at the event notifier injection point:"
-msgstr "I membri del tipo di eventbinding possono essere specificati staticamente dal produttore di eventi tramite annotazioni nel punto di iniezione del notificatore d'evento:"
+msgid ""
+"Event qualifier type members may be specified statically by the event "
+"producer, via annotations at the event notifier injection point:"
+msgstr ""
+"I membri del tipo di eventbinding possono essere specificati staticamente "
+"dal produttore di eventi tramite annotazioni nel punto di iniezione del "
+"notificatore d'evento:"
 
-#. Tag: programlisting
-#: events.xml:215
-#, no-c-format
-msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
-msgstr "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
-
 #. Tag: para
-#: events.xml:217
 #, fuzzy, no-c-format
-msgid "Alternatively, the value of the event qualifier type member may be determined dynamically by the event producer. We start by writing an abstract subclass of <literal>AnnotationLiteral</literal>:"
-msgstr "Alternativamente il valore del membro del tipo di event binding può esserre dinamicamente determinato dal produttore di eventi. Iniziamo scrivendo una sottoclasse astratta di <literal>AnnotationLiteral</literal>:"
-
-#. Tag: programlisting
-#: events.xml:222
-#, no-c-format
 msgid ""
-"<![CDATA[abstract class RoleBinding \n"
-"   extends AnnotationLiteral<Role> \n"
-"   implements Role {}]]>"
+"Alternatively, the value of the event qualifier type member may be "
+"determined dynamically by the event producer. We start by writing an "
+"abstract subclass of <literal>AnnotationLiteral</literal>:"
 msgstr ""
-"<![CDATA[abstract class RoleBinding \n"
-"   extends AnnotationLiteral<Role> \n"
-"   implements Role {}]]>"
+"Alternativamente il valore del membro del tipo di event binding può esserre "
+"dinamicamente determinato dal produttore di eventi. Iniziamo scrivendo una "
+"sottoclasse astratta di <literal>AnnotationLiteral</literal>:"
 
 #. Tag: para
-#: events.xml:224
 #, fuzzy, no-c-format
-msgid "The event producer passes an instance of this class to <literal>select()</literal>:"
-msgstr "Il produttore di eventi passa un'istanza di questa classe a <literal>fire()</literal>:"
-
-#. Tag: programlisting
-#: events.xml:226
-#, no-c-format
 msgid ""
-"<![CDATA[documentEvent.select(new RoleBinding() {\n"
-"   public void value() { return user.getRole(); }\n"
-"}).fire(document);]]>"
+"The event producer passes an instance of this class to <literal>select()</"
+"literal>:"
 msgstr ""
-"<![CDATA[documentEvent.select(new RoleBinding() {\n"
-"   public void value() { return user.getRole(); }\n"
-"}).fire(document);]]>"
+"Il produttore di eventi passa un'istanza di questa classe a <literal>fire()</"
+"literal>:"
 
 #. Tag: title
-#: events.xml:231
 #, fuzzy, no-c-format
 msgid "Multiple event qualifiers"
 msgstr "Event binding multipli"
 
 #. Tag: para
-#: events.xml:233
 #, fuzzy, no-c-format
 msgid "Event qualifier types may be combined, for example:"
 msgstr "I tipi di event binding possono essere combinati, per esempio:"
 
-#. Tag: programlisting
-#: events.xml:235
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>(){}).fire(document);]]>"
+"When this event occurs, all of the following observer methods will be "
+"notified:"
 msgstr ""
-"<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>(){}).fire(document);]]>"
+"Quando si genera un evento, tutti i seguenti metodi osservatori verranno "
+"notificati:"
 
-#. Tag: para
-#: events.xml:237
-#, no-c-format
-msgid "When this event occurs, all of the following observer methods will be notified:"
-msgstr "Quando si genera un evento, tutti i seguenti metodi osservatori verranno notificati:"
-
-#. Tag: programlisting
-#: events.xml:239
-#, no-c-format
-msgid "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document document) { ... }]]>"
-msgstr "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document document) { ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:241
-#, no-c-format
-msgid "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) { ... }]]>"
-msgstr "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) { ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:242
-#, no-c-format
-msgid "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) { ... }}}]]>"
-msgstr "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) { ... }}}]]>"
-
 #. Tag: title
-#: events.xml:247
 #, no-c-format
 msgid "Transactional observers"
 msgstr "Osservatori transazionali"
 
 #. Tag: para
-#: events.xml:249
 #, no-c-format
-msgid "Transactional observers receive their event notifications during the before or after completion phase of the transaction in which the event was raised. For example, the following observer method needs to refresh a query result set that is cached in the application context, but only when transactions that update the <literal>Category</literal> tree succeed:"
-msgstr "Gli osservatori transazionali ricevono notifiche d'evento prima o dopo la fase di completamento della transazione, nella quale l'evento viene sollevato. Per esempio, il seguente metodo osservatore ha bisogno di aggiornare il set di risultati della query memorizzato nel contesto dell'applicazione, ma solo quando hanno successo le transazioni che aggiornano l'albero <literal>Category</literal>."
+msgid ""
+"Transactional observers receive their event notifications during the before "
+"or after completion phase of the transaction in which the event was raised. "
+"For example, the following observer method needs to refresh a query result "
+"set that is cached in the application context, but only when transactions "
+"that update the <literal>Category</literal> tree succeed:"
+msgstr ""
+"Gli osservatori transazionali ricevono notifiche d'evento prima o dopo la "
+"fase di completamento della transazione, nella quale l'evento viene "
+"sollevato. Per esempio, il seguente metodo osservatore ha bisogno di "
+"aggiornare il set di risultati della query memorizzato nel contesto "
+"dell'applicazione, ma solo quando hanno successo le transazioni che "
+"aggiornano l'albero <literal>Category</literal>."
 
-#. Tag: programlisting
-#: events.xml:256
-#, no-c-format
-msgid "<![CDATA[public void refreshCategoryTree(@Observes(during = AFTER_SUCCESS) CategoryUpdateEvent event) { ... }]]>"
-msgstr "<![CDATA[public void refreshCategoryTree(@Observes(during = AFTER_SUCCESS) CategoryUpdateEvent event) { ... }]]>"
-
 #. Tag: para
-#: events.xml:258
 #, fuzzy, no-c-format
 msgid "There are five kinds of transactional observers:"
 msgstr "Ci sono tre tipi di osservatori transazionali:"
 
 #. Tag: para
-#: events.xml:262
 #, no-c-format
-msgid "<literal>IN_PROGESS</literal> observers are called immediately (default)"
+msgid ""
+"<literal>IN_PROGESS</literal> observers are called immediately (default)"
 msgstr ""
 
 #. Tag: para
-#: events.xml:265
 #, fuzzy, no-c-format
-msgid "<literal>AFTER_SUCCESS</literal> observers are called during the after completion phase of the transaction, but only if the transaction completes successfully"
-msgstr "gli osservatori <literal>@AfterTransactionSuccess</literal> vengono chiamati dopo la fase di completamento della transazione, ma solo se questa si completa con successo"
+msgid ""
+"<literal>AFTER_SUCCESS</literal> observers are called during the after "
+"completion phase of the transaction, but only if the transaction completes "
+"successfully"
+msgstr ""
+"gli osservatori <literal>@AfterTransactionSuccess</literal> vengono chiamati "
+"dopo la fase di completamento della transazione, ma solo se questa si "
+"completa con successo"
 
 #. Tag: para
-#: events.xml:271
 #, fuzzy, no-c-format
-msgid "<literal>AFTER_FAILURE</literal> observers are called during the after completion phase of the transaction, but only if the transaction fails to complete successfully"
-msgstr "gli osservatori <literal>@AfterTransactionFailure</literal> vengono chiamati dopo la fase di completamento della transazione, ma solo se questa fallisce e quindi non completa con successo"
+msgid ""
+"<literal>AFTER_FAILURE</literal> observers are called during the after "
+"completion phase of the transaction, but only if the transaction fails to "
+"complete successfully"
+msgstr ""
+"gli osservatori <literal>@AfterTransactionFailure</literal> vengono chiamati "
+"dopo la fase di completamento della transazione, ma solo se questa fallisce "
+"e quindi non completa con successo"
 
 #. Tag: para
-#: events.xml:277
 #, fuzzy, no-c-format
-msgid "<literal>AFTER_COMPLETION</literal> observers are called during the after completion phase of the transaction"
-msgstr "gli osservatori <literal>@AfterTransactionCompletion</literal> vengono chiamati dopo la fase di completamento della transazione"
+msgid ""
+"<literal>AFTER_COMPLETION</literal> observers are called during the after "
+"completion phase of the transaction"
+msgstr ""
+"gli osservatori <literal>@AfterTransactionCompletion</literal> vengono "
+"chiamati dopo la fase di completamento della transazione"
 
 #. Tag: para
-#: events.xml:283
 #, fuzzy, no-c-format
-msgid "<literal>BEFORE_COMPLETION</literal> observers are called during the before completion phase of the transaction"
-msgstr "gli osservatori <literal>@BeforeTransactionCompletion</literal> vengono chiamati prima della fase di completamento della transazione"
+msgid ""
+"<literal>BEFORE_COMPLETION</literal> observers are called during the before "
+"completion phase of the transaction"
+msgstr ""
+"gli osservatori <literal>@BeforeTransactionCompletion</literal> vengono "
+"chiamati prima della fase di completamento della transazione"
 
 #. Tag: para
-#: events.xml:290
 #, fuzzy, no-c-format
-msgid "Transactional observers are very important in a stateful object model because state is often held for longer than a single atomic transaction."
-msgstr "Gli osservatori transazionali sono molto importanti in un modello ad oggetto stateful come Web Beans, poiché lo stato è spesso mantenuto per un tempo più lungo di una singola transazione atomica."
+msgid ""
+"Transactional observers are very important in a stateful object model "
+"because state is often held for longer than a single atomic transaction."
+msgstr ""
+"Gli osservatori transazionali sono molto importanti in un modello ad oggetto "
+"stateful come Web Beans, poiché lo stato è spesso mantenuto per un tempo più "
+"lungo di una singola transazione atomica."
 
 #. Tag: para
-#: events.xml:295
 #, no-c-format
-msgid "Imagine that we have cached a JPA query result set in the application scope:"
-msgstr "Si immagini di avere cachato un risultato di query JPA nello scope di applicazione:"
-
-#. Tag: programlisting
-#: events.xml:297
-#, no-c-format
 msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   List<Product> products;\n"
-"\n"
-"   @Produces @Catalog \n"
-"   List<Product> getCatalog() {\n"
-"      if (products==null) {\n"
-"         products = em.createQuery(\"select p from Product p where p.deleted = false\")\n"
-"            .getResultList();\n"
-"      }\n"
-"      return products;\n"
-"   }\n"
-"    \n"
-"}]]>"
+"Imagine that we have cached a JPA query result set in the application scope:"
 msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   List<Product> products;\n"
-"\n"
-"   @Produces @Catalog \n"
-"   List<Product> getCatalog() {\n"
-"      if (products==null) {\n"
-"         products = em.createQuery(\"select p from Product p where p.deleted = false\")\n"
-"            .getResultList();\n"
-"      }\n"
-"      return products;\n"
-"   }\n"
-"    \n"
-"}]]>"
+"Si immagini di avere cachato un risultato di query JPA nello scope di "
+"applicazione:"
 
 #. Tag: para
-#: events.xml:299
 #, no-c-format
-msgid "From time to time, a <literal>Product</literal> is created or deleted. When this occurs, we need to refresh the <literal>Product</literal> catalog. But we should wait until <emphasis>after</emphasis> the transaction completes successfully before performing this refresh!"
-msgstr "Di tanto in tanto un <literal>Product</literal> viene creato o cancellato. Quando questo avviene occorre aggiornare il catalogo del <literal>Product</literal>. Ma si dovrebbe aspettare che la transazione  <emphasis>abbia completato</emphasis> con successo prima di eseguire l'aggiornamento!"
+msgid ""
+"From time to time, a <literal>Product</literal> is created or deleted. When "
+"this occurs, we need to refresh the <literal>Product</literal> catalog. But "
+"we should wait until <emphasis>after</emphasis> the transaction completes "
+"successfully before performing this refresh!"
+msgstr ""
+"Di tanto in tanto un <literal>Product</literal> viene creato o cancellato. "
+"Quando questo avviene occorre aggiornare il catalogo del <literal>Product</"
+"literal>. Ma si dovrebbe aspettare che la transazione  <emphasis>abbia "
+"completato</emphasis> con successo prima di eseguire l'aggiornamento!"
 
 #. Tag: para
-#: events.xml:305
 #, fuzzy, no-c-format
-msgid "The bean that creates and deletes <literal>Product</literal>s could raise events, for example:"
-msgstr "Il Web Bean che crea o cancella <literal>Product</literal> può sollevare eventi, per esempio:"
-
-#. Tag: programlisting
-#: events.xml:309
-#, no-c-format
 msgid ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"   @PersistenceContext EntityManager em;\n"
-"   @Inject @Any Event<Product> productEvent;\n"
-"\n"
-"   public void delete(Product product) {\n"
-"      em.delete(product);\n"
-"      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire(product);\n"
-"   }\n"
-"    \n"
-"   public void persist(Product product) {\n"
-"      em.persist(product);\n"
-"      productEvent.select(new AnnotationLiteral<Created>(){}).fire(product);\n"
-"   }\n"
-"   ...\n"
-"}]]>"
+"The bean that creates and deletes <literal>Product</literal>s could raise "
+"events, for example:"
 msgstr ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"   @PersistenceContext EntityManager em;\n"
-"   @Inject @Any Event<Product> productEvent;\n"
-"\n"
-"   public void delete(Product product) {\n"
-"      em.delete(product);\n"
-"      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire(product);\n"
-"   }\n"
-"    \n"
-"   public void persist(Product product) {\n"
-"      em.persist(product);\n"
-"      productEvent.select(new AnnotationLiteral<Created>(){}).fire(product);\n"
-"   }\n"
-"   ...\n"
-"}]]>"
+"Il Web Bean che crea o cancella <literal>Product</literal> può sollevare "
+"eventi, per esempio:"
 
 #. Tag: para
-#: events.xml:311
 #, no-c-format
-msgid "And now <literal>Catalog</literal> can observe the events after successful completion of the transaction:"
-msgstr "E ora <literal>Catalog</literal> può osservare gli eventi dopo il completamento (con successo) della transazione:"
-
-#. Tag: programlisting
-#: events.xml:315
-#, no-c-format
 msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"   ...\n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product product) {\n"
-"      products.add(product);\n"
-"   }\n"
-"    \n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product product) {\n"
-"      products.remove(product);\n"
-"   }\n"
-"}]]>"
+"And now <literal>Catalog</literal> can observe the events after successful "
+"completion of the transaction:"
 msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"   ...\n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product product) {\n"
-"      products.add(product);\n"
-"   }\n"
-"    \n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product product) {\n"
-"      products.remove(product);\n"
-"   }\n"
-"}]]>"
+"E ora <literal>Catalog</literal> può osservare gli eventi dopo il "
+"completamento (con successo) della transazione:"
 
 #~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({FIELD, PARAMETER})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({FIELD, PARAMETER})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+
+#~ msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
+#~ msgstr "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
+
+#~ msgid "<![CDATA[documentEvent.fire(document);]]>"
+#~ msgstr "<![CDATA[documentEvent.fire(document);]]>"
+
+#~ msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
+#~ msgstr "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
+#~ "(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
+#~ "(document);]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = "
+#~ "IF_EXISTS) @Updated Document d) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = "
+#~ "IF_EXISTS) @Updated Document d) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "   RoleType value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "   RoleType value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+
+#~ msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
+#~ msgstr "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "   extends AnnotationLiteral<Role> \n"
+#~ "   implements Role {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "   extends AnnotationLiteral<Role> \n"
+#~ "   implements Role {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new RoleBinding() {\n"
+#~ "   public void value() { return user.getRole(); }\n"
+#~ "}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.select(new RoleBinding() {\n"
+#~ "   public void value() { return user.getRole(); }\n"
+#~ "}).fire(document);]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>()"
+#~ "{}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>()"
+#~ "{}).fire(document);]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void refreshCategoryTree(@Observes(during = "
+#~ "AFTER_SUCCESS) CategoryUpdateEvent event) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void refreshCategoryTree(@Observes(during = "
+#~ "AFTER_SUCCESS) CategoryUpdateEvent event) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   List<Product> products;\n"
+#~ "\n"
+#~ "   @Produces @Catalog \n"
+#~ "   List<Product> getCatalog() {\n"
+#~ "      if (products==null) {\n"
+#~ "         products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "            .getResultList();\n"
+#~ "      }\n"
+#~ "      return products;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   List<Product> products;\n"
+#~ "\n"
+#~ "   @Produces @Catalog \n"
+#~ "   List<Product> getCatalog() {\n"
+#~ "      if (products==null) {\n"
+#~ "         products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "            .getResultList();\n"
+#~ "      }\n"
+#~ "      return products;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "   @Inject @Any Event<Product> productEvent;\n"
+#~ "\n"
+#~ "   public void delete(Product product) {\n"
+#~ "      em.delete(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void persist(Product product) {\n"
+#~ "      em.persist(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "   @Inject @Any Event<Product> productEvent;\n"
+#~ "\n"
+#~ "   public void delete(Product product) {\n"
+#~ "      em.delete(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void persist(Product product) {\n"
+#~ "      em.persist(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "   ...\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "   ...\n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
+#~ "product) {\n"
+#~ "      products.add(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
+#~ "product) {\n"
+#~ "      products.remove(product);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "   ...\n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
+#~ "product) {\n"
+#~ "      products.add(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
+#~ "product) {\n"
+#~ "      products.remove(product);\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "The Web Beans event notification facility allows Web Beans to interact in "
 #~ "a totally decoupled manner. Event <emphasis>producers</emphasis> raise "
 #~ "events that are then delivered to event <emphasis>observers</emphasis> by "
@@ -627,18 +737,21 @@
 #~ "<emphasis>osservatori</emphasis> di eventi tramite il manager Web Bean. "
 #~ "Lo schema base può suonare simile al familiare pattern observer/"
 #~ "observable, ma ci sono un paio di differenze:"
+
 #~ msgid ""
 #~ "We specify the event bindings of the observer method by annotating the "
 #~ "event parameter:"
 #~ msgstr ""
 #~ "Specifichiamo i binding di evento del metodo osservatore annotando il "
 #~ "parametro evento:"
+
 #~ msgid ""
 #~ "The event producer may obtain an <emphasis>event notifier</emphasis> "
 #~ "object by injection:"
 #~ msgstr ""
 #~ "Il produttore dell'evento può ottenere tramite iniezione un oggetto "
 #~ "<emphasis>notificatore d'evento</emphasis>:"
+
 #~ msgid ""
 #~ "The <literal>@Observable</literal> annotation implicitly defines a Web "
 #~ "Bean with scope <literal>@Dependent</literal> and deployment type "
@@ -649,6 +762,7 @@
 #~ "Web Bean con scope <literal>@Dependent</literal> e tipo di deploy "
 #~ "<literal>@Standard</literal>, con un'implementazione fornita dal manager "
 #~ "Web Bean."
+
 #~ msgid ""
 #~ "An event object may be an instance of any Java class that has no type "
 #~ "variables or wildcard type parameters. The event will be delivered to "
@@ -657,6 +771,7 @@
 #~ "Un oggetto evento può essere un'istanza di una classe Java che non ha "
 #~ "variabili tipo o parametri tipo wildcard. L'evento verrà consegnato ad "
 #~ "ogni metodo osservatore che:"
+
 #~ msgid ""
 #~ "To specify a \"selector\", the event producer may pass an instance of the "
 #~ "event binding type to the <literal>fire()</literal> method:"
@@ -664,6 +779,7 @@
 #~ "Per specificare un \"selettore\" il produttore d'evento può passare "
 #~ "un'istanza del tipo di binding d'evento al metodo <literal>fire()</"
 #~ "literal>:"
+
 #~ msgid ""
 #~ "The helper class <literal>AnnotationLiteral</literal> makes it possible "
 #~ "to instantiate binding types inline, since this is otherwise difficult to "
@@ -672,10 +788,10 @@
 #~ "La classe helper <literal>AnnotationLiteral</literal> rende possibile "
 #~ "istanziare inline i tipi di binding, dato che questo risulta difficile da "
 #~ "fare in Java."
+
 #~ msgid ""
 #~ "Alternatively, event bindings may be specified by annotating the event "
 #~ "notifier injection point:"
 #~ msgstr ""
 #~ "In alternativa gli event binding possono essere specificati annotando il "
 #~ "punto di iniezione del notificato d'evento:"
-

Modified: doc/trunk/reference/it-IT/example.po
===================================================================
--- doc/trunk/reference/it-IT/example.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/example.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-23 21:19+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: example.xml:4
 #, no-c-format
 msgid "JSF web application example"
 msgstr "Esempio di applicazione web JSF"
 
 #. Tag: para
-#: example.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "Let's illustrate these ideas with a full example. We're going to implement "
@@ -34,109 +32,18 @@
 "definiamo un Web Bean che mantenga username e password digitati durante il "
 "login:"
 
-#. Tag: programlisting
-#: example.xml:12
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    @NotNull @Length(min=3, max=25)\n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    @NotNull @Length(min=6, max=20)\n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:14
 #, fuzzy, no-c-format
 msgid "This bean is bound to the login prompt in the following JSF form:"
 msgstr ""
 "Questo Web Bean è associato al login all'interno della seguente form JSF:"
 
-#. Tag: programlisting
-#: example.xml:16
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<h:form>\n"
-"   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"      <f:validateBean>\n"
-"         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"         <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"         <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"      </f:validateBean>\n"
-"   </h:panelGrid>\n"
-"   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-msgstr ""
-"<![CDATA[<h:form>\n"
-"   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"      <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"      <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"      <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"      <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"   </h:panelGrid>\n"
-"   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-
 #. Tag: para
-#: example.xml:18
 #, no-c-format
 msgid "Users are represented by a JPA entity:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:22
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Entity\n"
-"public class User {\n"
-"   private @NotNull @Length(min=3, max=25) @Id String username;\n"
-"   private @NotNull @Length(min=6, max=20) String password;\n"
-"   \n"
-"   public String getUsername() { return username; }\n"
-"   public void setUsername(String username) { this.username = username; }\n"
-"   public String setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:24
 #, no-c-format
 msgid ""
 "(Note that we're also going to need a <literal>persistence.xml</literal> "
@@ -145,7 +52,6 @@
 msgstr ""
 
 #. Tag: para
-#: example.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "The actual work is done by a session-scoped bean that maintains information "
@@ -156,145 +62,21 @@
 "informazioni sull'utente correntemente loggato ed espone l'entity "
 "<literal>User</literal> agli altri Web Beans:"
 
-#. Tag: programlisting
-#: example.xml:34
-#, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login implements Serializable {\n"
-"\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject @UserDatabase EntityManager userDatabase;\n"
-"\n"
-"   private User user;\n"
-"    \n"
-"   public void login() {\n"
-"      List<User> results = userDatabase.createQuery(\n"
-"         \"select u from User u where u.username = :username and u.password "
-"= :password\")\n"
-"         .setParameter(\"username\", credentials.getUsername())\n"
-"         .setParameter(\"password\", credentials.getPassword())\n"
-"         .getResultList();\n"
-"        \n"
-"      if (!results.isEmpty()) {\n"
-"         user = results.get(0);\n"
-"      }\n"
-"      else {\n"
-"         // perhaps add code here to report a failed login\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void logout() {\n"
-"      user = null;\n"
-"   }\n"
-"    \n"
-"   public boolean isLoggedIn() {\n"
-"      return user != null;\n"
-"   }\n"
-"    \n"
-"   @Produces @LoggedIn User getCurrentUser() {\n"
-"      return user;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login implements Serializable {\n"
-"\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject @UserDatabase EntityManager userDatabase;\n"
-"\n"
-"   private User user;\n"
-"    \n"
-"   public void login() {\n"
-"      List<User> results = userDatabase.createQuery(\n"
-"         \"select u from User u where u.username = :username and u.password "
-"= :password\")\n"
-"         .setParameter(\"username\", credentials.getUsername())\n"
-"         .setParameter(\"password\", credentials.getPassword())\n"
-"         .getResultList();\n"
-"        \n"
-"      if (!results.isEmpty()) {\n"
-"         user = results.get(0);\n"
-"      }\n"
-"      else {\n"
-"         // perhaps add code here to report a failed login\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void logout() {\n"
-"      user = null;\n"
-"   }\n"
-"    \n"
-"   public boolean isLoggedIn() {\n"
-"      return user != null;\n"
-"   }\n"
-"    \n"
-"   @Produces @LoggedIn User getCurrentUser() {\n"
-"      return user;\n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:36
 #, no-c-format
 msgid ""
 "<literal>@LoggedIn</literal> and <literal>@UserDatabase</literal> are custom "
 "qualifier annotations:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:38
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"public @interface LoggedIn {}]]>"
-msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"public @interface LoggedIn {}]]>"
-
-#. Tag: programlisting
-#: example.xml:40
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, PARAMETER, FIELD})\n"
-"public @interface UserDatabase {}]]>"
-msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, PARAMETER, FIELD})\n"
-"public @interface UserDatabase {}]]>"
-
 #. Tag: para
-#: example.xml:42
 #, no-c-format
 msgid ""
 "We need an adaptor bean to expose our typesafe <literal>EntityManager</"
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:46
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[class UserDatabaseProducer {\n"
-"   @Produces @UserDatabase @PersistenceContext \n"
-"   static EntityManager userDatabase;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class UserDatabaseProducer {\n"
-"   @Produces @UserDatabase @PersistenceContext EntityManager userDatabase;\n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "Now <literal>DocumentEditor</literal>, or any other bean, can easily inject "
@@ -302,52 +84,12 @@
 msgstr ""
 "Ora qualsiasi altro Web Bean può facilmente iniettare l'utente corrente:"
 
-#. Tag: programlisting
-#: example.xml:50
-#, no-c-format
-msgid ""
-"<![CDATA[public class DocumentEditor {\n"
-"   @Inject Document document;\n"
-"   @Inject @LoggedIn User currentUser;\n"
-"   @Inject @DocumentDatabase EntityManager docDatabase;\n"
-"    \n"
-"   public void save() {\n"
-"      document.setCreatedBy(currentUser);\n"
-"      docDatabase.persist(document);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class DocumentEditor {\n"
-"   @Inject Document document;\n"
-"   @Inject @LoggedIn User currentUser;\n"
-"   @Inject @DocumentDatabase EntityManager docDatabase;\n"
-"    \n"
-"   public void save() {\n"
-"      document.setCreatedBy(currentUser);\n"
-"      docDatabase.persist(document);\n"
-"   }\n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:52
 #, no-c-format
 msgid "Or we can reference the current user in a JSF view:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:54
-#, no-c-format
-msgid ""
-"<![CDATA[<h:panelGroup rendered=\"#{login.loggedIn}\">\n"
-"   signed in as #{currentUser.username}\n"
-"</h:panelGroup>]]>"
-msgstr ""
-"<![CDATA[<h:panelGroup rendered=\"#{login.loggedIn}\">\n"
-"   signed in as #{currentUser.username}\n"
-"</h:panelGroup>]]>"
-
 #. Tag: para
-#: example.xml:56
 #, fuzzy, no-c-format
 msgid ""
 "Hopefully, this example gave you a taste of the CDI programming model. In "
@@ -357,5 +99,240 @@
 "prossimo capitolo esploreremo la dependency injection dei Web Bean con "
 "maggior profondità."
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=3, max=25)\n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=6, max=20)\n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<h:form>\n"
+#~ "   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "      <f:validateBean>\n"
+#~ "         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"username\" value=\"#{credentials.username}\"/"
+#~ ">\n"
+#~ "         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"password\" value=\"#{credentials.password}\"/"
+#~ ">\n"
+#~ "      </f:validateBean>\n"
+#~ "   </h:panelGrid>\n"
+#~ "   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#"
+#~ "{!login.loggedIn}\"/>\n"
+#~ "   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</h:form>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<h:form>\n"
+#~ "   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "      <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "      <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
+#~ "      <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "      <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
+#~ "   </h:panelGrid>\n"
+#~ "   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#"
+#~ "{!login.loggedIn}\"/>\n"
+#~ "   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</h:form>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Entity\n"
+#~ "public class User {\n"
+#~ "   private @NotNull @Length(min=3, max=25) @Id String username;\n"
+#~ "   private @NotNull @Length(min=6, max=20) String password;\n"
+#~ "   \n"
+#~ "   public String getUsername() { return username; }\n"
+#~ "   public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "   public String setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login implements Serializable {\n"
+#~ "\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject @UserDatabase EntityManager userDatabase;\n"
+#~ "\n"
+#~ "   private User user;\n"
+#~ "    \n"
+#~ "   public void login() {\n"
+#~ "      List<User> results = userDatabase.createQuery(\n"
+#~ "         \"select u from User u where u.username = :username and u."
+#~ "password = :password\")\n"
+#~ "         .setParameter(\"username\", credentials.getUsername())\n"
+#~ "         .setParameter(\"password\", credentials.getPassword())\n"
+#~ "         .getResultList();\n"
+#~ "        \n"
+#~ "      if (!results.isEmpty()) {\n"
+#~ "         user = results.get(0);\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         // perhaps add code here to report a failed login\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void logout() {\n"
+#~ "      user = null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public boolean isLoggedIn() {\n"
+#~ "      return user != null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "      return user;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login implements Serializable {\n"
+#~ "\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject @UserDatabase EntityManager userDatabase;\n"
+#~ "\n"
+#~ "   private User user;\n"
+#~ "    \n"
+#~ "   public void login() {\n"
+#~ "      List<User> results = userDatabase.createQuery(\n"
+#~ "         \"select u from User u where u.username = :username and u."
+#~ "password = :password\")\n"
+#~ "         .setParameter(\"username\", credentials.getUsername())\n"
+#~ "         .setParameter(\"password\", credentials.getPassword())\n"
+#~ "         .getResultList();\n"
+#~ "        \n"
+#~ "      if (!results.isEmpty()) {\n"
+#~ "         user = results.get(0);\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         // perhaps add code here to report a failed login\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void logout() {\n"
+#~ "      user = null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public boolean isLoggedIn() {\n"
+#~ "      return user != null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "      return user;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface LoggedIn {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface LoggedIn {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface UserDatabase {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface UserDatabase {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[class UserDatabaseProducer {\n"
+#~ "   @Produces @UserDatabase @PersistenceContext \n"
+#~ "   static EntityManager userDatabase;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class UserDatabaseProducer {\n"
+#~ "   @Produces @UserDatabase @PersistenceContext EntityManager "
+#~ "userDatabase;\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "   @Inject Document document;\n"
+#~ "   @Inject @LoggedIn User currentUser;\n"
+#~ "   @Inject @DocumentDatabase EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "   public void save() {\n"
+#~ "      document.setCreatedBy(currentUser);\n"
+#~ "      docDatabase.persist(document);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "   @Inject Document document;\n"
+#~ "   @Inject @LoggedIn User currentUser;\n"
+#~ "   @Inject @DocumentDatabase EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "   public void save() {\n"
+#~ "      document.setCreatedBy(currentUser);\n"
+#~ "      docDatabase.persist(document);\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<h:panelGroup rendered=\"#{login.loggedIn}\">\n"
+#~ "   signed in as #{currentUser.username}\n"
+#~ "</h:panelGroup>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<h:panelGroup rendered=\"#{login.loggedIn}\">\n"
+#~ "   signed in as #{currentUser.username}\n"
+#~ "</h:panelGroup>]]>"
+
 #~ msgid "Of course, <literal>@LoggedIn</literal> is a binding annotation:"
 #~ msgstr "<literal>@LoggedIn</literal> è un'annotazione di binding:"

Modified: doc/trunk/reference/it-IT/extend.po
===================================================================
--- doc/trunk/reference/it-IT/extend.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/extend.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2008-12-20 16:41+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: extend.xml:5
 #, no-c-format
 msgid "Portable extensions"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "CDI is intended to be a foundation for frameworks, extensions and "
@@ -35,13 +33,11 @@
 "sono state prese in considerazione dai progettisti di Web Beans:"
 
 #. Tag: para
-#: extend.xml:15
 #, no-c-format
 msgid "integration with Business Process Management engines,"
 msgstr "Integrazione con i motori di Gestione dei Processi di Business,"
 
 #. Tag: para
-#: extend.xml:18
 #, no-c-format
 msgid ""
 "integration with third-party frameworks such as Spring, Seam, GWT or Wicket, "
@@ -50,31 +46,26 @@
 "integrazione con framework di terze-parti quali Spring, Seam, GWT o Wicket, e"
 
 #. Tag: para
-#: extend.xml:23
 #, fuzzy, no-c-format
 msgid "new technology based upon the CDI programming model."
 msgstr "nuova tecnologia basata sul modello di programmazione di Web Beans."
 
 #. Tag: para
-#: extend.xml:27
 #, no-c-format
 msgid "More formally, according to the spec:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:32
 #, no-c-format
 msgid "A portable extension may integrate with the container by:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:35
 #, no-c-format
 msgid "Providing its own beans, interceptors and decorators to the container"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:40
 #, no-c-format
 msgid ""
 "Injecting dependencies into its own objects using the dependency injection "
@@ -82,13 +73,11 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:45
 #, no-c-format
 msgid "Providing a context implementation for a custom scope"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:50
 #, no-c-format
 msgid ""
 "Augmenting or overriding the annotation-based metadata with metadata from "
@@ -96,13 +85,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:58
 #, fuzzy, no-c-format
 msgid "Creating an <literal>Extension</literal>"
 msgstr "La classe <literal>Bean</literal>"
 
 #. Tag: para
-#: extend.xml:60
 #, no-c-format
 msgid ""
 "The first step in creating a portable extension is to write a class that "
@@ -111,14 +98,7 @@
 "service provider architecture."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:66
-#, no-c-format
-msgid "class MyExtension implements Extension { ... }"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:68
 #, no-c-format
 msgid ""
 "Next, we need to register our extension as a service provider by creating a "
@@ -126,14 +106,7 @@
 "literal>, which contains the name of our extension class:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:74
-#, no-c-format
-msgid "org.mydomain.extension.MyExtension"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:76
 #, no-c-format
 msgid ""
 "An extension is not a bean, exactly, since it is instantiated by the "
@@ -142,18 +115,7 @@
 "process is complete."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:82
-#, no-c-format
-msgid ""
-"@Inject \n"
-"MyBean(MyExtension myExtension) {\n"
-"   myExtension.doSomething();\n"
-"}"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:84
 #, no-c-format
 msgid ""
 "And, like beans, extensions can have observer methods. Usually, the observer "
@@ -161,33 +123,28 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:92
 #, no-c-format
 msgid "Container lifecycle events"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:94
 #, no-c-format
 msgid ""
 "During the initialization process, the container fires a series of events, "
 "including:"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:101
-#, no-c-format
-msgid "BeforeBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>BeforeBeanDiscovery</literal>"
+msgstr "L'oggetto <literal>Manager</literal>"
 
-#. Tag: literal
-#: extend.xml:106
-#, no-c-format
-msgid "ProcessAnnotatedType"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>ProcessAnnotatedType</literal>"
+msgstr "L'oggetto <literal>Manager</literal>"
 
 #. Tag: para
-#: extend.xml:110
 #, no-c-format
 msgid ""
 "<literal>ProcessInjectionTarget</literal> and <literal>ProcessProducer</"
@@ -195,54 +152,27 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:115
 #, no-c-format
 msgid ""
 "<literal>ProcessBean</literal> and <literal>ProcessObserverMethod</literal>"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:121
-#, no-c-format
-msgid "AfterBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>AfterBeanDiscovery</literal>"
+msgstr "L'oggetto <literal>Manager</literal>"
 
-#. Tag: literal
-#: extend.xml:126
+#. Tag: para
 #, no-c-format
-msgid "AfterDeploymentValidation"
+msgid "<literal>AfterDeploymentValidation</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:131
 #, no-c-format
 msgid "Extensions may observe these events:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:135
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"   \n"
-"   void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bbd) {\n"
-"      Logger.global.debug(\"beginning the scanning process\");\n"
-"   }\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      Logger.global.debug(\"scanning type: \" + pat.getAnnotatedType()."
-"getJavaClass().getName());\n"
-"   } \n"
-"\n"
-"   void afterBeanDiscovery(@Observes AfterBeanDiscovery abd) {\n"
-"      Logger.global.debug(\"finished the scanning process\");\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:137
 #, no-c-format
 msgid ""
 "In fact, the extension can do a lot more than just observe. The extension is "
@@ -250,45 +180,19 @@
 "example:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:142
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      //tell the container to ignore the type if it is annotated @Ignore\n"
-"      if ( pat.getAnnotatedType().isAnnotionPresent(Ignore.class) ) pat.veto"
-"();   \n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:144
 #, fuzzy, no-c-format
 msgid "The observer method may inject a <literal>BeanManager</literal>"
 msgstr ""
 "Il nervo centrale per l'estensione di Web Beans è l'oggetto "
 "<literal>Manager</literal>."
 
-#. Tag: programlisting
-#: extend.xml:148
-#, no-c-format
-msgid ""
-"<![CDATA[<T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> "
-"pat, BeanManager beanManager) { ... }]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:153
 #, fuzzy, no-c-format
 msgid "The <literal>BeanManager</literal> object"
 msgstr "L'oggetto <literal>Manager</literal>"
 
 #. Tag: para
-#: extend.xml:155
 #, fuzzy, no-c-format
 msgid ""
 "The nerve center for extending CDI is the <literal>BeanManager</literal> "
@@ -299,54 +203,7 @@
 "programmaticamente interceptor, decoratori, osservatori e contesti di Web "
 "Beans."
 
-#. Tag: programlisting
-#: extend.xml:161
-#, no-c-format
-msgid ""
-"<![CDATA[public interface BeanManager {\n"
-"   public Object getReference(Bean<?> bean, Type beanType, "
-"CreationalContext<?> ctx);\n"
-"   public Object getInjectableReference(InjectionPoint ij, "
-"CreationalContext<?> ctx);\n"
-"   public <T> CreationalContext<T> createCreationalContext(Contextual<T> "
-"contextual);\n"
-"   public Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers);\n"
-"   public Set<Bean<?>> getBeans(String name);\n"
-"   public Bean<?> getPassivationCapableBean(String id);\n"
-"   public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);\n"
-"   public void validate(InjectionPoint injectionPoint);\n"
-"   public void fireEvent(Object event, Annotation... qualifiers);\n"
-"   public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, "
-"Annotation... qualifiers);\n"
-"   public List<Decorator<?>> resolveDecorators(Set<Type> types, "
-"Annotation... qualifiers);\n"
-"   public List<Interceptor<?>> resolveInterceptors(InterceptionType type, "
-"Annotation... interceptorBindings);\n"
-"   public boolean isScope(Class<? extends Annotation> annotationType);\n"
-"   public boolean isNormalScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isPassivatingScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isQualifier(Class<? extends Annotation> annotationType);\n"
-"   public boolean isInterceptorBinding(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isStereotype(Class<? extends Annotation> annotationType);\n"
-"   public Set<Annotation> getInterceptorBindingDefinition(Class<? extends "
-"Annotation> bindingType);\n"
-"   public Set<Annotation> getStereotypeDefinition(Class<? extends "
-"Annotation> stereotype);\n"
-"   public Context getContext(Class<? extends Annotation> scopeType);\n"
-"   public ELResolver getELResolver();\n"
-"   public ExpressionFactory wrapExpressionFactory(ExpressionFactory "
-"expressionFactory);\n"
-"   public <T> AnnotatedType<T> createAnnotatedType(Class<T> type);\n"
-"   public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> "
-"type);\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:163
 #, fuzzy, no-c-format
 msgid ""
 "Any bean or other Java EE component which supports injection can obtain an "
@@ -354,14 +211,7 @@
 msgstr ""
 "Possiamo ottenere un'istanza di <literal>Manager</literal> via iniezione:"
 
-#. Tag: programlisting
-#: extend.xml:166
-#, fuzzy, no-c-format
-msgid "@Inject BeanManager beanManager;"
-msgstr "@Current Manager manager"
-
 #. Tag: para
-#: extend.xml:168
 #, no-c-format
 msgid ""
 "Java EE components may obtain an instance of <literal>BeanManager</literal> "
@@ -371,7 +221,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:174
 #, fuzzy, no-c-format
 msgid ""
 "Let's study some of the interfaces exposed by the <literal>BeanManager</"
@@ -381,13 +230,11 @@
 "<literal>Manager</literal>."
 
 #. Tag: title
-#: extend.xml:179
 #, fuzzy, no-c-format
 msgid "The <literal>InjectionTarget</literal> interface"
 msgstr "L'interfaccia <literal>Context</literal>"
 
 #. Tag: para
-#: extend.xml:181
 #, no-c-format
 msgid ""
 "The first thing that a framework developer is going to look for in the "
@@ -397,7 +244,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:188
 #, no-c-format
 msgid ""
 "We recommend that frameworks let CDI take over the job of actually "
@@ -408,50 +254,12 @@
 "field injection will be supported."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:196
-#, no-c-format
-msgid ""
-"<![CDATA[//get the BeanManager from JNDI\n"
-"BeanManager beanManager = (BeanManager) new InitialContext().lookup(\"java:"
-"comp/BeanManager\");\n"
-"\n"
-"//CDI uses an AnnotatedType object to read the annotations of a class\n"
-"AnnotatedType<SomeFrameworkComponent> type = beanManager.createAnnotatedType"
-"(SomeFrameworkComponent.class);\n"
-"\n"
-"//The extension uses an InjectionTarget to delegate instantiation, "
-"dependency injection \n"
-"//and lifecycle callbacks to the CDI container\n"
-"InjectionTarget<SomeFrameworkComponent> it = beanManager."
-"createInjectionTarget(type);\n"
-"\n"
-"//each instance needs its own CDI CreationalContext\n"
-"CreationalContext ctx = beanManager.createCreationalContext(null);\n"
-"\n"
-"//instantiate the framework component and inject its dependencies\n"
-"SomeFrameworkComponent instance = it.produce(ctx);  //call the constructor\n"
-"it.inject(instance, ctx);  //call initializer methods and perform field "
-"injection\n"
-"it.postConstruct(instance);  //call the @PostConstruct method\n"
-"\n"
-"...\n"
-"\n"
-"//destroy the framework component instance and clean up dependent objects\n"
-"it.preDestroy(instance);  //call the @PreDestroy method\n"
-"it.dispose(instance);  //it is now safe to discard the instance\n"
-"ctx.release();  //clean up dependent objects\n"
-"]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:201
 #, fuzzy, no-c-format
 msgid "The <literal>Bean</literal> interface"
 msgstr "L'interfaccia <literal>Context</literal>"
 
 #. Tag: para
-#: extend.xml:203
 #, fuzzy, no-c-format
 msgid ""
 "Instances of the interface <literal>Bean</literal> represent beans. There is "
@@ -465,46 +273,18 @@
 "<literal>Manager</literal> per ogni Web Bean dell'applicazione."
 
 #. Tag: para
-#: extend.xml:210
 #, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface exposes all the interesting things we "
-"dicussed in <xref linkend=\"bean-anatomy\"/>."
+"dicussed in <xref linkend=\"bean-anatomy\" />."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:215
-#, no-c-format
-msgid ""
-"<![CDATA[public interface Bean<T> extends Contextual<T> {\n"
-"   public Set<Type> getTypes();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public String getName();\n"
-"   public Set<Class<? extends Annotation>> getStereotypes();\n"
-"   public Class<?> getBeanClass();\n"
-"   public boolean isAlternative();\n"
-"   public boolean isNullable();\n"
-"   public Set<InjectionPoint> getInjectionPoints();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:217
 #, no-c-format
 msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:221
-#, no-c-format
-msgid ""
-"<![CDATA[Set<Bean<?>> allBeans = beanManager.getBeans(Obect.class, new "
-"AnnotationLiteral<Any>() {});]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:223
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface makes it possible for a portable "
@@ -521,13 +301,11 @@
 "gestiti da altri framework di essere iniettati nei Web Beans."
 
 #. Tag: title
-#: extend.xml:233
 #, fuzzy, no-c-format
 msgid "Registering a <literal>Bean</literal>"
 msgstr "La classe <literal>Bean</literal>"
 
 #. Tag: para
-#: extend.xml:235
 #, no-c-format
 msgid ""
 "The most common kind of CDI portable extension registers a bean (or beans) "
@@ -535,7 +313,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:239
 #, no-c-format
 msgid ""
 "In this example, we make a framework class, <literal>SecurityManager</"
@@ -545,101 +322,7 @@
 "<literal>SecurityManager</literal> instance."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[public class SecurityManagerExtension implements Extension {\n"
-"    \n"
-"    void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager "
-"bm) {\n"
-"            \n"
-"        //use this to read annotations of the class\n"
-"        AnnotatedType<SecurityManager> at = bm.createAnnotatedType"
-"(SecurityManager.class); \n"
-"\n"
-"        //use this to instantiate the class and inject dependencies\n"
-"        final InjectionTarget<SecurityManager> it = bm.createInjectionTarget"
-"(at); \n"
-"\n"
-"        abd.addBean( new Bean<SecurityManager>() {\n"
-"\n"
-"            @Override\n"
-"            public Class<?> getBeanClass() {\n"
-"                return SecurityManager.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public String getName() {\n"
-"                return \"securityManager\";\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getQualifiers() {\n"
-"                Set<Annotation> qualifiers = new HashSet<Annotation>();\n"
-"                qualifiers.add( new AnnotationLiteral<Default>() {} );\n"
-"                qualifiers.add( new AnnotationLiteral<Any>() {} );\n"
-"                return qualifiers;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<? extends Annotation> getScope() {\n"
-"                return SessionScoped.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Class<? extends Annotation>> getStereotypes() {\n"
-"                return Collections.emptySet();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypes() {\n"
-"                Set<Type> types = new HashSet<Type>();\n"
-"                types.add(SecurityManager.class);\n"
-"                types.add(Object.class);\n"
-"                return types;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAlternative() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isNullable() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public SecurityManager create(CreationalContext<SecurityManager> "
-"ctx) {\n"
-"                SecurityManager instance = it.produce(ctx);\n"
-"                it.inject(instance, ctx);\n"
-"                it.postConstruct(instance);\n"
-"                return instance;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void destroy(SecurityManager instance, \n"
-"                                CreationalContext<SecurityManager> ctx) {\n"
-"                it.preDestroy(instance);\n"
-"                it.dispose(instance);\n"
-"                ctx.release();\n"
-"            }\n"
-"            \n"
-"        } );\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:248
 #, no-c-format
 msgid ""
 "But a portable extension can also mess with beans that are discovered "
@@ -647,13 +330,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:255
 #, no-c-format
 msgid "Wrapping an <literal>AnnotatedType</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:257
 #, no-c-format
 msgid ""
 "One of the most interesting things that an extension class can do is process "
@@ -662,7 +343,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:262
 #, no-c-format
 msgid ""
 "Let's start with an example of an extension that provides support for the "
@@ -673,101 +353,7 @@
 "<literal>value()</literal> of the <literal>@Named</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:270
-#, no-c-format
-msgid ""
-"<![CDATA[public class QualifiedNameExtension implements Extension {\n"
-"\n"
-"    <X> void processAnnotatedType(@Observes ProcessAnnotatedType<X> pat) {\n"
-"\n"
-"        //wrap this to override the annotations of the class\n"
-"        final AnnotatedType<X> at = pat.getAnnotatedType();\n"
-"        \n"
-"        AnnotatedType<X> wrapped = new AnnotatedType<X>() {\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedConstructor<X>> getConstructors() {\n"
-"                return at.getConstructors();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedField<? super X>> getFields() {\n"
-"                return at.getFields();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<X> getJavaClass() {\n"
-"                return at.getJavaClass();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedMethod<? super X>> getMethods() {\n"
-"                return at.getMethods();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public <T extends Annotation> T getAnnotation(final Class<T> "
-"annType) {\n"
-"                if ( Named.class.equals(annType) ) {\n"
-"                    class NamedLiteral \n"
-"                            extends AnnotationLiteral<Named> \n"
-"                            implements Named {\n"
-"                        @Override\n"
-"                        public String value() {\n"
-"                            Package pkg = at.getClass().getPackage();\n"
-"                            String unqualifiedName = at.getAnnotation(Named."
-"class).value();\n"
-"                            final String qualifiedName;\n"
-"                            if ( pkg.isAnnotationPresent(Named.class) ) {\n"
-"                                qualifiedName = pkg.getAnnotation(Named."
-"class).value() \n"
-"                                      + '.' + unqualifiedName;\n"
-"                            }\n"
-"                            else {\n"
-"                                qualifiedName = unqualifiedName;\n"
-"                            }\n"
-"                            return qualifiedName;\n"
-"                        }\n"
-"                    }\n"
-"                    return (T) new NamedLiteral();\n"
-"                }\n"
-"                else {\n"
-"                    return at.getAnnotation(annType);\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getAnnotations() {\n"
-"                return at.getAnnotations();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Type getBaseType() {\n"
-"                return at.getBaseType();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypeClosure() {\n"
-"                return at.getTypeClosure();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annType) {\n"
-"                return at.isAnnotationPresent(annType);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pat.setAnnotatedType(wrapped);\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:272
 #, no-c-format
 msgid ""
 "Here's a second example, which adds the <literal>@Alternative</literal> "
@@ -775,41 +361,7 @@
 "literal> interface."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:277
-#, no-c-format
-msgid ""
-"<![CDATA[class ServiceAlternativeExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"   \n"
-"      final AnnotatedType<T> type = pat.getAnnotatedType();\n"
-"      \n"
-"      if ( Service.class.isAssignableFrom( type.getJavaClass() ) ) {\n"
-"      \n"
-"         //if the class implements Service, make it an @Alternative\n"
-"         AnnotatedType<T> wrapped = new AnnotatedType<T>() {\n"
-"         \n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annotationType) {\n"
-"               return annotationType.equals(Alternative.class) ? \n"
-"                  true : type.isAnnotationPresent(annotationType);\n"
-"            }\n"
-"            \n"
-"            //remaining methods of AnnotatedType\n"
-"            ...\n"
-"         }\n"
-"         \n"
-"         pat.setAnnotatedType(wrapped);\n"
-"      }\n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:283
 #, no-c-format
 msgid ""
 "The <literal>AnnotatedType</literal> is not the only thing that can be "
@@ -817,13 +369,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:288
 #, no-c-format
 msgid "Wrapping an <literal>InjectionTarget</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:290
 #, no-c-format
 msgid ""
 "The <literal>InjectionTarget</literal> interface exposes operations for "
@@ -835,7 +385,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:297
 #, no-c-format
 msgid ""
 "Here's a CDI portable extension that reads values from properties files and "
@@ -847,16 +396,7 @@
 "<literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:305
-#, no-c-format
-msgid ""
-"firstName=Gavin\n"
-"lastName=King"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:307
 #, no-c-format
 msgid ""
 "The portable extension works by wrapping the containers "
@@ -864,121 +404,7 @@
 "<literal>inject()</literal> method."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:310
-#, no-c-format
-msgid ""
-"<![CDATA[public class ConfigExtension implements Extension {\n"
-"\n"
-"        <X> void processInjectionTarget(@Observes ProcessInjectionTarget<X> "
-"pit) {\n"
-"                \n"
-"                //wrap this to intercept the component lifecycle\n"
-"            final InjectionTarget<X> it = pit.getInjectionTarget();\n"
-"            \n"
-"        final Map<Field, Object> configuredValues = new HashMap<Field, "
-"Object>();\n"
-"        \n"
-"        //use this to read annotations of the class and its members\n"
-"        AnnotatedType<X> at = pit.getAnnotatedType();\n"
-"        \n"
-"        //read the properties file\n"
-"        String propsFileName = at.getClass().getSimpleName() + \".properties"
-"\";\n"
-"        InputStream stream = at.getJavaClass().getResourceAsStream"
-"(propsFileName);\n"
-"        if (stream!=null) {\n"
-"            \n"
-"            try {\n"
-"                Properties props = new Properties();\n"
-"                props.load(stream);\n"
-"                for (Map.Entry<Object, Object> property : props.entrySet()) "
-"{\n"
-"                    String fieldName = property.getKey().toString();\n"
-"                    Object value = property.getValue();\n"
-"                    try {\n"
-"                        Field field = at.getJavaClass().getField"
-"(fieldName);\n"
-"                        field.setAccessible(true);\n"
-"                        if ( field.getType().isAssignableFrom( value.getClass"
-"() ) ) {\n"
-"                            configuredValues.put(field, value);\n"
-"                        }\n"
-"                        else {\n"
-"                            //TODO: do type conversion automatically\n"
-"                            pit.addDefinitionError( new InjectionException(\n"
-"                                   \"field is not of type String: \" + "
-"field ) );\n"
-"                        }\n"
-"                    }\n"
-"                    catch (NoSuchFieldException nsfe) {\n"
-"                        pit.addDefinitionError(nsfe);\n"
-"                    }\n"
-"                    finally {\n"
-"                        stream.close();\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"            catch (IOException ioe) {\n"
-"                pit.addDefinitionError(ioe);\n"
-"            }\n"
-"        }\n"
-"        \n"
-"        InjectionTarget<X> wrapped = new InjectionTarget<X>() {\n"
-"\n"
-"            @Override\n"
-"            public void inject(X instance, CreationalContext<X> ctx) {\n"
-"                it.inject(instance, ctx);\n"
-"                \n"
-"                //set the values onto the new instance of the component\n"
-"                for (Map.Entry<Field, Object> configuredValue: "
-"configuredValues.entrySet()) {\n"
-"                    try {\n"
-"                        configuredValue.getKey().set(instance, "
-"configuredValue.getValue());\n"
-"                    }\n"
-"                    catch (Exception e) {\n"
-"                        throw new InjectionException(e);\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void postConstruct(X instance) {\n"
-"                it.postConstruct(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void preDestroy(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void dispose(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public X produce(CreationalContext<X> ctx) {\n"
-"                return it.produce(ctx);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pit.setInjectionTarget(wrapped);\n"
-"        \n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:312
 #, no-c-format
 msgid ""
 "There's a lot more to the portable extension SPI than what we've discussed "
@@ -987,13 +413,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:320
 #, no-c-format
 msgid "The <literal>Context</literal> interface"
 msgstr "L'interfaccia <literal>Context</literal>"
 
 #. Tag: para
-#: extend.xml:322
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Context</literal> interface supports addition of new scopes to "
@@ -1002,30 +426,7 @@
 "L'interfaccia <literal>Context</literal> supporta l'aggiunta di nuovi scope "
 "ai Web Beans, o l'estensione di scope esistenti a nuovi ambienti."
 
-#. Tag: programlisting
-#: extend.xml:327
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface Context {\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
-"creationalContext);\n"
-"   public <T> T get(Contextual<T> contextual);\n"
-"   boolean isActive();\n"
-"}]]>"
-msgstr ""
-"public interface Context {\n"
-"    \n"
-"    public Class&lt;? extends Annotation&gt; getScopeType();\n"
-"    \n"
-"    public &lt;T&gt; T get(Bean&lt;T&gt; bean, boolean create);\n"
-"    \n"
-"    boolean isActive();\n"
-"    \n"
-"}"
-
 #. Tag: para
-#: extend.xml:329
 #, fuzzy, no-c-format
 msgid ""
 "For example, we might implement <literal>Context</literal> to add a business "
@@ -1037,7 +438,31 @@
 "allo scope di conversazione ad un'applicazione che impiega Wicket."
 
 #, fuzzy
+#~ msgid "@Inject BeanManager beanManager;"
+#~ msgstr "@Current Manager manager"
+
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public interface Context {\n"
+#~ "   public Class<? extends Annotation> getScope();\n"
+#~ "   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
+#~ "creationalContext);\n"
+#~ "   public <T> T get(Contextual<T> contextual);\n"
+#~ "   boolean isActive();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "public interface Context {\n"
+#~ "    \n"
+#~ "    public Class&lt;? extends Annotation&gt; getScopeType();\n"
+#~ "    \n"
+#~ "    public &lt;T&gt; T get(Bean&lt;T&gt; bean, boolean create);\n"
+#~ "    \n"
+#~ "    boolean isActive();\n"
+#~ "    \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
 #~ "There are two subinterfaces of <literal>Bean</literal> defined by the CDI "
 #~ "specification: <literal>Interceptor</literal> and <literal>Decorator</"
 #~ "literal>."

Modified: doc/trunk/reference/it-IT/extensions.po
===================================================================
--- doc/trunk/reference/it-IT/extensions.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/extensions.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-23 21:21+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -15,13 +15,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: extensions.xml:8
 #, no-c-format
 msgid "CDI extensions available as part of Weld"
 msgstr "Estensioni CDI disponibili come parte di Weld"
 
 #. Tag: para
-#: extensions.xml:11
 #, no-c-format
 msgid "These modules are usable on any JSR-299 implementation, not just Weld!"
 msgstr ""
@@ -29,13 +27,11 @@
 "solo Weld!"
 
 #. Tag: title
-#: extensions.xml:17
 #, no-c-format
 msgid "Weld Logger"
 msgstr "Weld Logger"
 
 #. Tag: para
-#: extensions.xml:19
 #, fuzzy, no-c-format
 msgid ""
 "Adding logging to your application is now even easier with simple injection "
@@ -49,38 +45,7 @@
 "log.Log con <emphasis>@Logger</emphasis> ed un oggetto logger appropriato "
 "verrà iniettato in una qualsiasi istanza del bean."
 
-#. Tag: programlisting
-#: extensions.xml:25
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[import org.slf4j.Logger;\n"
-"import javax.inject.Inject;\n"
-"\n"
-"public class Checkout {\n"
-"   private @Inject Logger log;\n"
-"\n"
-"   public void invoiceItems() {\n"
-"      ShoppingCart cart;\n"
-"      ...\n"
-"      log.debug(\"Items invoiced for {}\", cart);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[import org.jboss.weld.annotation.Logger;\n"
-"import org.jboss.weld.log.Log;\n"
-"\n"
-"public class Checkout {\n"
-"   private @Inject @Logger Log log;\n"
-"\n"
-"   public void invoiceItems() {\n"
-"      ShoppingCart cart;\n"
-"      ...\n"
-"      log.debug(\"Items invoiced for {0}\", cart);\n"
-"   }\n"
-"}]]>"
-
 #. Tag: para
-#: extensions.xml:27
 #, no-c-format
 msgid ""
 "The example shows how objects can be interpolated into a message. If you use "
@@ -90,7 +55,6 @@
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:34
 #, fuzzy, no-c-format
 msgid ""
 "You can add Weld logging to your project by including weld-logger.jar, sl4j-"
@@ -104,7 +68,6 @@
 "webbeans-logger</literal>."
 
 #. Tag: para
-#: extensions.xml:39
 #, fuzzy, no-c-format
 msgid ""
 "If you are using Weld as your JSR-299 implementation, there's no need to "
@@ -115,6 +78,34 @@
 
 #, fuzzy
 #~ msgid ""
+#~ "<![CDATA[import org.slf4j.Logger;\n"
+#~ "import javax.inject.Inject;\n"
+#~ "\n"
+#~ "public class Checkout {\n"
+#~ "   private @Inject Logger log;\n"
+#~ "\n"
+#~ "   public void invoiceItems() {\n"
+#~ "      ShoppingCart cart;\n"
+#~ "      ...\n"
+#~ "      log.debug(\"Items invoiced for {}\", cart);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[import org.jboss.weld.annotation.Logger;\n"
+#~ "import org.jboss.weld.log.Log;\n"
+#~ "\n"
+#~ "public class Checkout {\n"
+#~ "   private @Inject @Logger Log log;\n"
+#~ "\n"
+#~ "   public void invoiceItems() {\n"
+#~ "      ShoppingCart cart;\n"
+#~ "      ...\n"
+#~ "      log.debug(\"Items invoiced for {0}\", cart);\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
 #~ "The example shows how objects can be interpolated into a message. This "
 #~ "interpolation is done using <emphasis>java.text.MessageFormat</emphasis>, "
 #~ "so see the JavaDoc for that class for more details. In this case, the "

Modified: doc/trunk/reference/it-IT/gettingstarted.po
===================================================================
--- doc/trunk/reference/it-IT/gettingstarted.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/gettingstarted.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-06-08 21:39+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,27 +14,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: gettingstarted.xml:5
 #, no-c-format
 msgid "Getting started with Weld"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:7
 #, no-c-format
 msgid ""
 "Weld comes with two starter example applications, in addition to more "
 "specialized examples. The first, <literal>weld-numberguess</literal>, is a "
-"web (WAR) example containing only non-transactional managed beans. This "
+"web (war) example containing only non-transactional managed beans. This "
 "example can be run on a wide range of servers, including JBoss AS, "
 "GlassFish, Apache Tomcat, Jetty, Google App Engine, and any compliant Java "
 "EE 6 container. The second example, <literal>weld-translator</literal>, is "
-"an enterprise (EAR) example that contains session beans. This example must "
-"be run on JBoss AS 5.2, Glassfish 3.0 or any compliant Java EE 6 container."
+"an enterprise (ear) example that contains session beans. This example must "
+"be run on JBoss AS 6.0, Glassfish 3.0 or any compliant Java EE 6 container."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:16
 #, fuzzy, no-c-format
 msgid ""
 "Both examples use JSF 2.0 as the web framework and, as such, can be found in "
@@ -44,13 +41,11 @@
 "numberguess</literal> della distribuzione Web Beans."
 
 #. Tag: title
-#: gettingstarted.xml:22
 #, no-c-format
 msgid "Prerequisites"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:24
 #, no-c-format
 msgid ""
 "To run the examples with the provided build scripts, you'll need the "
@@ -58,58 +53,47 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:30
 #, fuzzy, no-c-format
 msgid "the latest release of Weld, which contains the examples"
 msgstr "l'ultima release di Web Beans,"
 
 #. Tag: para
-#: gettingstarted.xml:33
 #, no-c-format
 msgid "Ant 1.7.0, to build and deploy the examples"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:36
 #, no-c-format
 msgid "a supported runtime environment (minimum versions shown)"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:39
-#, no-c-format
-msgid ""
-"JBoss AS 5.2.0 (currently only nightly builds of JBoss AS 5.2.0.Beta1 are "
-"available),"
-msgstr ""
+#, fuzzy, no-c-format
+msgid "JBoss AS 6.0.0,"
+msgstr "JBoss AS 5.0.1.GA, o"
 
 #. Tag: para
-#: gettingstarted.xml:42
 #, fuzzy, no-c-format
 msgid "GlassFish 3.0,"
 msgstr "Usare GlassFish"
 
 #. Tag: para
-#: gettingstarted.xml:45
 #, fuzzy, no-c-format
-msgid "Apache Tomcat 6.0.x (WAR example only), or"
+msgid "Apache Tomcat 6.0.x (war example only), or"
 msgstr "Apache Tomcat 6.0.x, e"
 
 #. Tag: para
-#: gettingstarted.xml:48
-#, no-c-format
-msgid "Jetty 6.1.x (WAR example only)"
-msgstr ""
+#, fuzzy, no-c-format
+msgid "Jetty 6.1.x (war example only)"
+msgstr "Apache Tomcat 6.0.x, e"
 
 #. Tag: para
-#: gettingstarted.xml:53
 #, no-c-format
 msgid ""
 "(optionally) Maven 2.x, to run the examples in an embedded servlet container"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:58
 #, no-c-format
 msgid ""
 "You'll need a full install of Ant 1.7.0. Some linux distributions only "
@@ -118,27 +102,24 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:64
 #, no-c-format
 msgid ""
 "In the next few sections, you'll be using the Ant command (<literal>ant</"
 "literal>) to invoke the Ant build script in each example to compile, "
-"assemble and deploy the example to JBoss AS and, for the WAR example, Apache "
-"Tomcat. You can also deploy the generated artifact (WAR or EAR) to any other "
+"assemble and deploy the example to JBoss AS and, for the war example, Apache "
+"Tomcat. You can also deploy the generated artifact (war or ear) to any other "
 "container that supports Java EE 6, such as GlassFish 3."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:71
 #, no-c-format
 msgid ""
 "If you have Maven installed, you can use the Maven command (<literal>mvn</"
-"literal>) to compile and assemble the standalone artifact (WAR or EAR) and, "
-"for the WAR example, run it in an embedded container."
+"literal>) to compile and assemble the standalone artifact (war or ear) and, "
+"for the war example, run it in an embedded container."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:76
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
@@ -146,28 +127,25 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:81
 #, fuzzy, no-c-format
 msgid "Deploying to JBoss AS"
 msgstr "Usare JBoss AS 5"
 
 #. Tag: para
-#: gettingstarted.xml:83
 #, no-c-format
 msgid ""
 "To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss."
-"org/jbossas/\">JBoss AS 5.2.0.Beta1</ulink> or above. If a release of the "
-"JBoss AS 5.2 line isn't yet available, you can download a <ulink url="
-"\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-5.x-sun16/"
-"\">nightly snapshot</ulink>. The reason JBoss AS 5.2.0.Beta1 or above is "
-"required is because it's the first release that has both CDI and Bean "
-"Validation support built-in, making it close enough to Java EE 6 to run the "
-"examples. The good news is that there are no additional modifications you "
-"have to make to the server. It's ready to go!"
+"org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS "
+"6.0 line isn't yet available, you can download a <ulink url=\"http://hudson."
+"jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</"
+"ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the "
+"first release that has both CDI and Bean Validation support built-in, making "
+"it close enough to Java EE 6 to run the examples. The good news is that "
+"there are no additional modifications you have to make to the server. It's "
+"ready to go!"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:92
 #, no-c-format
 msgid ""
 "After you have downloaded JBoss AS, extract it. (We recommended renaming the "
@@ -177,16 +155,7 @@
 "installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[$> unzip jboss-5.2.*.zip\n"
-"$> mv jboss-5.2.*/ jboss-as-5.2]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:101
 #, no-c-format
 msgid ""
 "In order for the build scripts to know where to deploy the example, you have "
@@ -197,74 +166,36 @@
 "<literal>jboss.home</literal>, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:108
-#, fuzzy, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
-msgstr "jboss.home=/Applications/jboss-5.0.1.GA"
-
 #. Tag: para
-#: gettingstarted.xml:110
 #, fuzzy, no-c-format
 msgid "You're now ready to deploy your first example!"
 msgstr "Ora, siete pronti a fare il deploy del primo esempio!"
 
 #. Tag: para
-#: gettingstarted.xml:114
 #, no-c-format
 msgid ""
 "Switch to the <literal>examples/jsf/numberguess</literal> directory and "
 "execute the Ant <literal>deploy</literal> target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:119
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant deploy]]>"
-msgstr ""
-"$ cd examples/numberguess\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:121
 #, no-c-format
 msgid ""
 "If you haven't already, start JBoss AS. You can either start JBoss AS from a "
 "Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:125
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/jboss-as-5.2\n"
-"$> ./bin/run.sh]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:127 gettingstarted.xml:369
 #, no-c-format
 msgid "a Windows command window:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:131
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\jboss-as-5.2\\bin\n"
-"$> run]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:133 gettingstarted.xml:375
 #, no-c-format
 msgid "or you can start the server using an IDE, like Eclipse."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:138
 #, no-c-format
 msgid ""
 "If you are using Eclipse, you should seriously consider installing the "
@@ -274,7 +205,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:145
 #, fuzzy, no-c-format
 msgid ""
 "Wait a few seconds for the application to deploy (or the application server "
@@ -288,7 +218,6 @@
 "localhost:8080/webbeans-translator</ulink>)."
 
 #. Tag: para
-#: gettingstarted.xml:152
 #, no-c-format
 msgid ""
 "The Ant build script includes additional targets for JBoss AS to deploy and "
@@ -297,7 +226,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:158
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant restart</literal> - deploy the example in exploded format to "
@@ -306,7 +234,6 @@
 "<literal>ant restart</literal> - fa il deploy dell'esempio in formato esploso"
 
 #. Tag: para
-#: gettingstarted.xml:163
 #, no-c-format
 msgid ""
 "<literal>ant explode</literal> - update an exploded example, without "
@@ -316,7 +243,6 @@
 "senza riavviare il deploy"
 
 #. Tag: para
-#: gettingstarted.xml:168
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant deploy</literal> - deploy the example in compressed jar format "
@@ -326,19 +252,16 @@
 "compresso"
 
 #. Tag: para
-#: gettingstarted.xml:173
 #, fuzzy, no-c-format
 msgid "<literal>ant undeploy</literal> - remove the example from JBoss AS"
 msgstr "<literal>ant undeploy</literal> - rimuove l'esempio dal server"
 
 #. Tag: para
-#: gettingstarted.xml:178
 #, no-c-format
 msgid "<literal>ant clean</literal> - clean the example"
 msgstr "<literal>ant clean</literal> - ripulisce l'esempio"
 
 #. Tag: para
-#: gettingstarted.xml:185
 #, no-c-format
 msgid ""
 "The second starter example, <literal>weld-translator</literal>, will "
@@ -347,27 +270,15 @@
 "translator example directory and execute the deploy target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/translator\n"
-"$> ant deploy]]>"
-msgstr ""
-"$ cd examples/translator\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:194
 #, no-c-format
 msgid ""
 "The translator uses session beans, which are packaged in an EJB module "
-"within an EAR. Java EE 6 will allow session beans to be deployed in WAR "
+"within an ear. Java EE 6 will allow session beans to be deployed in war "
 "modules, but that's a topic for a later chapter."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:200
 #, fuzzy, no-c-format
 msgid ""
 "Again, wait a few seconds for the application to deploy (if you're really "
@@ -379,55 +290,32 @@
 "(<ulink url=\"http://localhost:8080/webbeans-translator\">http://"
 "localhost:8080/webbeans-translator</ulink>)."
 
-#. Tag: para
-#: gettingstarted.xml:206
-#, no-c-format
-msgid ""
-"TODO Insert note about upgrading the Weld deployer that directs reader to "
-"section on the JBoss AS environment"
-msgstr ""
-
 #. Tag: title
-#: gettingstarted.xml:213
 #, fuzzy, no-c-format
 msgid "Deploying to GlassFish"
 msgstr "Usare GlassFish"
 
 #. Tag: para
-#: gettingstarted.xml:215
 #, no-c-format
 msgid ""
-"Deploying to GlassFish should be easy, right? After all, it's the Java EE 6 "
-"reference implementation. Since it's the Java EE 6 reference implementation, "
-"that means it also bundles the JSR-299 reference implementation, Weld! So "
-"yes, it's very easy."
+"Deploying to GlassFish should be easy and familiar, right? After all, it's "
+"the Java EE 6 reference implementation and Weld is the JSR-299 reference "
+"implementation, meaning Weld gets bundled with GlassFish. So yes, it's all "
+"quite easy and familiar."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:221
 #, no-c-format
 msgid ""
 "To deploy the examples to GlassFish, you'll need the final <ulink url="
-"\"https://glassfish.dev.java.net/\">GlassFish V3</ulink> release (the "
-"preview release won't do). If the final release isn't yet available, you can "
-"download a <ulink url=\"http://download.java.net/glassfish/v3/promoted/"
-"\">promoted build</ulink> in the meantime. Select the b69 preview release or "
-"above that ends in either <literal>-unix.sh</literal> or <literal>-windows."
-"exe</literal> depending on your platform. After the download is complete, "
-"execute the installer. On Linux/Unix, you'll need to first make the script "
-"executable."
+"\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</"
+"ulink> release. Select the release that ends in either <literal>-unix.sh</"
+"literal> or <literal>-windows.exe</literal> depending on your platform. "
+"After the download is complete, execute the installer. On Linux/Unix, you'll "
+"need to first make the script executable."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:231
-#, no-c-format
-msgid ""
-"<![CDATA[$> chmod 755 glassfish-v3-b69-unix.sh\n"
-"$> ./glassfish-v3-b69-unix.sh]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:233
 #, no-c-format
 msgid ""
 "On Windows you can just click on the executable. Follow the instructions in "
@@ -438,7 +326,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:240
 #, no-c-format
 msgid ""
 "If you've deployed either of the starter examples, <literal>weld-"
@@ -447,16 +334,7 @@
 "either of the two directories and build it."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess (or examples/jsf/translator)\n"
-"$> ant package]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:248
 #, no-c-format
 msgid ""
 "The deployable archive for the <literal>weld-numberguess</literal>, named "
@@ -468,24 +346,17 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:255
 #, no-c-format
 msgid ""
-"You deploy applications to GlassFish using the <ulink url=\"http://"
-"localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin Console "
-"running, you need to start a GlassFish domain, in our case <literal>domain1</"
-"literal>. Switch to the <literal>bin</literal> folder in the directory where "
-"you installed GlassFish and execute the following command:"
+"One way to deploy applications to GlassFish is by using the <ulink url="
+"\"http://localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin "
+"Console running, you need to start a GlassFish domain, in our case "
+"<literal>domain1</literal>. Switch to the <literal>bin</literal> folder in "
+"the directory where you installed GlassFish and execute the following "
+"command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:262
-#, no-c-format
-msgid "<![CDATA[$> asadmin start-domain domain1]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:264
 #, no-c-format
 msgid ""
 "After a few seconds you can visit the Admin Console in the browser at the "
@@ -502,22 +373,26 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:276
 #, no-c-format
 msgid ""
+"Alternatively, you can deploy the application to GlassFish using the asadmin "
+"command:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The reason the same artifact can be deployed to both JBoss AS and GlassFish, "
 "without any modifications, is because all of the features being used are "
 "part of the standard platform. And what a capable platform it has become!"
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:285
 #, fuzzy, no-c-format
 msgid "Deploying to Apache Tomcat"
 msgstr "Usare Apache Tomcat 6.0"
 
 #. Tag: para
-#: gettingstarted.xml:287
 #, no-c-format
 msgid ""
 "Servlet containers are not required to support Java EE services like CDI. "
@@ -526,7 +401,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:291
 #, no-c-format
 msgid ""
 "Weld comes with a servlet listener which bootstraps the CDI environment, "
@@ -537,7 +411,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:297
 #, fuzzy, no-c-format
 msgid ""
 "Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll "
@@ -547,16 +420,7 @@
 "Scaricare Tomcat 6.0.18 o successivo da <ulink url=\"http://tomcat.apache."
 "org/download-60.cgi\">tomcat.apache.org</ulink>, e scompattarlo. Per esempio"
 
-#. Tag: programlisting
-#: gettingstarted.xml:302
-#, fuzzy, no-c-format
-msgid "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
-msgstr ""
-"<![CDATA[$ cd /Applications\n"
-"$ unzip ~/apache-tomcat-6.0.18.zip]]>"
-
 #. Tag: para
-#: gettingstarted.xml:304
 #, no-c-format
 msgid ""
 "You have two choices for how you can deploy the application to Tomcat. You "
@@ -567,13 +431,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:312
 #, no-c-format
 msgid "Deploying with Ant"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:314
 #, no-c-format
 msgid ""
 "In order for Ant to push the artifact to the Tomcat hot deploy directory, it "
@@ -584,38 +446,19 @@
 "property key <literal>tomcat.home</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:321
-#, fuzzy, no-c-format
-msgid "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
-msgstr "tomcat.home=/Applications/apache-tomcat-6.0.18"
-
 #. Tag: para
-#: gettingstarted.xml:323
 #, fuzzy, no-c-format
 msgid "Now you're ready to deploy the numberguess example to Tomcat!"
 msgstr "Per eseguire il deploy dell'esempio Indovina Numero per tomcat:"
 
 #. Tag: para
-#: gettingstarted.xml:327
 #, no-c-format
 msgid ""
 "Change to the <literal>examples/jsf/numberguess</literal> directory again "
 "and run the Ant <literal>deploy</literal> target for Tomcat:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:332
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant tomcat.deploy]]>"
-msgstr ""
-"$ cd examples/numberguess\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:335
 #, no-c-format
 msgid ""
 "The Ant build script includes additional targets for Tomcat to deploy and "
@@ -624,7 +467,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:341
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.restart</literal> - deploy the example in exploded "
@@ -634,7 +476,6 @@
 "formato esploso"
 
 #. Tag: para
-#: gettingstarted.xml:346
 #, no-c-format
 msgid ""
 "<literal>ant tomcat.explode</literal> - update an exploded example, without "
@@ -644,7 +485,6 @@
 "esploso, senza riavviare il deploy"
 
 #. Tag: para
-#: gettingstarted.xml:351
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.deploy</literal> - deploy the example in compressed jar "
@@ -654,39 +494,18 @@
 "formato jar compresso"
 
 #. Tag: para
-#: gettingstarted.xml:356
 #, fuzzy, no-c-format
 msgid "<literal>ant tomcat.undeploy</literal> - remove the example from Tomcat"
 msgstr "<literal>ant undeploy</literal> - rimuove l'esempio dal server"
 
 #. Tag: para
-#: gettingstarted.xml:363
 #, no-c-format
 msgid ""
 "If you haven't already, start Tomcat. You can either start Tomcat from a "
 "Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:367
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/apache-tomcat-6\n"
-"$> ./bin/start.sh]]>"
-msgstr "$ /Applications/apache-tomcat-6.0.18/bin/startup.sh"
-
-#. Tag: programlisting
-#: gettingstarted.xml:373
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
-"$> start]]>"
-msgstr ""
-"<![CDATA[$ cd /Applications\n"
-"$ unzip ~/apache-tomcat-6.0.18.zip]]>"
-
 #. Tag: para
-#: gettingstarted.xml:379
 #, no-c-format
 msgid ""
 "Wait a few seconds for the application to deploy (or the application server "
@@ -697,13 +516,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:388
 #, no-c-format
 msgid "Deploying with Maven"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:390
 #, no-c-format
 msgid ""
 "You can also deploy the application to Tomcat using Maven. This section is a "
@@ -713,7 +530,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:396
 #, no-c-format
 msgid ""
 "The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
@@ -725,7 +541,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:403
 #, no-c-format
 msgid ""
 "To allow Maven to communicate with Tomcat over HTTP, edit the <literal>conf/"
@@ -733,41 +548,20 @@
 "following line:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:408
-#, no-c-format
-msgid "<![CDATA[<user username=\"admin\" password=\"\" roles=\"manager\"/>]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:410
 #, no-c-format
 msgid ""
 "Restart Tomcat. You can now deploy the application to Tomcat with Maven "
 "using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:414
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:exploded tomcat:exploded -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:416
 #, no-c-format
 msgid ""
 "Once the application is deployed, you can redeploy it using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:420
-#, no-c-format
-msgid "<![CDATA[$> mvn tomcat:redeploy -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:422
 #, no-c-format
 msgid ""
 "The <literal>-Ptomcat</literal> argument activates the <literal>tomcat</"
@@ -776,21 +570,13 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:427
 #, no-c-format
 msgid ""
 "Rather than shipping the container off to a standalone Tomcat installation, "
 "you can also execute the application in an embedded Tomcat 6 container:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:432
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace tomcat:run -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:434
 #, no-c-format
 msgid ""
 "The advantage of using the embedded server is that changes to assets in "
@@ -800,14 +586,7 @@
 "classpath resource, you need to execute a build:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:441
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:443
 #, no-c-format
 msgid ""
 "There are several other Maven goals that you can use if you are hacking on "
@@ -816,13 +595,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:453
 #, no-c-format
 msgid "Deploying to Jetty"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:457
 #, no-c-format
 msgid ""
 "Support for Jetty in the examples is a more recent addition. Since Jetty is "
@@ -833,7 +610,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:464
 #, no-c-format
 msgid ""
 "If you've read through the entire Tomcat section, then you're all ready to "
@@ -843,7 +619,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:470
 #, no-c-format
 msgid ""
 "The Maven POM (<literal>pom.xml</literal>) includes a profile named "
@@ -855,27 +630,15 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:479
 #, no-c-format
 msgid ""
 "To run the <literal>weld-numberguess</literal> example on Jetty, switch to "
 "the example directory and execute the <literal>inplace</literal> goal of the "
-"Maven WAR plugin followed by the <literal>run</literal> goal of the Maven "
+"Maven war plugin followed by the <literal>run</literal> goal of the Maven "
 "Jetty plugin with the <literal>jetty</literal> profile enabled, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:485
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> mvn war:inplace jetty:run -Pjetty]]>"
-msgstr ""
-"<![CDATA[cd examples/wicket/numberguess\n"
-"mvn -Pjetty eclipse:eclipse]]>"
-
 #. Tag: para
-#: gettingstarted.xml:487
 #, no-c-format
 msgid ""
 "The log output of Jetty will be shown in the console. Once Jetty reports "
@@ -886,7 +649,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:494
 #, no-c-format
 msgid ""
 "Any changes to assets in <literal>src/main/webapp</literal> take effect "
@@ -894,30 +656,22 @@
 "application may automatically redeploy. The redeploy behavior can be fined-"
 "tuned in the plugin configuration. If you make a change to a classpath "
 "resource, you need to execute a build and the <literal>inplace</literal> "
-"goal of the Maven WAR plugin, again with the <literal>jetty</literal> "
+"goal of the Maven war plugin, again with the <literal>jetty</literal> "
 "profile enabled."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:501
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:503
 #, no-c-format
 msgid ""
-"The <literal>war:inplace</literal> goal copies the compiled classes and JARs "
+"The <literal>war:inplace</literal> goal copies the compiled classes and jars "
 "inside <literal>src/main/webapp</literal>, under <literal>WEB-INF/classes</"
 "literal> and <literal>WEB-INF/lib</literal>, respectively, mixing source and "
 "compiled files. However, the build does work around these temporary files by "
-"excluding them from the packaged WAR and cleaning them during the Maven "
+"excluding them from the packaged war and cleaning them during the Maven "
 "clean phase."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:510
 #, no-c-format
 msgid ""
 "You have two options if you want to run the example on Jetty from the IDE. "
@@ -927,33 +681,18 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:516
 #, fuzzy, no-c-format
 msgid "First, initialize the Eclipse project:"
 msgstr "Creazione di un progetto Eclipse"
 
-#. Tag: programlisting
-#: gettingstarted.xml:520
-#, no-c-format
-msgid "<![CDATA[$> mvn clean eclipse:clean eclipse:eclipse -Pjetty-ide]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:522
 #, no-c-format
 msgid ""
 "Next, assemble all the necessary resources under <literal>src/main/webapp</"
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:526
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace -Pjetty-ide]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:528
 #, no-c-format
 msgid ""
 "Now, you are ready to run the server in Eclipse. Import the project into "
@@ -966,7 +705,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:536
 #, no-c-format
 msgid ""
 "Now that you have gotten the starter applications deployed on the server of "
@@ -974,7 +712,67 @@
 "work."
 msgstr ""
 
+#, fuzzy
+#~ msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.1.GA"
+
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> ant deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/numberguess\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/translator\n"
+#~ "$> ant deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/translator\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
+#~ msgstr ""
+#~ "<![CDATA[$ cd /Applications\n"
+#~ "$ unzip ~/apache-tomcat-6.0.18.zip]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
+#~ msgstr "tomcat.home=/Applications/apache-tomcat-6.0.18"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> ant tomcat.deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/numberguess\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd /path/to/apache-tomcat-6\n"
+#~ "$> ./bin/start.sh]]>"
+#~ msgstr "$ /Applications/apache-tomcat-6.0.18/bin/startup.sh"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
+#~ "$> start]]>"
+#~ msgstr ""
+#~ "<![CDATA[$ cd /Applications\n"
+#~ "$ unzip ~/apache-tomcat-6.0.18.zip]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> mvn war:inplace jetty:run -Pjetty]]>"
+#~ msgstr ""
+#~ "<![CDATA[cd examples/wicket/numberguess\n"
+#~ "mvn -Pjetty eclipse:eclipse]]>"
+
+#~ msgid ""
 #~ "Getting started with Web Beans, the Reference Implementation of JSR-299"
 #~ msgstr "Iniziare con Web Beans, l'implementazione di riferimento di JSR-299"
 
@@ -1006,9 +804,6 @@
 #~ "essere usato con JSF2. Per eseguire gli esempi occorre fare le seguenti "
 #~ "cose:"
 
-#~ msgid "JBoss AS 5.0.1.GA, or"
-#~ msgstr "JBoss AS 5.0.1.GA, o"
-
 #~ msgid "Ant 1.7.0."
 #~ msgstr "Ant 1.7.0."
 

Modified: doc/trunk/reference/it-IT/injection.po
===================================================================
--- doc/trunk/reference/it-IT/injection.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/injection.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-24 19:22+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,28 +14,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: injection.xml:4
 #, fuzzy, no-c-format
 msgid "Dependency injection and programmatic lookup"
 msgstr "Dependency injection"
 
 #. Tag: para
-#: injection.xml:6
 #, no-c-format
 msgid ""
-"One of the most significant features of CDI&#8212;certainly the most "
-"recognized&#8212;is dependency injection; excuse me, <emphasis>typesafe</"
-"emphasis> dependency injection."
+"One of the most significant features of CDI—certainly the most recognized—is "
+"dependency injection; excuse me, <emphasis>typesafe</emphasis> dependency "
+"injection."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:12
 #, no-c-format
 msgid "Injection points"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:14
 #, no-c-format
 msgid ""
 "The <literal>@Inject</literal> annotation lets us define an injection point "
@@ -44,81 +40,25 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:19
 #, fuzzy, no-c-format
 msgid "<emphasis>Bean constructor</emphasis> parameter injection:"
 msgstr ""
 "Iniezione dei parametri del <emphasis>metodo inizializzatore (initializer "
 "method)</emphasis>:"
 
-#. Tag: programlisting
-#: injection.xml:23
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private final ShoppingCart cart;\n"
-"    \n"
-"   @Inject\n"
-"   public Checkout(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"    private final ShoppingCart cart;\n"
-"    \n"
-"    @Initializer\n"
-"    public Checkout(ShoppingCart cart) {\n"
-"        this.cart = cart;\n"
-"    }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:26
 #, no-c-format
 msgid "A bean can only have one injectable constructor."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:31
 #, fuzzy, no-c-format
 msgid "<emphasis>Initializer method</emphasis> parameter injection:"
 msgstr ""
 "Iniezione dei parametri del <emphasis>metodo inizializzatore (initializer "
 "method)</emphasis>:"
 
-#. Tag: programlisting
-#: injection.xml:35
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private ShoppingCart cart;\n"
-"\n"
-"   @Inject\n"
-"   void setShoppingCart(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"    private ShoppingCart cart;\n"
-"\n"
-"    @Initializer \n"
-"    void setShoppingCart(ShoppingCart cart) {\n"
-"        this.cart = cart;\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:38
 #, no-c-format
 msgid ""
 "A bean can have multiple initializer methods. If the bean is a session bean, "
@@ -128,29 +68,11 @@
 
 # attributi o campi?
 #. Tag: para
-#: injection.xml:44
 #, no-c-format
 msgid "And direct field injection:"
 msgstr "Iniezione diretta degli attributi"
 
-#. Tag: programlisting
-#: injection.xml:48
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"   private @Inject ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"    private @Current ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:51
 #, no-c-format
 msgid ""
 "Getter and setter methods are not required for field injection to work "
@@ -158,7 +80,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:56
 #, fuzzy, no-c-format
 msgid ""
 "Dependency injection always occurs when the bean instance is first "
@@ -169,7 +90,6 @@
 "la prima volta."
 
 #. Tag: para
-#: injection.xml:63
 #, fuzzy, no-c-format
 msgid ""
 "First, the container calls the bean constructor (the default constructor or "
@@ -181,7 +101,6 @@
 
 # soggetti/sottoposti
 #. Tag: para
-#: injection.xml:69
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container initializes the values of all injected fields of the "
@@ -191,7 +110,6 @@
 "Bean soggetti ad iniezione."
 
 #. Tag: para
-#: injection.xml:74
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container calls all initializer methods of bean (the call order is "
@@ -201,7 +119,6 @@
 "Bean."
 
 #. Tag: para
-#: injection.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "Finally, the <literal>@PostConstruct</literal> method, if any, is called."
@@ -210,7 +127,6 @@
 "<literal>@PostConstruct</literal>."
 
 #. Tag: para
-#: injection.xml:86
 #, no-c-format
 msgid ""
 "(The only complication is that the container might call initializer methods "
@@ -219,7 +135,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:90
 #, no-c-format
 msgid ""
 "One major advantage of constructor injection is that it allows the bean to "
@@ -227,7 +142,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:95
 #, no-c-format
 msgid ""
 "CDI also supports parameter injection for some other methods that are "
@@ -235,30 +149,16 @@
 "producer methods:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:100
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:102
 #, no-c-format
 msgid ""
 "This is a case where the <literal>@Inject</literal> annotation <emphasis>is "
 "not</emphasis> required at the injection point. The same is true for "
-"observer methods (which we'll meet in <xref linkend=\"events\"/>) and "
+"observer methods (which we'll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:110
 #, no-c-format
 msgid "What gets injected"
 msgstr ""
@@ -266,7 +166,6 @@
 # algoritmo di risoluzione sicura rispetto ai tipi è corretto?
 # il che significa?
 #. Tag: para
-#: injection.xml:112
 #, fuzzy, no-c-format
 msgid ""
 "The CDI specification defines a procedure, called <emphasis>typesafe "
@@ -290,7 +189,6 @@
 "<literal>AmbiguousDependencyException</literal>."
 
 #. Tag: para
-#: injection.xml:120
 #, fuzzy, no-c-format
 msgid ""
 "The purpose of this algorithm is to allow multiple beans to implement the "
@@ -300,7 +198,6 @@
 "la stessa tipo definito dall'API e:"
 
 #. Tag: para
-#: injection.xml:126
 #, fuzzy, no-c-format
 msgid ""
 "allow the client to select which implementation it requires using a "
@@ -310,7 +207,6 @@
 "<emphasis>binding annotations</emphasis>,"
 
 #. Tag: para
-#: injection.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "allow the application deployer to select which implementation is appropriate "
@@ -323,13 +219,11 @@
 "deploy</emphasis>, o"
 
 #. Tag: para
-#: injection.xml:137
 #, no-c-format
 msgid "allow the beans to be isolated into separate modules."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:143
 #, no-c-format
 msgid ""
 "Obviously, if you have exactly one bean of a given type, and an injection "
@@ -339,7 +233,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:149
 #, no-c-format
 msgid ""
 "But then, things start to get complicated. Let's explore how the container "
@@ -348,13 +241,11 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:157
 #, fuzzy, no-c-format
 msgid "Qualifier annotations"
 msgstr "Annotazioni di binding"
 
 #. Tag: para
-#: injection.xml:159
 #, fuzzy, no-c-format
 msgid ""
 "If we have more than one bean that implements a particular bean type, the "
@@ -367,36 +258,7 @@
 "essere iniettato usando una binding annotation. Per esempio, ci potrebbero "
 "essere due implementazioni di <literal>PaymentProcessor</literal>:"
 
-#. Tag: programlisting
-#: injection.xml:165
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Synchronous\n"
-"public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: injection.xml:167
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Asynchronous\n"
-"public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:169
 #, fuzzy, no-c-format
 msgid ""
 "Where <literal>@Synchronous</literal> and <literal>@Asynchronous</literal> "
@@ -405,36 +267,7 @@
 "Dove <literal>@PayByCheque</literal> e <literal>@PayByCreditCard</literal> "
 "sono binding annotation:"
 
-#. Tag: programlisting
-#: injection.xml:173
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Synchronous {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayByCheque {}]]>"
-
-#. Tag: programlisting
-#: injection.xml:175
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Asynchronous {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayByCheque {}]]>"
-
 #. Tag: para
-#: injection.xml:177
 #, fuzzy, no-c-format
 msgid ""
 "A client bean developer uses the qualifier annotation to specify exactly "
@@ -444,77 +277,22 @@
 "specificare esattamente quale Web Bean debba essere iniettato."
 
 #. Tag: para
-#: injection.xml:181
 #, no-c-format
 msgid "Using field injection:"
 msgstr "Utilizzando l'iniezione a livello di campo:"
 
-#. Tag: programlisting
-#: injection.xml:183
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
-"@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@PayByCheque PaymentProcessor chequePaymentProcessor;\n"
-"@PayByCreditCard PaymentProcessor creditCardPaymentProcessor;]]>"
-
 # metodo inizializzatore?
 #. Tag: para
-#: injection.xml:185
 #, no-c-format
 msgid "Using initializer method injection:"
 msgstr "Utilizzando l'iniezione a livello di metodo inizializzatore:"
 
-#. Tag: programlisting
-#: injection.xml:187
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public void setPaymentProcessors(@Synchronous PaymentProcessor "
-"syncPaymentProcessor, \n"
-"                                 @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public void setPaymentProcessors(@PayByCheque PaymentProcessor "
-"chequePaymentProcessor, \n"
-"                                 @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:189
 #, fuzzy, no-c-format
 msgid "Using constructor injection:"
 msgstr "O usando l'iniezione a livello di costruttore:"
 
-#. Tag: programlisting
-#: injection.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
-"                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public Checkout(@PayByCheque PaymentProcessor chequePaymentProcessor, \n"
-"                @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:193
 #, no-c-format
 msgid ""
 "Qualifier annotations can also qualify method arguments of producer, "
@@ -523,29 +301,7 @@
 "runtime based on the state of the system:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:199
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces\n"
-"PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
-"syncPaymentProcessor,\n"
-"                                     @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   return isSynchronous() ? syncPaymentProcessor : asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public void setPaymentProcessors(@PayByCheque PaymentProcessor "
-"chequePaymentProcessor, \n"
-"                                 @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:201
 #, no-c-format
 msgid ""
 "If an injected field or a parameter of a bean constructor or initializer "
@@ -554,7 +310,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:206
 #, no-c-format
 msgid ""
 "Now, you may be thinking, <emphasis>\"What's the different between using a "
@@ -566,7 +321,6 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:216
 #, fuzzy, no-c-format
 msgid ""
 "The built-in qualifiers <literal>@Default</literal> and <literal>@Any</"
@@ -576,7 +330,6 @@
 "literal> e <literal>@PreDestroy</literal>."
 
 #. Tag: para
-#: injection.xml:218
 #, no-c-format
 msgid ""
 "Whenever a bean or injection point does not explicitly declare a qualifier, "
@@ -589,33 +342,18 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:225
 #, no-c-format
 msgid ""
 "This is especially useful if you want to iterate over all beans with a "
 "certain bean type. For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:226
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject \n"
-"void initServices(@Any Instance<Service> services) { \n"
-"   for (Service service: services) {\n"
-"      service.init();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:232
 #, no-c-format
 msgid "Qualifiers with members"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:234
 #, no-c-format
 msgid ""
 "Java annotations can have members. We can use annotation members to further "
@@ -625,42 +363,14 @@
 "single annotation with a member:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:240
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayBy {\n"
-"    PaymentType value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:242
 #, no-c-format
 msgid ""
 "Then we select one of the possible member values when appling the qualifier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:246
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 # qui e altrove, membro va bene?
 #. Tag: para
-#: injection.xml:248
 #, fuzzy, no-c-format
 msgid ""
 "We can force the container to ignore a member of a qualifier type by "
@@ -669,48 +379,17 @@
 "E' possibile indicare al manager Web Bean di ignorare un membro di un tipo "
 "di binding annotation annotando il membro con <literal>@NonBinding</literal>."
 
-#. Tag: programlisting
-#: injection.xml:253
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"   @Nonbinding String comment() default \"\";\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @NonBinding public String value();\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:258
 #, no-c-format
 msgid "Multiple qualifiers"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:260
 #, fuzzy, no-c-format
 msgid "An injection point may specify multiple qualifiers:"
 msgstr "Un punto di iniezione può anche specificare più binding annotation:"
 
-#. Tag: programlisting
-#: injection.xml:264
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
-"syncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:266
 #, fuzzy, no-c-format
 msgid ""
 "Then only a bean which has <emphasis>both</emphasis> qualifier annotations "
@@ -719,29 +398,12 @@
 "In questo caso, soltanto un Web Bean che ha <emphasis>entrambe</emphasis> le "
 "binding annotation sarebbe candidato ad essere iniettato."
 
-#. Tag: programlisting
-#: injection.xml:271
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Synchronous @Reliable\n"
-"public class SynchronousReliablePaymentProcessor implements PaymentProcessor "
-"{\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:276
 #, no-c-format
 msgid "Alternatives"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:278
 #, no-c-format
 msgid ""
 "Alternatives are beans whose implementation is specific to a particular "
@@ -750,22 +412,7 @@
 "<literal>@Asynchronous PaymentProcessor</literal>, all in one:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:282
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Synchronous @Asynchronous\n"
-"public class MockPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:284
 #, no-c-format
 msgid ""
 "By default, <literal>@Alternative</literal> beans are disabled. We need to "
@@ -774,24 +421,7 @@
 "and injection. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:290
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <class>org.mycompany.mock.MockPaymentProcessor</class>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:292
 #, no-c-format
 msgid ""
 "When an ambiguous dependency exists at an injection point, the container "
@@ -801,13 +431,11 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:301
 #, fuzzy, no-c-format
 msgid "Fixing unsatisfied and ambiguous dependencies"
 msgstr "Risoluzione di dipendenze non soddisfatte"
 
 #. Tag: para
-#: injection.xml:303
 #, fuzzy, no-c-format
 msgid ""
 "The typesafe resolution algorithm fails when, after considering the "
@@ -824,7 +452,6 @@
 "iniettare."
 
 #. Tag: para
-#: injection.xml:310
 #, no-c-format
 msgid ""
 "During the course of your development, you're going to encounter this "
@@ -832,13 +459,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:314
 #, no-c-format
 msgid "To fix an <emphasis>unsatisfied dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:320
 #, no-c-format
 msgid ""
 "create a bean which implements the bean type and has all the qualifier types "
@@ -846,7 +471,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:325
 #, no-c-format
 msgid ""
 "make sure that the bean you already have is in the classpath of the module "
@@ -854,7 +478,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:330
 #, no-c-format
 msgid ""
 "explicitly enable an <literal>@Alternative</literal> bean that implements "
@@ -863,13 +486,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:337
 #, no-c-format
 msgid "To fix an <emphasis>ambiguous dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:343
 #, no-c-format
 msgid ""
 "introduce a qualifier to distinguish between the two implementations of the "
@@ -877,14 +498,12 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:348
 #, no-c-format
 msgid ""
 "disable one of the beans by annotating it <literal>@Alternative</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:353
 #, no-c-format
 msgid ""
 "move one of the implementations to a module that is not in the classpath of "
@@ -892,7 +511,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:359
 #, no-c-format
 msgid ""
 "disable one of two <literal>@Alternative</literal> beans that are trying to "
@@ -900,7 +518,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:366
 #, no-c-format
 msgid ""
 "See <ulink url=\"http://sfwk.org/Documentation/"
@@ -911,22 +528,19 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:374
 #, no-c-format
 msgid "Just remember: \"There can be only one.\""
 msgstr ""
 
 #. Tag: para
-#: injection.xml:377
 #, no-c-format
 msgid ""
 "On the other hand, if you really do have an optional or multivalued "
 "injection point, you should change the type of your injection point to "
-"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\"/>."
+"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:382
 #, fuzzy, no-c-format
 msgid ""
 "Now there's one more issue you need to be aware of when using the dependency "
@@ -936,13 +550,11 @@
 "la dependency injection in Web Beans."
 
 #. Tag: title
-#: injection.xml:389
 #, no-c-format
 msgid "Client proxies"
 msgstr "Client proxy"
 
 #. Tag: para
-#: injection.xml:391
 #, fuzzy, no-c-format
 msgid ""
 "Clients of an injected bean do not usually hold a direct reference to a bean "
@@ -953,13 +565,12 @@
 "riferimento diretto all'istanza del Web Bean."
 
 #. Tag: para
-#: injection.xml:396
 #, fuzzy, no-c-format
 msgid ""
 "Imagine that a bean bound to the application scope held a direct reference "
 "to a bean bound to the request scope. The application-scoped bean is shared "
 "between many different requests. However, each request should see a "
-"different instance of the request scoped bean&#8212;the current one!"
+"different instance of the request scoped bean—the current one!"
 msgstr ""
 "Immaginiamo che un Web Bean associato allo scope applicazione tenga un "
 "riferimento diretto a un Web Bean associato allo scope richiesta. Il Web "
@@ -969,7 +580,6 @@
 
 # con scope sessione andrebbe meglio tardotto con->che sta in sessione (e zosì per tutte le situazioni analoghe?)?
 #. Tag: para
-#: injection.xml:402
 #, fuzzy, no-c-format
 msgid ""
 "Now imagine that a bean bound to the session scope holds a direct reference "
@@ -986,7 +596,6 @@
 "dovrebbe essere serializzato insieme al Web Bean con scope sessione!"
 
 #. Tag: para
-#: injection.xml:409
 #, fuzzy, no-c-format
 msgid ""
 "Therefore, unless a bean has the default scope <literal>@Dependent</"
@@ -1008,7 +617,6 @@
 "senza serializzare ricorsivamente altri Web Beans che siano stati iniettati."
 
 #. Tag: para
-#: injection.xml:417
 #, fuzzy, no-c-format
 msgid ""
 "Unfortunately, due to limitations of the Java language, some Java types "
@@ -1024,7 +632,6 @@
 "iniezione non può essere gestito tramite proxy."
 
 #. Tag: para
-#: injection.xml:423
 #, fuzzy, no-c-format
 msgid "The following Java types cannot be proxied by the container:"
 msgstr ""
@@ -1032,7 +639,6 @@
 "Web Bean:"
 
 #. Tag: para
-#: injection.xml:427
 #, fuzzy, no-c-format
 msgid ""
 "classes which don't have a non-private constructor with no parameters, and"
@@ -1041,7 +647,6 @@
 "parametri, e"
 
 #. Tag: para
-#: injection.xml:430
 #, no-c-format
 msgid ""
 "classes which are declared <literal>final</literal> or have a "
@@ -1051,13 +656,11 @@
 "<literal>final</literal>,"
 
 #. Tag: para
-#: injection.xml:435
 #, no-c-format
 msgid "arrays and primitive types."
 msgstr "array e tipi primitivi."
 
 #. Tag: para
-#: injection.xml:439
 #, no-c-format
 msgid ""
 "It's usually very easy to fix an unproxyable dependency problem. If an "
@@ -1066,13 +669,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:446
 #, no-c-format
 msgid "add a constructor with no parameters to <literal>X</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:451
 #, no-c-format
 msgid ""
 "change the type of the injection point to <literal>Instance&lt;X&gt;</"
@@ -1080,7 +681,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:456
 #, no-c-format
 msgid ""
 "introduce an interface <literal>Y</literal>, implemented by the injected "
@@ -1088,7 +688,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:462
 #, no-c-format
 msgid ""
 "if all else fails, change the scope of the injected bean to "
@@ -1096,7 +695,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:469
 #, no-c-format
 msgid ""
 "A future release of Weld will likely support a non-standard workaround for "
@@ -1104,7 +702,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:476
 #, no-c-format
 msgid ""
 "Sun, IcedTea, Mac: <literal>Unsafe.allocateInstance()</literal> (The most "
@@ -1112,7 +709,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:481
 #, no-c-format
 msgid ""
 "IBM, JRockit: <literal>ReflectionFactory.newConstructorForSerialization()</"
@@ -1120,19 +716,16 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:487
 #, no-c-format
 msgid "But we didn't get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:496
 #, fuzzy, no-c-format
 msgid "Obtaining a contextual instance by programmatic lookup"
 msgstr "Ottenere un riferimento a un Web Bean via codice"
 
 #. Tag: para
-#: injection.xml:498
 #, no-c-format
 msgid ""
 "In certain situations, injection is not the most convenient way to obtain a "
@@ -1140,13 +733,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:505
 #, no-c-format
 msgid "the bean type or qualifiers vary dynamically at runtime, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:510
 #, no-c-format
 msgid ""
 "depending upon the deployment, there may be no bean which satisfies the type "
@@ -1154,14 +745,12 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:515
 #, no-c-format
 msgid "we would like to iterate over all beans of a certain type."
 msgstr ""
 
 # traduzione letterale: secondo me l'originale si capisce, ma non è proprio semanticamente corretto.
 #. Tag: para
-#: injection.xml:521
 #, fuzzy, no-c-format
 msgid ""
 "In these situations, the application may obtain an instance of the interface "
@@ -1170,14 +759,7 @@
 "L'applicazione può ottenere un'istanza dell'interfaccia <literal>Manager</"
 "literal> attraverso iniezione:"
 
-#. Tag: programlisting
-#: injection.xml:526
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:528
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>get()</literal> method of <literal>Instance</literal> produces "
@@ -1186,26 +768,17 @@
 "i tipi di deploy individuati da <literal>@Mock</literal> e "
 "<literal>@Staging</literal> per i test"
 
-#. Tag: programlisting
-#: injection.xml:532
-#, fuzzy, no-c-format
-msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:534
 #, no-c-format
 msgid "Qualifiers can be specified in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:540
 #, no-c-format
 msgid "by annotating the <literal>Instance</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:543
 #, fuzzy, no-c-format
 msgid ""
 "by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
@@ -1215,22 +788,11 @@
 "literal> e <literal>@PreDestroy</literal>."
 
 #. Tag: para
-#: injection.xml:547
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is much, much easier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:551
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
-"paymentProcessorSource;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:553
 #, no-c-format
 msgid ""
 "Now, the <literal>PaymentProcessor</literal> returned by <literal>get()</"
@@ -1238,7 +800,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:558
 #, no-c-format
 msgid ""
 "Alternatively, we can specify the qualifier dynamically. First, we add the "
@@ -1246,15 +807,7 @@
 "default qualifier. (All beans have the qualifier <literal>@Any</literal>.)"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:563
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:565
 #, no-c-format
 msgid ""
 "Next, we need to obtain an instance of our qualifier type. Since annotatons "
@@ -1264,68 +817,30 @@
 "subclassing the helper class <literal>AnnotationLiteral</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:572
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[abstract class AsynchronousQualifier\n"
-"extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
-msgstr ""
-"<![CDATA[abstract class CreditCardBinding \n"
-"    extends AnnotationLiteral<CreditCard> \n"
-"    implements CreditCard {}]]>"
-
 #. Tag: para
-#: injection.xml:574
 #, no-c-format
 msgid "In some cases, we can use an anonymous class:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:578
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
-"   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
-msgstr ""
-"<![CDATA[PaymentProcessor p = manager.getInstanceByType(PaymentProcessor."
-"class, \n"
-"                                               new "
-"AnnotationLiteral<CreditCard>(){});]]>"
-
 #. Tag: para
-#: injection.xml:581
 #, no-c-format
 msgid ""
 "We can't use an anonymous class to implement a qualifier type with members."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:586
 #, no-c-format
 msgid ""
 "Now, finally, we can pass the qualifier to the <literal>select()</literal> "
 "method of <literal>Instance</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:590
-#, no-c-format
-msgid ""
-"<![CDATA[Annotation qualifier = synchronously ?\n"
-"      new SynchronousQualifier() : new AsynchronousQualifier();\n"
-"PaymentProcessor p = anyPaymentProcessor.select(qualifier).get().process"
-"(payment);]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:595
 #, no-c-format
 msgid "The <literal>InjectionPoint</literal> object"
 msgstr "L'oggetto <literal>InjectionPoint</literal>"
 
 #. Tag: para
-#: injection.xml:597
 #, fuzzy, no-c-format
 msgid ""
 "There are certain kinds of dependent objects (beans with scope "
@@ -1339,7 +854,6 @@
 "devono. Per esempio:"
 
 #. Tag: para
-#: injection.xml:603
 #, no-c-format
 msgid ""
 "The log category for a <literal>Logger</literal> depends upon the class of "
@@ -1349,7 +863,6 @@
 "dell'oggetto che lo contiene."
 
 #. Tag: para
-#: injection.xml:607
 #, no-c-format
 msgid ""
 "Injection of a HTTP parameter or header value depends upon what parameter or "
@@ -1359,7 +872,6 @@
 "parametro o dello header specificato nel punto di iniezione."
 
 #. Tag: para
-#: injection.xml:611
 #, no-c-format
 msgid ""
 "Injection of the result of an EL expression evaluation depends upon the "
@@ -1369,7 +881,6 @@
 "specificata nel punto di iniezione."
 
 #. Tag: para
-#: injection.xml:616
 #, fuzzy, no-c-format
 msgid ""
 "A bean with scope <literal>@Dependent</literal> may inject an instance of "
@@ -1381,7 +892,6 @@
 "riguardanti il punto di iniezione cui appartiene."
 
 #. Tag: para
-#: injection.xml:620
 #, no-c-format
 msgid ""
 "Let's look at an example. The following code is verbose, and vulnerable to "
@@ -1390,14 +900,7 @@
 "Vediamo un esempio. Il codice seguente è prolisso e vulnerabile a problemi "
 "di refactoring:"
 
-#. Tag: programlisting
-#: injection.xml:623
-#, no-c-format
-msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-msgstr "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-
 #. Tag: para
-#: injection.xml:625
 #, no-c-format
 msgid ""
 "This clever little producer method lets you inject a JDK <literal>Logger</"
@@ -1407,42 +910,12 @@
 "<literal>Logger</literal> JDK senza specificare esplicitamente la categoria "
 "di log:"
 
-#. Tag: programlisting
-#: injection.xml:628
-#, no-c-format
-msgid ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:630
 #, no-c-format
 msgid "We can now write:"
 msgstr "Ora è possibile scrivere:"
 
-#. Tag: programlisting
-#: injection.xml:632
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject Logger log;]]>"
-msgstr "<![CDATA[@Current Logger log;]]>"
-
 #. Tag: para
-#: injection.xml:634
 #, fuzzy, no-c-format
 msgid ""
 "Not convinced? Then here's a second example. To inject HTTP parameters, we "
@@ -1451,74 +924,19 @@
 "Non siete convinti? Eccovi un secondo esempio. Per iniettare parametri HTTP, "
 "è necessario definire un tipo di binding:"
 
-#. Tag: programlisting
-#: injection.xml:637
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @Nonbinding public String value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @NonBinding public String value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:639
 #, fuzzy, no-c-format
 msgid "We would use this qualifier type at injection points as follows:"
 msgstr ""
 "Potremmo usare questo tipo di binding in corrispondenza ai punti di "
 "iniezione in questo modo:"
 
-#. Tag: programlisting
-#: injection.xml:641
-#, no-c-format
-msgid ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-msgstr ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-
 #. Tag: para
-#: injection.xml:643
 #, no-c-format
 msgid "The following producer method does the work:"
 msgstr "Il seguente metodo produttore esegue il lavoro:"
 
-#. Tag: programlisting
-#: injection.xml:645
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotated().getAnnotation(HttpParam."
-"class).value());\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotation(HttpParam.class).value"
-"());\n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:647
 #, fuzzy, no-c-format
 msgid ""
 "(Note that the <literal>value()</literal> member of the <literal>HttpParam</"
@@ -1531,7 +949,6 @@
 
 # di sistema o precostituito ?
 #. Tag: para
-#: injection.xml:650
 #, fuzzy, no-c-format
 msgid ""
 "The container provides a built-in bean that implements the "
@@ -1540,30 +957,395 @@
 "Il manager Web Bean fornisce un Web Bean di sistema che implementa "
 "l'interfaccia <literal>InjectionPoint</literal>:"
 
-#. Tag: programlisting
-#: injection.xml:653
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Type getType();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Bean<?> getBean();\n"
-"   public Member getMember();\n"
-"   public Annotated getAnnotated();\n"
-"   public boolean isDelegate();\n"
-"   public boolean isTransient();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Object getInstance(); \n"
-"   public Bean<?> getBean(); \n"
-"   public Member getMember(): \n"
-"   public <T extends Annotation> T getAnnotation(Class<T> annotation); \n"
-"   public Set<T extends Annotation> getAnnotations(); \n"
-"}]]>"
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   public Checkout(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "    private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "    @Initializer\n"
+#~ "    public Checkout(ShoppingCart cart) {\n"
+#~ "        this.cart = cart;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "}]]>"
 
 #, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private ShoppingCart cart;\n"
+#~ "\n"
+#~ "   @Inject\n"
+#~ "   void setShoppingCart(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "    private ShoppingCart cart;\n"
+#~ "\n"
+#~ "    @Initializer \n"
+#~ "    void setShoppingCart(ShoppingCart cart) {\n"
+#~ "        this.cart = cart;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "   private @Inject ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "    private @Current ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Synchronous\n"
+#~ "public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Asynchronous\n"
+#~ "public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Synchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayByCheque {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Asynchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayByCheque {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
+#~ "@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque PaymentProcessor chequePaymentProcessor;\n"
+#~ "@PayByCreditCard PaymentProcessor creditCardPaymentProcessor;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public void setPaymentProcessors(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor, \n"
+#~ "                                 @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public void setPaymentProcessors(@PayByCheque PaymentProcessor "
+#~ "chequePaymentProcessor, \n"
+#~ "                                 @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
+#~ "                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public Checkout(@PayByCheque PaymentProcessor chequePaymentProcessor, \n"
+#~ "                @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces\n"
+#~ "PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor,\n"
+#~ "                                     @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   return isSynchronous() ? syncPaymentProcessor : "
+#~ "asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public void setPaymentProcessors(@PayByCheque PaymentProcessor "
+#~ "chequePaymentProcessor, \n"
+#~ "                                 @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayBy {\n"
+#~ "    PaymentType value();\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "   @Nonbinding String comment() default \"\";\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @NonBinding public String value();\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
+#~ "syncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Synchronous @Reliable\n"
+#~ "public class SynchronousReliablePaymentProcessor implements "
+#~ "PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative @Synchronous @Asynchronous\n"
+#~ "public class MockPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
+#~ "paymentProcessorSource;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]"
+#~ ">"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[abstract class AsynchronousQualifier\n"
+#~ "extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[abstract class CreditCardBinding \n"
+#~ "    extends AnnotationLiteral<CreditCard> \n"
+#~ "    implements CreditCard {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
+#~ "   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
+#~ msgstr ""
+#~ "<![CDATA[PaymentProcessor p = manager.getInstanceByType(PaymentProcessor."
+#~ "class, \n"
+#~ "                                               new "
+#~ "AnnotationLiteral<CreditCard>(){});]]>"
+
+#~ msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
+#~ msgstr "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
+
+#~ msgid ""
+#~ "<![CDATA[class LogFactory {\n"
+#~ "\n"
+#~ "   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
+#~ "      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass"
+#~ "().getName()); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[class LogFactory {\n"
+#~ "\n"
+#~ "   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
+#~ "      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass"
+#~ "().getName()); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject Logger log;]]>"
+#~ msgstr "<![CDATA[@Current Logger log;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @Nonbinding public String value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @NonBinding public String value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@HttpParam(\"username\") String username;\n"
+#~ "@HttpParam(\"password\") String password;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@HttpParam(\"username\") String username;\n"
+#~ "@HttpParam(\"password\") String password;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[class HttpParams\n"
+#~ "\n"
+#~ "   @Produces @HttpParam(\"\")\n"
+#~ "   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
+#~ "      return request.getParameter(ip.getAnnotated().getAnnotation"
+#~ "(HttpParam.class).value());\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[class HttpParams\n"
+#~ "\n"
+#~ "   @Produces @HttpParam(\"\")\n"
+#~ "   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
+#~ "      return request.getParameter(ip.getAnnotation(HttpParam.class).value"
+#~ "());\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public interface InjectionPoint { \n"
+#~ "   public Type getType();\n"
+#~ "   public Set<Annotation> getQualifiers();\n"
+#~ "   public Bean<?> getBean();\n"
+#~ "   public Member getMember();\n"
+#~ "   public Annotated getAnnotated();\n"
+#~ "   public boolean isDelegate();\n"
+#~ "   public boolean isTransient();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface InjectionPoint { \n"
+#~ "   public Object getInstance(); \n"
+#~ "   public Bean<?> getBean(); \n"
+#~ "   public Member getMember(): \n"
+#~ "   public <T extends Annotation> T getAnnotation(Class<T> annotation); \n"
+#~ "   public Set<T extends Annotation> getAnnotations(); \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
 #~ "It's usually very easy to fix an unproxyable dependency problem. Simply "
 #~ "add a constructor with no parameters to the injected class, introduce an "
 #~ "interface, or, if all else fails, change the scope of the injected bean "

Modified: doc/trunk/reference/it-IT/interceptors.po
===================================================================
--- doc/trunk/reference/it-IT/interceptors.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/interceptors.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-05 00:26+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: interceptors.xml:5
 #, no-c-format
 msgid "Interceptors"
 msgstr "Gli interceptor"
 
 #. Tag: para
-#: interceptors.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Interceptor functionality is defined in the Java Interceptors specification. "
@@ -31,7 +29,6 @@
 "associare interceptor ai Web Beans."
 
 #. Tag: para
-#: interceptors.xml:12
 #, fuzzy, no-c-format
 msgid ""
 "The Interceptors specification defines two kinds of interception points:"
@@ -39,27 +36,23 @@
 "\"La specifica Web Bean definisce due tipi di punti di intercettazione:"
 
 #. Tag: para
-#: interceptors.xml:18
 #, no-c-format
 msgid "business method interception, and"
 msgstr "intercettazione del metodo di business, e"
 
 # lifecycle callback interception = ?
 #. Tag: para
-#: interceptors.xml:21
 #, no-c-format
 msgid "lifecycle callback interception."
 msgstr "intercettazione della chiamata del ciclo di vita"
 
 #. Tag: para
-#: interceptors.xml:25
 #, fuzzy, no-c-format
 msgid "In addition, the EJB specification defines timeout method interception."
 msgstr ""
 "\"La specifica Web Bean definisce due tipi di punti di intercettazione:"
 
 #. Tag: para
-#: interceptors.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>business method interceptor</emphasis> applies to invocations of "
@@ -68,24 +61,8 @@
 "Un <emphasis>interceptor di un metodo di business</emphasis> si applica alle "
 "invocazioni di metodi del Web Bean da parte di client del Web Bean:"
 
-#. Tag: programlisting
-#: interceptors.xml:34
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 # rivedere la frase
 #. Tag: para
-#: interceptors.xml:36
 #, no-c-format
 msgid ""
 "A <emphasis>lifecycle callback interceptor</emphasis> applies to invocations "
@@ -94,22 +71,7 @@
 "Un <emphasis>interceptor di chiamata del ciclo di vita</emphasis> si applica "
 "alle invocazioni delle chiamate del ciclo di vita da parte del container:"
 
-#. Tag: programlisting
-#: interceptors.xml:41
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"   @PostConstruct \n"
-"   public void injectDependencies(InvocationContext ctx) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"    @PostConstruct public void injectDependencies(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:43
 #, no-c-format
 msgid ""
 "An interceptor class may intercept both lifecycle callbacks and business "
@@ -120,7 +82,6 @@
 
 # rivedere la frase
 #. Tag: para
-#: interceptors.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>timeout method interceptor</emphasis> applies to invocations of "
@@ -129,29 +90,12 @@
 "Un <emphasis>interceptor di chiamata del ciclo di vita</emphasis> si applica "
 "alle invocazioni delle chiamate del ciclo di vita da parte del container:"
 
-#. Tag: programlisting
-#: interceptors.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TimeoutInterceptor {\n"
-"   @AroundTimeout \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:55
 #, no-c-format
 msgid "Interceptor bindings"
 msgstr "Interceptor bindings"
 
 #. Tag: para
-#: interceptors.xml:57
 #, fuzzy, no-c-format
 msgid ""
 "Suppose we want to declare that some of our beans are transactional. The "
@@ -162,22 +106,7 @@
 "cosa necessaria è un'<emphasis>annotazione di interceptor binding</emphasis> "
 "per specificare esattamente quali Web Beans sono interessati:"
 
-#. Tag: programlisting
-#: interceptors.xml:62
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-
 #. Tag: para
-#: interceptors.xml:64
 #, no-c-format
 msgid ""
 "Now we can easily specify that our <literal>ShoppingCart</literal> is a "
@@ -186,43 +115,18 @@
 "Ora è facilmente possibile specificare che <literal>ShoppingCart</literal> è "
 "un oggetto transazionale:"
 
-#. Tag: programlisting
-#: interceptors.xml:68
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:70
 #, no-c-format
 msgid "Or, if we prefer, we can specify that just one method is transactional:"
 msgstr ""
 "O se si preferisce, si può specificare che solo un metodo sia transazionale:"
 
-#. Tag: programlisting
-#: interceptors.xml:74
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class ShoppingCart {\n"
-"    @Transactional public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:79
 #, no-c-format
 msgid "Implementing interceptors"
 msgstr "Implementare gli interceptor"
 
 #. Tag: para
-#: interceptors.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "That's great, but somewhere along the line we're going to have to actually "
@@ -235,69 +139,23 @@
 "interceptor EJB standard e annotarlo con <literal>@Interceptor</literal> e "
 "<literal>@Transactional</literal>.\""
 
-#. Tag: programlisting
-#: interceptors.xml:87
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:89
 #, no-c-format
 msgid "Interceptors can take advantage of dependency injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:93
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource UserTransaction transaction;\n"
-"\n"
-"    @AroundInvoke \n"
-"    public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource Transaction transaction;\n"
-"\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:95
 #, no-c-format
 msgid "Multiple interceptors may use the same interceptor binding type."
 msgstr ""
 "Diverso interceptor possono usare lo stesso tipo di interceptor binding."
 
 #. Tag: title
-#: interceptors.xml:102
 #, no-c-format
 msgid "Enabling interceptors"
 msgstr "Abilitare gli interceptor"
 
 #. Tag: para
-#: interceptors.xml:104
 #, no-c-format
 msgid ""
 "By default, all interceptors are disabled. We need to <emphasis>enable</"
@@ -305,31 +163,13 @@
 "a bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:110
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:112
 #, no-c-format
 msgid "Whoah! Why the angle bracket stew?"
 msgstr ""
 "Ma perché viene usato ancora XML, quando Web Beans non dovrebbe utilizzarlo?"
 
 #. Tag: para
-#: interceptors.xml:114
 #, fuzzy, no-c-format
 msgid ""
 "Well, having the XML declaration is actually a <emphasis>good thing</"
@@ -337,7 +177,6 @@
 msgstr "La dichiarazione XML risolve due problemi:"
 
 #. Tag: para
-#: interceptors.xml:120
 #, no-c-format
 msgid ""
 "it enables us to specify a total ordering for all the interceptors in our "
@@ -347,7 +186,6 @@
 "del sistema, assicurando un comportamente deterministico, e"
 
 #. Tag: para
-#: interceptors.xml:126
 #, no-c-format
 msgid "it lets us enable or disable interceptor classes at deployment time."
 msgstr ""
@@ -355,7 +193,6 @@
 "time"
 
 #. Tag: para
-#: interceptors.xml:130
 #, fuzzy, no-c-format
 msgid ""
 "For example, we could specify that our security interceptor runs before our "
@@ -364,25 +201,7 @@
 "Per esempio è possibile specificare che l'interceptor di sicurezza venga "
 "eseguito prima di <literal>TransactionInterceptor</literal>.\""
 
-#. Tag: programlisting
-#: interceptors.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.SecurityInterceptor</class>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:136
 #, no-c-format
 msgid ""
 "Or we could turn them both off in our test environment by simply not "
@@ -390,13 +209,11 @@
 msgstr ""
 
 #. Tag: title
-#: interceptors.xml:142
 #, no-c-format
 msgid "Interceptor bindings with members"
 msgstr "Interceptor binding con membri"
 
 #. Tag: para
-#: interceptors.xml:144
 #, no-c-format
 msgid ""
 "Suppose we want to add some extra information to our "
@@ -405,26 +222,7 @@
 "Si supponga di voler aggiungere qualche informazione extra all'annotazione  "
 "<literal>@Transactional</literal>:"
 
-#. Tag: programlisting
-#: interceptors.xml:148
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"   boolean requiresNew() default false;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"    boolean requiresNew() default false;\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:150
 #, fuzzy, no-c-format
 msgid ""
 "CDI will use the value of <literal>requiresNew</literal> to choose between "
@@ -435,25 +233,7 @@
 "scegliere tra due diversi interceptor, <literal>TransactionInterceptor</"
 "literal> e <literal>RequiresNewTransactionInterceptor</literal>."
 
-#. Tag: programlisting
-#: interceptors.xml:155
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional(requiresNew=true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:157
 #, no-c-format
 msgid ""
 "Now we can use <literal>RequiresNewTransactionInterceptor</literal> like "
@@ -462,18 +242,7 @@
 "Ora è possibile usare <literal>RequiresNewTransactionInterceptor</literal> "
 "in questo modo:"
 
-#. Tag: programlisting
-#: interceptors.xml:161
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true)\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional(requiresNew=true)\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:163
 #, fuzzy, no-c-format
 msgid ""
 "But what if we only have one interceptor and we want the container to ignore "
@@ -485,32 +254,12 @@
 "ignori il valore di <literal>requiresNew</literal> quando si associa "
 "l'interceptor? Si può usare l'annotazione <literal>@NonBinding</literal>:"
 
-#. Tag: programlisting
-#: interceptors.xml:169
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"   @Nonbinding String[] rolesAllowed() default {};\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"    @NonBinding String[] rolesAllowed() default {};\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:174
 #, no-c-format
 msgid "Multiple interceptor binding annotations"
 msgstr "Annotazioni per interceptor binding multipli"
 
 #. Tag: para
-#: interceptors.xml:176
 #, fuzzy, no-c-format
 msgid ""
 "Usually we use combinations of interceptor bindings types to bind multiple "
@@ -524,18 +273,7 @@
 "<literal>TransactionInterceptor</literal> e <literal>SecurityInterceptor</"
 "literal> allo stesso Web Bean:"
 
-#. Tag: programlisting
-#: interceptors.xml:182
-#, no-c-format
-msgid ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:184
 #, no-c-format
 msgid ""
 "However, in very complex cases, an interceptor itself may specify some "
@@ -544,18 +282,7 @@
 "Comunque in casi molto complessi un interceptor da solo potrebbe specificare "
 "alcune combinazioni di tipi di interceptor binding:"
 
-#. Tag: programlisting
-#: interceptors.xml:189
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:191
 #, no-c-format
 msgid ""
 "Then this interceptor could be bound to the <literal>checkout()</literal> "
@@ -564,68 +291,12 @@
 "Allora quest'interceptor potrebbe venire associato al metodo "
 "<literal>checkout()</literal> usando una delle seguenti combinazioni:"
 
-#. Tag: programlisting
-#: interceptors.xml:196
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class ShoppingCart {\n"
-"    @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:198
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"    @Transactional public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:200
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart {\n"
-"   @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactionl\n"
-"public class ShoppingCart {\n"
-"    @Secure public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:202
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"    public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:207
 #, no-c-format
 msgid "Interceptor binding type inheritance"
 msgstr "Ereditarietà del tipo di interceptor binding"
 
 #. Tag: para
-#: interceptors.xml:209
 #, no-c-format
 msgid ""
 "One limitation of the Java language support for annotations is the lack of "
@@ -636,23 +307,14 @@
 "mancanza di ereditarietà delle annotazioni. In verità le annotazioni "
 "dovrebbero avere il riutilizzo predefinito per consentire che questo avvenga:"
 
-#. Tag: programlisting
-#: interceptors.xml:214
-#, no-c-format
-msgid ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-msgstr ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:216
 #, fuzzy, no-c-format
 msgid ""
 "Well, fortunately, CDI works around this missing feature of Java. We may "
 "annotate one interceptor binding type with other interceptor binding types "
 "(termed a <emphasis>meta-annotation</emphasis>). The interceptor bindings "
-"are transitive &#8212; any bean with the first interceptor binding inherits "
-"the interceptor bindings declared as meta-annotations."
+"are transitive — any bean with the first interceptor binding inherits the "
+"interceptor bindings declared as meta-annotations."
 msgstr ""
 "Fortunatamente Web Beans provvede a questa mancanza di Java. E' possibile "
 "annotare un tipo di interceptor binding con altri tipi di interceptor "
@@ -660,24 +322,7 @@
 "con il primo interceptor binding eredita gli interceptor binding dichiarati "
 "come meta-annotazioni."
 
-#. Tag: programlisting
-#: interceptors.xml:223
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBinding\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBindingType\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:225
 #, fuzzy, no-c-format
 msgid ""
 "Now, any bean annotated <literal>@Action</literal> will be bound to both "
@@ -691,13 +336,11 @@
 "<literal>TransactionalSecureInterceptor</literal>, se questo esiste.)"
 
 #. Tag: title
-#: interceptors.xml:234
 #, no-c-format
 msgid "Use of <literal>@Interceptors</literal>"
 msgstr "Uso di <literal>@Interceptors</literal>"
 
 #. Tag: para
-#: interceptors.xml:236
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>@Interceptors</literal> annotation defined by the interceptor "
@@ -707,37 +350,18 @@
 "L'annotazione <literal>@Interceptors</literal> definita dalla specifica EJB "
 "è supportata per entrambi i Web Bean semplici ed enterprise, per esempio:"
 
-#. Tag: programlisting
-#: interceptors.xml:239
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"    public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:241
 #, no-c-format
 msgid "However, this approach suffers the following drawbacks:"
 msgstr "Comunque, quest'approccio soffre dei seguenti difetti:"
 
 #. Tag: para
-#: interceptors.xml:245
 #, no-c-format
 msgid "the interceptor implementation is hardcoded in business code,"
 msgstr ""
 "l'implementazione degli interceptor è codificata nel codice di business,"
 
 #. Tag: para
-#: interceptors.xml:250
 #, no-c-format
 msgid "interceptors may not be easily disabled at deployment time, and"
 msgstr ""
@@ -745,22 +369,273 @@
 "time, e"
 
 #. Tag: para
-#: interceptors.xml:255
 #, fuzzy, no-c-format
 msgid ""
-"the interceptor ordering is non-global &#8212; it is determined by the order "
-"in which interceptors are listed at the class level."
+"the interceptor ordering is non-global — it is determined by the order in "
+"which interceptors are listed at the class level."
 msgstr ""
 "l'ordinamento degli interceptor è non-globale &#151; è determinata "
 "dall'ordine in cui gli interceptor sono elencati al livello di classe."
 
 #. Tag: para
-#: interceptors.xml:262
 #, fuzzy, no-c-format
 msgid "Therefore, we recommend the use of CDI-style interceptor bindings."
 msgstr "Quindi si raccomanda l'uso di interceptor binding di stile Web Beans."
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DependencyInjectionInterceptor {\n"
+#~ "   @PostConstruct \n"
+#~ "   public void injectDependencies(InvocationContext ctx) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DependencyInjectionInterceptor {\n"
+#~ "    @PostConstruct public void injectDependencies(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class TimeoutInterceptor {\n"
+#~ "   @AroundTimeout \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "    @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke \n"
+#~ "    public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource Transaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {\n"
+#~ "   boolean requiresNew() default false;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {\n"
+#~ "    boolean requiresNew() default false;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
+#~ "public class RequiresNewTransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional(requiresNew=true) @Interceptor\n"
+#~ "public class RequiresNewTransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional(requiresNew = true)\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional(requiresNew=true)\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Secure {\n"
+#~ "   @Nonbinding String[] rolesAllowed() default {};\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Secure {\n"
+#~ "    @NonBinding String[] rolesAllowed() default {};\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure @Interceptor\n"
+#~ "public class TransactionalSecureInterceptor { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure @Interceptor\n"
+#~ "public class TransactionalSecureInterceptor { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "    @Transactional @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "    @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactionl\n"
+#~ "public class ShoppingCart {\n"
+#~ "    @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "    public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "@InterceptorBinding\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Action { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "@InterceptorBindingType\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Action { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
+#~ "class})\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
+#~ "class})\n"
+#~ "public class ShoppingCart {\n"
+#~ "    public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "Web Beans re-uses the basic interceptor architecture of EJB 3.0, "
 #~ "extending the functionality in two directions:"
 #~ msgstr ""

Modified: doc/trunk/reference/it-IT/intro.po
===================================================================
--- doc/trunk/reference/it-IT/intro.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/intro.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-25 12:11+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,14 +14,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: intro.xml:4
 #, no-c-format
 msgid "Introduction"
 msgstr ""
 
 # Rendere la frase "wondering what kinds of hoops the Web Beans specification will make you jump through!" più italiana.
 #. Tag: para
-#: intro.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "So you're keen to get started writing your first bean? Or perhaps you're "
@@ -37,13 +35,11 @@
 "Bean scritto."
 
 #. Tag: title
-#: intro.xml:13
 #, fuzzy, no-c-format
 msgid "What is a bean?"
 msgstr "Cosa è un Web Bean?"
 
 #. Tag: para
-#: intro.xml:15
 #, no-c-format
 msgid ""
 "A bean is exactly what you think it is. Only now, it has a true identity in "
@@ -51,7 +47,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:19
 #, no-c-format
 msgid ""
 "Prior to Java EE 6, there was no clear definition of the term \"bean\" in "
@@ -64,7 +59,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:27
 #, no-c-format
 msgid ""
 "Java EE 6 finally lays down that common definition in the Managed Beans "
@@ -78,14 +72,13 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:36
 #, no-c-format
 msgid ""
 "With very few exceptions, almost every concrete Java class that has a "
 "constructor with no parameters (or a constructor designated with the "
 "annotation <literal>@Inject</literal>) is a bean. This includes every "
 "JavaBean and every EJB session bean. If you've already got some JavaBeans or "
-"session beans lying around, they're already beans&#8212;you won't need any "
+"session beans lying around, they're already beans—you won't need any "
 "additional special metadata. There's just little one thing you need to do "
 "before you can start injecting them into stuff: you need to put them in an "
 "archive (a jar, or a Java EE module such as a war or EJB jar) that contains "
@@ -93,33 +86,29 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:45
 #, no-c-format
 msgid ""
 "The JavaBeans and EJBs you've been writing every day, up until now, have not "
 "been able to take advantage of the new services defined by the CDI "
-"specification. But you'll be able to use every one of them with CDI&#8212;"
-"allowing the container to create and destroy instances of your beans and "
-"associate them with a designated context, injecting them into other beans, "
-"using them in EL expressions, specializing them with qualifier annotations, "
-"even adding interceptors and decorators to them&#8212;without modifying your "
-"existing code. At most, you'll need to add some annotations."
+"specification. But you'll be able to use every one of them with CDI—allowing "
+"the container to create and destroy instances of your beans and associate "
+"them with a designated context, injecting them into other beans, using them "
+"in EL expressions, specializing them with qualifier annotations, even adding "
+"interceptors and decorators to them—without modifying your existing code. At "
+"most, you'll need to add some annotations."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:54
 #, no-c-format
 msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
-#: intro.xml:61
 #, no-c-format
 msgid "Getting our feet wet"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:63
 #, fuzzy, no-c-format
 msgid ""
 "Suppose that we have two existing Java classes that we've been using for "
@@ -130,20 +119,7 @@
 "applicazioni. La prima classe esegue il parsing di una stringa in una lista "
 "di frasi:"
 
-#. Tag: programlisting
-#: intro.xml:68
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class SentenceParser {\n"
-"   public List<String> parse(String text) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class SentenceParser {\n"
-"    public List<String> parse(String text) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:70
 #, no-c-format
 msgid ""
 "The second existing class is a stateless session bean front-end for an "
@@ -153,42 +129,12 @@
 "La seconda classe è un session bean stateless front-end per un sistema "
 "esterno capace di tradurre le frasi da una lingua ad un altra:"
 
-#. Tag: programlisting
-#: intro.xml:75
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"   public String translate(String sentence) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"    public String translate(String sentence) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:77
 #, fuzzy, no-c-format
 msgid "Where <literal>Translator</literal> is the EJB local interface:"
 msgstr "Dove <literal>Translator</literal> è l'interfaccia locale:"
 
-#. Tag: programlisting
-#: intro.xml:79
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"   public String translate(String sentence);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"    public String translate(String sentence);\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "Unfortunately, we don't have a class that translates whole text documents. "
@@ -197,54 +143,7 @@
 "Sfortunatamente non ci sono classi preesistenti che traducano l'intero testo "
 "dei documenti. Quindi occorre scrivere un Web Bean che faccia questo lavoro:"
 
-#. Tag: programlisting
-#: intro.xml:85
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator {\n"
-"   private SentenceParser sentenceParser;\n"
-"   private Translator sentenceTranslator;\n"
-"    \n"
-"   @Inject\n"
-"   TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"      this.sentenceParser = sentenceParser;\n"
-"      this.sentenceTranslator = sentenceTranslator;\n"
-"   }\n"
-"    \n"
-"   public String translate(String text) {\n"
-"      StringBuilder sb = new StringBuilder();\n"
-"      for (String sentence: sentenceParser.parse(text)) {\n"
-"          sb.append(sentenceTranslator.translate(sentence));\n"
-"      }\n"
-"      return sb.toString();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TextTranslator {\n"
-"    \n"
-"    private SentenceParser sentenceParser;\n"
-"    private Translator sentenceTranslator;\n"
-"    \n"
-"    @Initializer\n"
-"    TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"        this.sentenceParser = sentenceParser;\n"
-"        this.sentenceTranslator = sentenceTranslator;\n"
-"    }\n"
-"    \n"
-"    public String translate(String text) {\n"
-"        StringBuilder sb = new StringBuilder();\n"
-"        for (String sentence: sentenceParser.parse(text)) {\n"
-"            sb.append(sentenceTranslator.translate(sentence));\n"
-"        }\n"
-"        return sb.toString();\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:87
 #, fuzzy, no-c-format
 msgid ""
 "But wait! <literal>TextTranslator</literal> does not have a constructor with "
@@ -258,7 +157,6 @@
 "<literal>@Initializer</literal>."
 
 #. Tag: para
-#: intro.xml:93
 #, fuzzy, no-c-format
 msgid ""
 "As you've guessed, the <literal>@Inject</literal> annotation has something "
@@ -275,7 +173,6 @@
 "parametri del costruttore o del metodo."
 
 #. Tag: para
-#: intro.xml:100
 #, no-c-format
 msgid ""
 "We may obtain an instance of <literal>TextTranslator</literal> by injecting "
@@ -286,7 +183,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:107
 #, no-c-format
 msgid ""
 "Let's create a UI controller bean that uses field injection to obtain an "
@@ -294,44 +190,12 @@
 "entered by a user:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:116
-#, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class TranslateController {\n"
-"   @Inject TextTranslator textTranslator;\n"
-"\n"
-"   private String inputText;\n"
-"   private String translation;\n"
-"\n"
-"   // JSF action method, perhaps\n"
-"   public void translate() {\n"
-"      translation = textTranslator.translate(inputText); \n"
-"   }\n"
-"\n"
-"   public String getInputText() {\n"
-"      return inputText;\n"
-"   }\n"
-"\n"
-"   public void setInputText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"\n"
-"   public String getTranslation() {\n"
-"      return translation;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:119
 #, fuzzy, no-c-format
 msgid "Field injection of <literal>TextTranslator</literal> instance"
 msgstr "Dove <literal>Translator</literal> è l'interfaccia locale:"
 
 #. Tag: para
-#: intro.xml:127
 #, no-c-format
 msgid ""
 "Notice the controller bean is request-scoped and named. Since this "
@@ -342,7 +206,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:135
 #, fuzzy, no-c-format
 msgid ""
 "Alternatively, we may obtain an instance of <literal>TextTranslator</"
@@ -352,23 +215,7 @@
 "Si può ottenere un'istanza di <literal>TextTranslator</literal> iniettandolo "
 "in un Web Bean, Servlet o EJB:"
 
-#. Tag: programlisting
-#: intro.xml:140
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
-"...\n"
-"public void translate() {\n"
-"   textTranslatorInstance.get().translate(inputText);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public setTextTranslator(TextTranslator textTranslator) {\n"
-"    this.textTranslator = textTranslator;\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:142
 #, no-c-format
 msgid ""
 "Notice that it isn't necessary to create a getter or setter method to inject "
@@ -379,17 +226,15 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:148
 #, fuzzy, no-c-format
 msgid ""
 "At system initialization time, the container must validate that exactly one "
 "bean exists which satisfies each injection point. In our example, if no "
-"implementation of <literal>Translator</literal> is available&#8212;if the "
-"<literal>SentenceTranslator</literal> EJB was not deployed&#8212;the "
-"container would inform us of an <emphasis>unsatisfied dependency</emphasis>. "
-"If more than one implementation of <literal>Translator</literal> were "
-"available, the container would inform us of the <emphasis>ambiguous "
-"dependency</emphasis>."
+"implementation of <literal>Translator</literal> is available—if the "
+"<literal>SentenceTranslator</literal> EJB was not deployed—the container "
+"would inform us of an <emphasis>unsatisfied dependency</emphasis>. If more "
+"than one implementation of <literal>Translator</literal> were available, the "
+"container would inform us of the <emphasis>ambiguous dependency</emphasis>."
 msgstr ""
 "In fase di inizializzazione del sistema, il manager Web Bean deve "
 "convalidare che esattamente un solo Web Bean esista e soddisfi ciascun punto "
@@ -402,7 +247,6 @@
 "<literal>AmbiguousDependencyException</literal>."
 
 #. Tag: para
-#: intro.xml:156
 #, no-c-format
 msgid ""
 "Before we get too deep in the details, let's pause and examine a bean's "
@@ -411,6 +255,97 @@
 "what <emphasis>makes</emphasis> something a bean."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class SentenceParser {\n"
+#~ "   public List<String> parse(String text) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class SentenceParser {\n"
+#~ "    public List<String> parse(String text) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator {\n"
+#~ "   public String translate(String sentence) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator {\n"
+#~ "    public String translate(String sentence) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Local\n"
+#~ "public interface Translator {\n"
+#~ "   public String translate(String sentence);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Local\n"
+#~ "public interface Translator {\n"
+#~ "    public String translate(String sentence);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class TextTranslator {\n"
+#~ "   private SentenceParser sentenceParser;\n"
+#~ "   private Translator sentenceTranslator;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) {\n"
+#~ "      this.sentenceParser = sentenceParser;\n"
+#~ "      this.sentenceTranslator = sentenceTranslator;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public String translate(String text) {\n"
+#~ "      StringBuilder sb = new StringBuilder();\n"
+#~ "      for (String sentence: sentenceParser.parse(text)) {\n"
+#~ "          sb.append(sentenceTranslator.translate(sentence));\n"
+#~ "      }\n"
+#~ "      return sb.toString();\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TextTranslator {\n"
+#~ "    \n"
+#~ "    private SentenceParser sentenceParser;\n"
+#~ "    private Translator sentenceTranslator;\n"
+#~ "    \n"
+#~ "    @Initializer\n"
+#~ "    TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) {\n"
+#~ "        this.sentenceParser = sentenceParser;\n"
+#~ "        this.sentenceTranslator = sentenceTranslator;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public String translate(String text) {\n"
+#~ "        StringBuilder sb = new StringBuilder();\n"
+#~ "        for (String sentence: sentenceParser.parse(text)) {\n"
+#~ "            sb.append(sentenceTranslator.translate(sentence));\n"
+#~ "        }\n"
+#~ "        return sb.toString();\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
+#~ "...\n"
+#~ "public void translate() {\n"
+#~ "   textTranslatorInstance.get().translate(inputText);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public setTextTranslator(TextTranslator textTranslator) {\n"
+#~ "    this.textTranslator = textTranslator;\n"
+#~ "}]]>"
+
 #~ msgid "Getting started with Web Beans"
 #~ msgstr "Iniziare con Web Beans"
 

Modified: doc/trunk/reference/it-IT/master.po
===================================================================
--- doc/trunk/reference/it-IT/master.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/master.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-04-20 22:16+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: master.xml:9
 #, no-c-format
 msgid "A note about naming and nomenclature"
 msgstr ""
 
 #. Tag: para
-#: master.xml:10
 #, no-c-format
 msgid ""
 "Shortly before the final draft of JSR-299 was submitted, the specification "
@@ -35,7 +33,6 @@
 msgstr ""
 
 #. Tag: para
-#: master.xml:19
 #, no-c-format
 msgid ""
 "You'll also find that some of the functionality that once existed in the "
@@ -45,43 +42,37 @@
 msgstr ""
 
 #. Tag: para
-#: master.xml:25
 #, no-c-format
 msgid ""
 "Note that this reference guide was started while changes were still being "
 "made to the specification. We've done our best to update it for accuracy. If "
 "you discover a conflict between what is written in this guide and the "
-"specification, the specification is the authority&#8212;assume it is "
-"correct. If you believe you have found an error in the specification, please "
-"report it to the JSR-299 EG."
+"specification, the specification is the authority—assume it is correct. If "
+"you believe you have found an error in the specification, please report it "
+"to the JSR-299 EG."
 msgstr ""
 
 #. Tag: title
-#: master.xml:36
 #, no-c-format
 msgid "Beans"
 msgstr ""
 
 #. Tag: title
-#: master.xml:49
 #, no-c-format
 msgid "Weld, the CDI Reference Implementation"
 msgstr ""
 
 #. Tag: title
-#: master.xml:59
 #, fuzzy, no-c-format
 msgid "Loose coupling with strong typing"
 msgstr "Realizzare una tipizzazione più forte"
 
 #. Tag: title
-#: master.xml:75
 #, fuzzy, no-c-format
 msgid "CDI and the Java EE ecosystem"
 msgstr "Web Beans e l'ecosistema Java EE"
 
 #. Tag: title
-#: master.xml:87
 #, fuzzy, no-c-format
 msgid "Weld reference"
 msgstr "Web Beans Reference"

Modified: doc/trunk/reference/it-IT/next.po
===================================================================
--- doc/trunk/reference/it-IT/next.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/next.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-20 01:10+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: next.xml:4
 #, no-c-format
 msgid "Next steps"
 msgstr "Prossimi passi"
 
 #. Tag: para
-#: next.xml:6
 #, no-c-format
 msgid ""
 "Because CDI is so new, there's not yet a lot of information available "
@@ -33,7 +31,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:14
 #, fuzzy, no-c-format
 msgid ""
 "The CDI reference implementation, Weld, is being developed at the <ulink url="
@@ -51,7 +48,6 @@
 "di articoli pubblicati sul blog."
 
 #. Tag: para
-#: next.xml:22
 #, no-c-format
 msgid ""
 "We encourage you to follow the <ulink url=\"https://lists.jboss.org/mailman/"
@@ -61,7 +57,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:28
 #, no-c-format
 msgid ""
 "We are eager to find volunteers to help revise, proofread or translate this "
@@ -70,7 +65,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:35
 #, no-c-format
 msgid ""
 "Checkout source from <ulink url=\"http://anonsvn.jboss.org/repos/weld/doc/"
@@ -78,16 +72,7 @@
 "ulink> using SVN"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:40
-#, no-c-format
-msgid ""
-"<![CDATA[$> svn co http://anonsvn.jboss.org/repos/weld/doc/trunk/reference "
-"weld-reference]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:43
 #, no-c-format
 msgid ""
 "Edit the <literal>pom.xml</literal> file in the root of the checkout and "
@@ -96,19 +81,11 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:49
 #, no-c-format
 msgid "Build using Maven 2"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:52
-#, no-c-format
-msgid "<![CDATA[$> mvn]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:54
 #, no-c-format
 msgid ""
 "If you experience an out of memory error, try setting this environment "
@@ -116,7 +93,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:61
 #, no-c-format
 msgid ""
 "The PDF version of the reference guide will appear the current directory. "
@@ -125,7 +101,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:66
 #, no-c-format
 msgid "We look forward to your participation!"
 msgstr ""

Modified: doc/trunk/reference/it-IT/part1.po
===================================================================
--- doc/trunk/reference/it-IT/part1.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/part1.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-24 19:21+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -17,7 +17,6 @@
 # 1. sovrappone
 # 2. ciclo di vita (dei componenti)
 #. Tag: para
-#: part1.xml:14
 #, fuzzy, no-c-format
 msgid ""
 "The <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-299</ulink> "
@@ -34,7 +33,6 @@
 "programmazione Java EE, i servizi  Web Beans forniscono:"
 
 #. Tag: para
-#: part1.xml:23
 #, fuzzy, no-c-format
 msgid ""
 "an improved lifecycle for stateful objects, bound to well-defined "
@@ -44,14 +42,12 @@
 "<emphasis>contesti</emphasis> ben definiti"
 
 #. Tag: para
-#: part1.xml:28
 #, no-c-format
 msgid "a typesafe approach to <emphasis>dependency injection</emphasis>,"
 msgstr "un approccio typesafe alla <emphasis>dependency injection</emphasis>,"
 
 # facility=struttura?
 #. Tag: para
-#: part1.xml:33
 #, fuzzy, no-c-format
 msgid ""
 "object interaction via an <emphasis>event notification facility</emphasis>,"
@@ -60,7 +56,6 @@
 "emphasis>, e"
 
 #. Tag: para
-#: part1.xml:38
 #, fuzzy, no-c-format
 msgid ""
 "a better approach to binding <emphasis>interceptors</emphasis> to objects, "
@@ -73,7 +68,6 @@
 "utilizzato nella soluzione di problemi legati alla business logic."
 
 #. Tag: para
-#: part1.xml:45
 #, no-c-format
 msgid ""
 "an <emphasis>SPI</emphasis> for developing portable extensions to the "
@@ -81,22 +75,21 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:51
 #, no-c-format
 msgid ""
 "The CDI services are a core aspect of the Java EE platform and include full "
 "support for Java EE modularity and the Java EE component architecture. But "
 "the specification does not limit the use of CDI to the Java EE environment. "
 "In the Java SE environment, the services might be provided by a standalone "
-"CDI implementation like Weld (see <xref linkend=\"weld-se\"/>), or even by a "
-"container that also implements the subset of EJB defined for embedded usage "
-"by the EJB 3.1 specification. CDI is especially useful in the context of web "
-"application development, but the problems it solves are general development "
-"concerns and it is therefore applicable to a wide variety of application."
+"CDI implementation like Weld (see <xref linkend=\"weld-se\" />), or even by "
+"a container that also implements the subset of EJB defined for embedded "
+"usage by the EJB 3.1 specification. CDI is especially useful in the context "
+"of web application development, but the problems it solves are general "
+"development concerns and it is therefore applicable to a wide variety of "
+"application."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:61
 #, no-c-format
 msgid ""
 "An object bound to a lifecycle context is called a bean. CDI includes built-"
@@ -105,19 +98,16 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:68
 #, no-c-format
 msgid "managed beans, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:71
 #, no-c-format
 msgid "EJB session beans."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:75
 #, no-c-format
 msgid ""
 "Both managed beans and EJB session beans may inject other beans. But some "
@@ -127,37 +117,31 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:83
 #, no-c-format
 msgid "message-driven beans,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:86
 #, no-c-format
 msgid "interceptors,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:89
 #, no-c-format
 msgid "servlets, servlet filters and servlet event listeners,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:92
 #, no-c-format
 msgid "JAX-WS service endpoints and handlers, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:95
 #, no-c-format
 msgid "JSP tag handlers and tag library event listeners."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:99
 #, fuzzy, no-c-format
 msgid ""
 "CDI relieves the user of an unfamiliar API of the need to answer the "
@@ -168,37 +152,31 @@
 "la necessità di dover formulare le risposte relative alle seguenti domande:"
 
 #. Tag: para
-#: part1.xml:105
 #, fuzzy, no-c-format
 msgid "What is the lifecycle of this object?"
 msgstr "qual è il ciclo di vita di questo oggetto?"
 
 #. Tag: para
-#: part1.xml:108
 #, fuzzy, no-c-format
 msgid "How many simultaneous clients can it have?"
 msgstr "quanti client può simultaneamente avere?"
 
 #. Tag: para
-#: part1.xml:111
 #, fuzzy, no-c-format
 msgid "Is it multithreaded?"
 msgstr "è multithreaded?"
 
 #. Tag: para
-#: part1.xml:114
 #, no-c-format
 msgid "How do I get access to it from a client?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:117
 #, fuzzy, no-c-format
 msgid "Do I need to explicitly destroy it?"
 msgstr "devo distruggerlo esplicitamente?"
 
 #. Tag: para
-#: part1.xml:120
 #, fuzzy, no-c-format
 msgid ""
 "Where should I keep the reference to it when I'm not currently using it?"
@@ -206,7 +184,6 @@
 "dove dovrei tenerne il riferimento quando non lo sto usando direttamente?"
 
 #. Tag: para
-#: part1.xml:125
 #, fuzzy, no-c-format
 msgid ""
 "How can I define an alternative implementation, so that the implementation "
@@ -217,13 +194,11 @@
 
 # go about (dovrei comportarmi)???
 #. Tag: para
-#: part1.xml:131
 #, fuzzy, no-c-format
 msgid "How should I go about sharing this object between other objects?"
 msgstr "cosa dovrei fare per condividere questo oggetto con altri oggetti?"
 
 #. Tag: para
-#: part1.xml:137
 #, no-c-format
 msgid ""
 "CDI is more than a framework. It's a whole, rich programming model. The "
@@ -233,7 +208,6 @@
 
 # implementazione concreta mi pare pleonastico
 #. Tag: para
-#: part1.xml:142
 #, fuzzy, no-c-format
 msgid ""
 "A bean specifies only the type and semantics of other beans it depends upon. "
@@ -253,7 +227,6 @@
 # <emphasis>loose-coupling</emphasis> è da tradurre?
 # inerente o inerente a?
 #. Tag: para
-#: part1.xml:149
 #, fuzzy, no-c-format
 msgid ""
 "Events, interceptors and decorators enhance the loose-coupling inherent in "
@@ -264,7 +237,6 @@
 
 # notifiche o eventi?
 #. Tag: para
-#: part1.xml:155
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -274,7 +246,6 @@
 "eventi dai consumatori,"
 
 #. Tag: para
-#: part1.xml:159
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -284,7 +255,6 @@
 "business logic, e"
 
 #. Tag: para
-#: part1.xml:163
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> allow business concerns to be "
@@ -295,7 +265,6 @@
 
 # loro consumatori di eventi? destinatari è meglio?
 #. Tag: para
-#: part1.xml:168
 #, fuzzy, no-c-format
 msgid ""
 "What's even more powerful (and comforting) is that CDI provides all these "
@@ -318,7 +287,6 @@
 "loro interceptor e decoratori e i loro consumatori di eventi."
 
 #. Tag: para
-#: part1.xml:177
 #, no-c-format
 msgid ""
 "But CDI isn't a restrictive programming model. It doesn't tell you how you "
@@ -328,7 +296,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:183
 #, fuzzy, no-c-format
 msgid ""
 "CDI even provides a comprehensive SPI, allowing other kinds of object "
@@ -343,7 +310,6 @@
 "Web Bean."
 
 #. Tag: para
-#: part1.xml:189
 #, fuzzy, no-c-format
 msgid ""
 "CDI was influenced by a number of existing Java frameworks, including Seam, "
@@ -361,7 +327,6 @@
 "capace di Guice nelle applicazioni web ed enterprise."
 
 #. Tag: para
-#: part1.xml:197
 #, no-c-format
 msgid ""
 "Finally, CDI is a <ulink url=\"http://jcp.org\">Java Community Process</"

Modified: doc/trunk/reference/it-IT/part2.po
===================================================================
--- doc/trunk/reference/it-IT/part2.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/part2.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-24 19:23+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part2.xml:5
 #, no-c-format
 msgid ""
 "Weld, the JSR-299 Reference Implementation (RI), is being developed as part "
@@ -26,7 +25,6 @@
 msgstr ""
 
 #. Tag: para
-#: part2.xml:12
 #, no-c-format
 msgid ""
 "Weld provides a complete SPI allowing Java EE containers such as JBoss AS "
@@ -36,7 +34,6 @@
 msgstr ""
 
 #. Tag: para
-#: part2.xml:18
 #, no-c-format
 msgid ""
 "Weld comes with an extensive library of examples, which are a great starting "

Modified: doc/trunk/reference/it-IT/part3.po
===================================================================
--- doc/trunk/reference/it-IT/part3.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/part3.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-15 20:46+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part3.xml:5
 #, no-c-format
 msgid ""
 "The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've "
@@ -22,19 +21,16 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:12
 #, no-c-format
 msgid "<emphasis>alternatives</emphasis> enable deployment time polymorphism,"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:17
 #, no-c-format
 msgid "<emphasis>producer methods</emphasis> enable runtime polymorphism, and"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:21
 #, no-c-format
 msgid ""
 "<emphasis>contextual lifecycle management</emphasis> decouples bean "
@@ -42,7 +38,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:27
 #, no-c-format
 msgid ""
 "These techniques serve to enable loose coupling of client and server. The "
@@ -52,7 +47,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:33
 #, no-c-format
 msgid ""
 "Loose coupling makes a system more <emphasis>dynamic</emphasis>. The system "
@@ -64,7 +58,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:40
 #, no-c-format
 msgid ""
 "CDI provides three extra important facilities that further the goal of loose "
@@ -72,7 +65,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:46
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -80,7 +72,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:51
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> may be used to decouple some business "
@@ -88,7 +79,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:56
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -97,7 +87,6 @@
 
 # strong typing?
 #. Tag: para
-#: part3.xml:62
 #, fuzzy, no-c-format
 msgid ""
 "The second major theme of CDI is <emphasis>strong typing</emphasis>. The "
@@ -112,13 +101,12 @@
 "rispetto ai tipi (typesafe) che possono essere validati dal compilatore."
 
 #. Tag: para
-#: part3.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "You don't see string-based identifiers in CDI code, not because the "
-"framework is hiding them from you using clever defaulting rules&#8212;so-"
-"called \"configuration by convention\"&#8212;but because there are simply no "
-"strings there to begin with!"
+"framework is hiding them from you using clever defaulting rules—so-called "
+"\"configuration by convention\"—but because there are simply no strings "
+"there to begin with!"
 msgstr ""
 "Non si vedono identificatori di tipo stringa nel codice basato su Web Beans, "
 "non perché il framework li nasconde usando regole intelligenti "
@@ -128,7 +116,6 @@
 
 # senza che sia necessario realizzare dei tools appositi
 #. Tag: para
-#: part3.xml:74
 #, no-c-format
 msgid ""
 "The obvious benefit of this approach is that <emphasis>any</emphasis> IDE "
@@ -146,7 +133,6 @@
 "nomi, si ha l'opportunità di elevare il livello semantico del proprio codice."
 
 #. Tag: para
-#: part3.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "CDI encourages you develop annotations that model concepts, for example,"
@@ -155,62 +141,52 @@
 "esempio,"
 
 #. Tag: para
-#: part3.xml:87
 #, no-c-format
 msgid "<literal>@Asynchronous</literal>,"
 msgstr "<literal>@Asynchronous</literal>,"
 
 #. Tag: para
-#: part3.xml:90
 #, no-c-format
 msgid "<literal>@Mock</literal>,"
 msgstr "<literal>@Mock</literal>,"
 
 #. Tag: para
-#: part3.xml:93
 #, no-c-format
 msgid "<literal>@Secure</literal> or"
 msgstr "<literal>@Secure</literal> or"
 
 #. Tag: para
-#: part3.xml:96
 #, no-c-format
 msgid "<literal>@Updated</literal>,"
 msgstr "<literal>@Secure</literal> or"
 
 #. Tag: para
-#: part3.xml:100
 #, no-c-format
 msgid "instead of using compound names like"
 msgstr "invece di usare nomi composti come"
 
 #. Tag: para
-#: part3.xml:104
 #, no-c-format
 msgid "<literal>asyncPaymentProcessor</literal>,"
 msgstr "<literal>asyncPaymentProcessor</literal>,"
 
 #. Tag: para
-#: part3.xml:107
 #, no-c-format
 msgid "<literal>mockPaymentProcessor</literal>,"
 msgstr "<literal>mockPaymentProcessor</literal>,"
 
 #. Tag: para
-#: part3.xml:110
 #, no-c-format
 msgid "<literal>SecurityInterceptor</literal> or"
 msgstr "<literal>SecurityInterceptor</literal> or"
 
 #. Tag: para
-#: part3.xml:113
 #, no-c-format
 msgid "<literal>DocumentUpdatedEvent</literal>."
 msgstr "<literal>DocumentUpdatedEvent</literal>."
 
 # literate=elegante?
 #. Tag: para
-#: part3.xml:117
 #, no-c-format
 msgid ""
 "The annotations are reusable. They help describe common qualities of "
@@ -225,7 +201,6 @@
 "comprensibile."
 
 #. Tag: para
-#: part3.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "CDI <emphasis>stereotypes</emphasis> take this idea a step further. A "
@@ -243,7 +218,6 @@
 "etc, ."
 
 #. Tag: para
-#: part3.xml:138
 #, fuzzy, no-c-format
 msgid ""
 "We're now ready to meet some more advanced features of CDI. Bear in mind "

Modified: doc/trunk/reference/it-IT/part4.po
===================================================================
--- doc/trunk/reference/it-IT/part4.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/part4.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-24 19:34+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part4.xml:5
 #, no-c-format
 msgid ""
 "The third theme of CDI is <emphasis>integration</emphasis>. We've already "
@@ -27,7 +26,6 @@
 
 # modelli a componenti o architetture a componenti?
 #. Tag: para
-#: part4.xml:12
 #, fuzzy, no-c-format
 msgid ""
 "CDI is also designed to work in concert with technologies outside of the "
@@ -54,7 +52,6 @@
 "non fanno ancora parte di tale ambiente."
 
 #. Tag: para
-#: part4.xml:23
 #, fuzzy, no-c-format
 msgid ""
 "We're about to see how to take full advantage of the Java EE platform in an "

Modified: doc/trunk/reference/it-IT/part5.po
===================================================================
--- doc/trunk/reference/it-IT/part5.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/part5.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-31 10:42+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -15,7 +15,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part5.xml:5
 #, fuzzy, no-c-format
 msgid ""
 "Weld is the reference implementation of JSR-299, and is used by JBoss AS and "
@@ -33,7 +32,6 @@
 "logging la generazione XSD per i descrittori di deploy XML JSR-299)."
 
 #. Tag: para
-#: part5.xml:12
 #, no-c-format
 msgid ""
 "Some of the extensions in Weld are portable across JSR-299 implementations "
@@ -43,12 +41,11 @@
 msgstr ""
 
 #. Tag: para
-#: part5.xml:18
 #, fuzzy, no-c-format
 msgid ""
 "If you want to get started quickly using Weld (and, in turn, CDI) with JBoss "
 "AS, GlassFish or Tomcat and experiment with one of the examples, take a look "
-"at <xref linkend=\"gettingstarted\"/>. Otherwise read on for a exhaustive "
+"at <xref linkend=\"gettingstarted\" />. Otherwise read on for a exhaustive "
 "discussion of using Weld in all the environments and application servers it "
 "supports and the Weld extensions."
 msgstr ""

Modified: doc/trunk/reference/it-IT/producermethods.po
===================================================================
--- doc/trunk/reference/it-IT/producermethods.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/producermethods.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-31 11:05+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: producermethods.xml:5
 #, no-c-format
 msgid "Producer methods"
 msgstr "Metodi produttori"
 
 #. Tag: para
-#: producermethods.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Producer methods let us overcome certain limitations that arise when a "
@@ -35,13 +33,11 @@
 "(Si incontrerà un secondo approccio in <xref linkend=\"xml\"/>.)"
 
 #. Tag: para
-#: producermethods.xml:14
 #, no-c-format
 msgid "According to the spec:"
 msgstr "Secondo la specifica:"
 
 #. Tag: para
-#: producermethods.xml:18
 #, fuzzy, no-c-format
 msgid "A producer method acts as a source of objects to be injected, where:"
 msgstr ""
@@ -49,19 +45,16 @@
 "dove:"
 
 #. Tag: para
-#: producermethods.xml:22
 #, fuzzy, no-c-format
 msgid "the objects to be injected are not required to be instances of beans,"
 msgstr "gli oggetti da iniettare non sono richiesti come istanze di Web Beans,"
 
 #. Tag: para
-#: producermethods.xml:25
 #, no-c-format
 msgid "the concrete type of the objects to be injected may vary at runtime or"
 msgstr "il tipo concreto di oggetti da iniettare può variare a runtime o"
 
 #. Tag: para
-#: producermethods.xml:28
 #, fuzzy, no-c-format
 msgid ""
 "the objects require some custom initialization that is not performed by the "
@@ -71,25 +64,21 @@
 "vengono eseguite da costruttore Web Bean"
 
 #. Tag: para
-#: producermethods.xml:36
 #, no-c-format
 msgid "For example, producer methods let us:"
 msgstr "Per esempio, i metodi produttori consentono di:"
 
 #. Tag: para
-#: producermethods.xml:40
 #, fuzzy, no-c-format
 msgid "expose a JPA entity as a bean,"
 msgstr "espone un entity JPA come Web Bean,"
 
 #. Tag: para
-#: producermethods.xml:43
 #, fuzzy, no-c-format
 msgid "expose any JDK class as a bean,"
 msgstr "espone qualsiasi classe JDK come Web Bean,"
 
 #. Tag: para
-#: producermethods.xml:46
 #, fuzzy, no-c-format
 msgid ""
 "define multiple beans, with different scopes or initialization, for the same "
@@ -99,13 +88,11 @@
 "stessa classe di implementazione, o"
 
 #. Tag: para
-#: producermethods.xml:51
 #, fuzzy, no-c-format
 msgid "vary the implementation of a bean type at runtime."
 msgstr "varia l'implementazione di un tipo di API a runtime."
 
 #. Tag: para
-#: producermethods.xml:55
 #, fuzzy, no-c-format
 msgid ""
 "In particular, producer methods let us use runtime polymorphism with CDI. As "
@@ -119,58 +106,12 @@
 "è deployato, l'implementazione Web Bean è sistemata. Un metodo produttore "
 "non ha tali limitazioni:"
 
-#. Tag: programlisting
-#: producermethods.xml:61
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Preferences implements Serializable {\n"
-"   private PaymentStrategyType paymentStrategy;\n"
-"   ...\n"
-"   @Produces @Preferred \n"
-"   public PaymentStrategy getPaymentStrategy() {\n"
-"       switch (paymentStrategy) {\n"
-"           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
-"           case CHECK: return new CheckPaymentStrategy();\n"
-"           case PAYPAL: return new PayPalPaymentStrategy();\n"
-"           default: return null;\n"
-"       } \n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped\n"
-"public class Preferences {\n"
-"    \n"
-"    private PaymentStrategyType paymentStrategy;\n"
-"    \n"
-"    ...\n"
-"    \n"
-"    @Produces @Preferred \n"
-"    public PaymentStrategy getPaymentStrategy() {\n"
-"        switch (paymentStrategy) {\n"
-"            case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
-"            case CHEQUE: return new ChequePaymentStrategy();\n"
-"            case PAYPAL: return new PayPalPaymentStrategy();\n"
-"            default: return null;\n"
-"        } \n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:63
 #, no-c-format
 msgid "Consider an injection point:"
 msgstr "Si consideri un punto di iniezione:"
 
-#. Tag: programlisting
-#: producermethods.xml:65
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
-msgstr "<![CDATA[@Preferred PaymentStrategy paymentStrat;]]>"
-
 #. Tag: para
-#: producermethods.xml:67
 #, fuzzy, no-c-format
 msgid ""
 "This injection point has the same type and qualifier annotations as the "
@@ -185,13 +126,11 @@
 "iniezione:"
 
 #. Tag: title
-#: producermethods.xml:74
 #, no-c-format
 msgid "Scope of a producer method"
 msgstr "Scope di un metodo produttore"
 
 #. Tag: para
-#: producermethods.xml:76
 #, fuzzy, no-c-format
 msgid ""
 "The scope of the producer method defaults to <literal>@Dependent</literal>, "
@@ -207,7 +146,6 @@
 "dell'oggetto <literal>PaymentStrategy</literal> per ogni sessione utente."
 
 #. Tag: para
-#: producermethods.xml:83
 #, no-c-format
 msgid ""
 "To change this behavior, we can add a <literal>@SessionScoped</literal> "
@@ -216,22 +154,7 @@
 "Per cambiare questo comportamento si può aggiungere un'annotazione "
 "<literal>@SessionScoped</literal> al metodo."
 
-#. Tag: programlisting
-#: producermethods.xml:87
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"    ...\n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:89
 #, no-c-format
 msgid ""
 "Now, when the producer method is called, the returned "
@@ -243,7 +166,6 @@
 "sessione. Il metodo produttore non verrà più chiamato nella stessa sessione."
 
 #. Tag: para
-#: producermethods.xml:95
 #, no-c-format
 msgid ""
 "A producer method does <emphasis>not</emphasis> inherit the scope of the "
@@ -256,13 +178,11 @@
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:107
 #, no-c-format
 msgid "Injection into producer methods"
 msgstr "Iniezione nei metodi produttori"
 
 #. Tag: para
-#: producermethods.xml:109
 #, no-c-format
 msgid ""
 "There's one potential problem with the code above. The implementations of "
@@ -278,7 +198,6 @@
 "interceptor."
 
 #. Tag: para
-#: producermethods.xml:116
 #, fuzzy, no-c-format
 msgid ""
 "If this isn't what we want, we can use dependency injection into the "
@@ -287,36 +206,7 @@
 "Se questo non è ciò che si vuole, è possibile usare la dependency injection "
 "nel metodo produttore per ottenere istanze Web Bean:"
 
-#. Tag: programlisting
-#: producermethods.xml:121
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          CheckPaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          ChequePaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-"
@@ -338,7 +228,6 @@
 "Bean dai metodi produttori!"
 
 #. Tag: para
-#: producermethods.xml:132
 #, fuzzy, no-c-format
 msgid ""
 "There's at least three ways we could go about fixing this bug. We could "
@@ -354,7 +243,6 @@
 "<literal>@Dependent</literal> o <literal>@RequestScoped</literal>."
 
 #. Tag: para
-#: producermethods.xml:139
 #, fuzzy, no-c-format
 msgid ""
 "But a more common solution is to use the special <literal>@New</literal> "
@@ -364,51 +252,16 @@
 "binding <literal>@New</literal>."
 
 #. Tag: title
-#: producermethods.xml:144
 #, no-c-format
 msgid "Use of <literal>@New</literal> with producer methods"
 msgstr "Uso di <literal>@New</literal> con i metodi produttori"
 
 #. Tag: para
-#: producermethods.xml:146
 #, no-c-format
 msgid "Consider the following producer method:"
 msgstr "Si consideri il seguente metodo produttore:"
 
-#. Tag: programlisting
-#: producermethods.xml:148
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New CheckPaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New ChequePaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:150
 #, no-c-format
 msgid ""
 "Then a new <emphasis>dependent</emphasis> instance of "
@@ -425,47 +278,25 @@
 "<literal>Preferences</literal> non viene distrutto, cioè a fine sessione."
 
 #. Tag: title
-#: producermethods.xml:160
 #, fuzzy, no-c-format
 msgid "Disposer methods"
 msgstr "Metodi produttori"
 
 #. Tag: para
-#: producermethods.xml:162
 #, no-c-format
 msgid ""
 "Some producer methods return objects that require explicit destruction. For "
 "example, somebody needs to close this JDBC connection:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:167
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @RequestScoped Connection connect(User user) {\n"
-"   return createConnection(user.getId(), user.getPassword());\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:169
 #, no-c-format
 msgid ""
 "Destruction can be performed by a matching <emphasis>disposer method</"
 "emphasis>, defined by the same class as the producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:172
-#, no-c-format
-msgid ""
-"<![CDATA[void close(@Disposes Connection connection) {\n"
-"   connection.close();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:174
 #, no-c-format
 msgid ""
 "The disposer method must have at least one parameter, annotated "
@@ -478,7 +309,118 @@
 "method automatically."
 msgstr ""
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Preferences implements Serializable {\n"
+#~ "   private PaymentStrategyType paymentStrategy;\n"
+#~ "   ...\n"
+#~ "   @Produces @Preferred \n"
+#~ "   public PaymentStrategy getPaymentStrategy() {\n"
+#~ "       switch (paymentStrategy) {\n"
+#~ "           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
+#~ "           case CHECK: return new CheckPaymentStrategy();\n"
+#~ "           case PAYPAL: return new PayPalPaymentStrategy();\n"
+#~ "           default: return null;\n"
+#~ "       } \n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Preferences {\n"
+#~ "    \n"
+#~ "    private PaymentStrategyType paymentStrategy;\n"
+#~ "    \n"
+#~ "    ...\n"
+#~ "    \n"
+#~ "    @Produces @Preferred \n"
+#~ "    public PaymentStrategy getPaymentStrategy() {\n"
+#~ "        switch (paymentStrategy) {\n"
+#~ "            case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
+#~ "            case CHEQUE: return new ChequePaymentStrategy();\n"
+#~ "            case PAYPAL: return new PayPalPaymentStrategy();\n"
+#~ "            default: return null;\n"
+#~ "        } \n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
+#~ msgstr "<![CDATA[@Preferred PaymentStrategy paymentStrat;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "    ...\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          CheckPaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          ChequePaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          @New CheckPaymentStrategy cps,\n"
+#~ "                                          @New PayPalPaymentStrategy "
+#~ "ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          @New ChequePaymentStrategy "
+#~ "cps,\n"
+#~ "                                          @New PayPalPaymentStrategy "
+#~ "ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "<blockquote> <para>A Web Beans producer method acts as a source of "
 #~ "objects to be injected, where:</para> <itemizedlist> <listitem> <para>the "
 #~ "objects to be injected are not required to be instances of Web Beans,</"

Modified: doc/trunk/reference/it-IT/resources.po
===================================================================
--- doc/trunk/reference/it-IT/resources.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/resources.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: resources.xml:5
 #, no-c-format
 msgid "Java EE component environment resources"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:7
 #, no-c-format
 msgid ""
 "Java EE 5 already introduced some limited support for dependency injection, "
@@ -30,7 +28,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:13
 #, no-c-format
 msgid ""
 "Naturally, there is now a slight mismatch with the new style of dependency "
@@ -44,7 +41,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:22
 #, no-c-format
 msgid ""
 "Fields have a duality in that they can both be the target of Java EE "
@@ -57,13 +53,11 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:31
 #, no-c-format
 msgid "Defining a resource"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:33
 #, no-c-format
 msgid ""
 "The CDI specification uses the term <emphasis>resource</emphasis> to refer, "
@@ -72,7 +66,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:38
 #, no-c-format
 msgid ""
 "JDBC <literal>Datasource</literal>s, JMS <literal>Queue</literal>s, "
@@ -82,7 +75,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:43
 #, no-c-format
 msgid ""
 "JPA <literal>EntityManager</literal>s and <literal>EntityManagerFactory</"
@@ -90,19 +82,16 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:46
 #, no-c-format
 msgid "remote EJBs, and"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:49
 #, no-c-format
 msgid "web services"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:53
 #, no-c-format
 msgid ""
 "We declare a resource by annotating a producer field with a component "
@@ -111,61 +100,17 @@
 "<literal>@PersistenceUnit</literal> or <literal>@WebServiceRef</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:57
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @WebServiceRef(lookup=\"java:app/service/Catalog\")\n"
-"Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Resource(lookup=\"java:global/env/jdbc/CustomerDatasource"
-"\") \n"
-"@CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceContext(unitName=\"CustomerDatabase\")\n"
-"@CustomerDatabase EntityManager customerDatabasePersistenceContext;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:63
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceUnit(unitName=\"CustomerDatabase\") \n"
-"@CustomerDatabase EntityManagerFactory customerDatabasePersistenceUnit;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @EJB(ejbLink=\"../their.jar#PaymentService\") \n"
-"PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:67
 #, no-c-format
 msgid "The field may be static (but not final)."
 msgstr ""
 
 #. Tag: para
-#: resources.xml:69
 #, no-c-format
 msgid "A resource declaration really contains two pieces of information:"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:73
 #, no-c-format
 msgid ""
 "the JNDI name, EJB link, persistence unit name, or other metadata needed to "
@@ -173,7 +118,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:77
 #, no-c-format
 msgid ""
 "the type and qualifiers that we will use to inject the reference into our "
@@ -181,7 +125,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:82
 #, no-c-format
 msgid ""
 "It might feel strange to be declaring resources in Java code. Isn't this "
@@ -191,53 +134,16 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:90
 #, no-c-format
 msgid "Typesafe resource injection"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:92
 #, no-c-format
 msgid "These resources can now be injected in the usual way."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:96
-#, no-c-format
-msgid "<![CDATA[@Inject Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:97
-#, no-c-format
-msgid "<![CDATA[@Inject @CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:98
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManager "
-"customerDatabaseEntityManager;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManagerFactory "
-"customerDatabaseEntityManagerFactory;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:100
-#, no-c-format
-msgid "<![CDATA[@Inject PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:102
 #, no-c-format
 msgid ""
 "The bean type and qualifiers of the resource are determined by the producer "
@@ -245,7 +151,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:106
 #, no-c-format
 msgid ""
 "It might seem like a pain to have to write these extra producer field "
@@ -256,26 +161,12 @@
 "and more typesafe to write"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:113
-#, no-c-format
-msgid "@Inject @CustomerDatabase EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:115
 #, no-c-format
 msgid "instead of"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:117
-#, no-c-format
-msgid "@PersistenceContext(unitName=\"CustomerDatabase\") EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:119
 #, no-c-format
 msgid "all over the place?"
 msgstr ""

Modified: doc/trunk/reference/it-IT/ri-spi.po
===================================================================
--- doc/trunk/reference/it-IT/ri-spi.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/ri-spi.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-06-08 21:35+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: ri-spi.xml:4
 #, fuzzy, no-c-format
 msgid "Integrating Weld into other environments"
 msgstr "Integrazione di Web Beans in altri ambienti"
 
 #. Tag: para
-#: ri-spi.xml:6
 #, no-c-format
 msgid ""
 "If you want to use Weld in another environment, you will need to provide "
@@ -29,13 +27,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:12
 #, fuzzy, no-c-format
 msgid "Enterprise Services"
 msgstr "Servizi di risorse"
 
 #. Tag: para
-#: ri-spi.xml:13
 #, no-c-format
 msgid ""
 "If you just want to use managed beans, and not take advantage of enterprise "
@@ -47,7 +43,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:21
 #, no-c-format
 msgid ""
 "All SPIs and APIs described have extensive JavaDoc, which spell out the "
@@ -55,13 +50,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:27
 #, fuzzy, no-c-format
 msgid "The Weld SPI"
 msgstr "Web Beans SPI"
 
 #. Tag: para
-#: ri-spi.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "The Weld SPI is located in the <literal>weld-spi</literal> module, and "
@@ -75,7 +68,6 @@
 "richiesti."
 
 #. Tag: para
-#: ri-spi.xml:35
 #, no-c-format
 msgid ""
 "All interfaces in the SPI support the decorator pattern and provide a "
@@ -90,7 +82,6 @@
 "standard sono collocate nel sottopacchetto <literal>helpers</literal>."
 
 #. Tag: para
-#: ri-spi.xml:41
 #, fuzzy, no-c-format
 msgid ""
 "Weld supports multiple environments. An environment is defined by an "
@@ -111,7 +102,6 @@
 "ambiente chiamando <literal>bootstrap.setEnvironment()</literal>."
 
 #. Tag: para
-#: ri-spi.xml:50
 #, fuzzy, no-c-format
 msgid ""
 "Weld uses a generic-typed service registry to allow services to be "
@@ -124,18 +114,16 @@
 "essere aggiunti e recuperati."
 
 #. Tag: title
-#: ri-spi.xml:56
 #, no-c-format
 msgid "Deployment structure"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:58
 #, no-c-format
 msgid ""
 "An application is often comprised of a number of modules. For example, a "
 "Java EE deployment may contain a number of EJB modules (containing business "
-"logic) and WAR modules (containing the user interface). A container may "
+"logic) and war modules (containing the user interface). A container may "
 "enforce certain <emphasis>accessibility</emphasis> rules which limit the "
 "visibility of classes between modules. CDI allows these same rules to apply "
 "to bean and observer method resolution. As the accessibility rules vary "
@@ -145,13 +133,12 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:67
 #, no-c-format
 msgid ""
 "The CDI specification discusses <emphasis>Bean Deployment Archives</"
-"emphasis> (BDAs)&#8212;archives which are marked as containing beans which "
-"should be deployed to the CDI container, and made available for injection "
-"and resolution. Weld reuses this description of <emphasis>Bean Deployment "
+"emphasis> (BDAs)—archives which are marked as containing beans which should "
+"be deployed to the CDI container, and made available for injection and "
+"resolution. Weld reuses this description of <emphasis>Bean Deployment "
 "Archives</emphasis> in its deployment structure SPI. Each deployment exposes "
 "the BDAs which it contains; each BDA may also reference other which it can "
 "access. Together, the transitive closure of this graph forms the beans which "
@@ -159,7 +146,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:76
 #, no-c-format
 msgid ""
 "To describe the deployment structure to Weld, the container should provide "
@@ -173,7 +159,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:85
 #, no-c-format
 msgid ""
 "As programmatically described beans may result in additional BDAs being "
@@ -183,13 +168,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:92
 #, no-c-format
 msgid "Virtual BDAs"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:93
 #, no-c-format
 msgid ""
 "In a strict container, each BDA might have to explicitly specify which other "
@@ -200,7 +183,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:100
 #, no-c-format
 msgid ""
 "A container, might, for example, use a flat accessibility structure for the "
@@ -209,11 +191,10 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:106
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it's contents to be discovered by Weld&#8212;<literal>BeanDeploymentArchive."
+"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
 "getBeanClasses()</literal> must return all the classes in the BDA, "
 "<literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the "
 "deployment descriptors in the archive, and <literal>BeanDeploymentArchive."
@@ -222,7 +203,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:114
 #, no-c-format
 msgid ""
 "BDA X may also reference another BDA Y whose beans can be resolved by, and "
@@ -233,13 +213,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:122
 #, no-c-format
 msgid "Matching the classloader structure for the deployment"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:124
 #, no-c-format
 msgid ""
 "In practice, you can regard the deployment structure represented by "
@@ -250,7 +228,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:132
 #, no-c-format
 msgid ""
 "To specify the directly accessible BDAs, the container should provide an "
@@ -259,7 +236,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:138
 #, no-c-format
 msgid ""
 "Weld allows the container to describe a circular graph, and will convert a "
@@ -267,7 +243,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:144
 #, no-c-format
 msgid ""
 "Certain services are provided for the whole deployment, whilst some are "
@@ -277,13 +252,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:153
 #, no-c-format
 msgid "EJB descriptors"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:155
 #, no-c-format
 msgid ""
 "Weld delegates EJB 3 bean discovery to the container so that it doesn't "
@@ -292,7 +265,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:160
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>EjbDescriptor</literal> should return the relevant metadata as "
@@ -307,13 +279,11 @@
 "EJB)."
 
 #. Tag: title
-#: ri-spi.xml:169
 #, no-c-format
 msgid "EE resource injection and resolution services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:171
 #, no-c-format
 msgid ""
 "All the EE resource services are per-BDA services, and may be provided using "
@@ -322,37 +292,33 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:176
 #, no-c-format
 msgid ""
 "The integrator may choose to provide all EE resource injection services "
 "themselves, using another library or framework. In this case the integrator "
 "should use the <literal>EE</literal> environment, and implement the <xref "
-"linkend=\"injection.services\"/> SPI."
+"linkend=\"injection.services\" /> SPI."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:182
 #, no-c-format
 msgid ""
 "Alternatively, the integrator may choose to use CDI to provide EE resource "
 "injection. In this case, the <literal>EE_INJECT</literal> environment should "
 "be used, and the integrator should implement the <xref linkend=\"ejb."
-"services.resolution\"/>, <xref linkend=\"resource.services\"/> and <xref "
-"linkend=\"jpa.services\"/>."
+"services.resolution\" />, <xref linkend=\"resource.services\" /> and <xref "
+"linkend=\"jpa.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:189
 #, no-c-format
 msgid ""
 "CDI only provides annotation-based EE resource injection; if you wish to "
 "provide deployment descriptor (e.g. <literal>ejb-jar.xml</literal>) "
-"injection, you must use <xref linkend=\"injection.services\"/>."
+"injection, you must use <xref linkend=\"injection.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:195
 #, no-c-format
 msgid ""
 "If the container performs EE resource injection, the injected resources must "
@@ -361,7 +327,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:201
 #, no-c-format
 msgid ""
 "If you use a non-EE environment then you may implement any of the EE service "
@@ -370,29 +335,26 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:210
 #, no-c-format
 msgid "EJB services"
 msgstr "Servizi EJB"
 
 #. Tag: para
-#: ri-spi.xml:212
 #, no-c-format
 msgid "EJB services are split between two interfaces which are both per-BDA."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:216
 #, fuzzy, no-c-format
 msgid ""
 "<literal>EJBServices</literal> is used to resolve local EJBs used to back "
 "session beans, and must always be provided in an EE environment. "
 "<literal>EJBServices.resolveEjb(EjbDescriptor ejbDescriptor)</literal> "
-"returns a wrapper&#8212;<literal>SessionObjectReference</literal>&#8212;"
-"around the EJB reference. This wrapper allows Weld to request a reference "
-"that implements the given business interface, and, in the case of SFSBs, "
-"both request the removal of the EJB from the container and query whether the "
-"EJB has been previously removed."
+"returns a wrapper—<literal>SessionObjectReference</literal>—around the EJB "
+"reference. This wrapper allows Weld to request a reference that implements "
+"the given business interface, and, in the case of SFSBs, both request the "
+"removal of the EJB from the container and query whether the EJB has been "
+"previously removed."
 msgstr ""
 "Risolvendo gli EJB locali (usati per mappare i session bean) viene "
 "restituito un wrapper (<literal>SessionObjectReference</literal>) attorno al "
@@ -401,23 +363,25 @@
 "SFSB, la richiesta di rimozione dell'EJB dal container."
 
 #. Tag: para
-#: ri-spi.xml:225
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>EJBResolutionServices.resolveEjb(InjectionPoint ij)</literal> "
 "allows the resolution of <literal>@EJB</literal> (for injection into managed "
 "beans). This service is not required if the implementation of <xref linkend="
-"\"injection.services\"/> takes care of <literal>@EJB</literal> injection."
+"\"injection.services\" /> takes care of <literal>@EJB</literal> injection."
 msgstr ""
+"La risoluzione di di riferimenti web service (per l'iniezione come risorse "
+"Java EE) è delegata al container. Occorre fornire un'implementazione di "
+"<literal>WebServices</literal> che rende disponibili queste operazioni. Per "
+"risolvere la risorsa Java EE verrà fornito <literal>jndiName</literal> o "
+"<literal>mappedName</literal>"
 
 #. Tag: title
-#: ri-spi.xml:234
 #, no-c-format
 msgid "JPA services"
 msgstr "Servizi JPA"
 
 #. Tag: para
-#: ri-spi.xml:236
 #, fuzzy, no-c-format
 msgid ""
 "Just as EJB resolution is delegated to the container, resolution of "
@@ -433,23 +397,25 @@
 "come risorse Java EE."
 
 #. Tag: para
-#: ri-spi.xml:242
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "To allow JPA integration, the <literal>JpaServices</literal> interface "
 "should be implemented. This service is not required if the implementation of "
-"<xref linkend=\"injection.services\"/> takes care of "
+"<xref linkend=\"injection.services\" /> takes care of "
 "<literal>@PersistenceContext</literal> injection."
 msgstr ""
+"La risoluzione di di riferimenti web service (per l'iniezione come risorse "
+"Java EE) è delegata al container. Occorre fornire un'implementazione di "
+"<literal>WebServices</literal> che rende disponibili queste operazioni. Per "
+"risolvere la risorsa Java EE verrà fornito <literal>jndiName</literal> o "
+"<literal>mappedName</literal>"
 
 #. Tag: title
-#: ri-spi.xml:251
 #, no-c-format
 msgid "Transaction Services"
 msgstr "Servizi di transazione"
 
 #. Tag: para
-#: ri-spi.xml:253
 #, fuzzy, no-c-format
 msgid ""
 "Weld delegates JTA activities to the container. The SPI provides a couple "
@@ -461,7 +427,6 @@
 "literal>."
 
 #. Tag: para
-#: ri-spi.xml:258
 #, no-c-format
 msgid ""
 "Any <literal>javax.transaction.Synchronization</literal> implementation may "
@@ -475,7 +440,6 @@
 "sincronizzazione con il gestore della transazione JTA usato per EJB."
 
 #. Tag: para
-#: ri-spi.xml:264
 #, no-c-format
 msgid ""
 "To make it easier to determine whether or not a transaction is currently "
@@ -489,20 +453,18 @@
 "interrogare lo stesso gestore della transazione JTA usato per EJB."
 
 #. Tag: title
-#: ri-spi.xml:272
 #, no-c-format
 msgid "Resource Services"
 msgstr "Servizi di risorse"
 
 #. Tag: para
-#: ri-spi.xml:274
 #, fuzzy, no-c-format
 msgid ""
 "The resolution of <literal>@Resource</literal> (for injection into managed "
 "beans) is delegated to the container. You must provide an implementation of "
 "<literal>ResourceServices</literal> which provides these operations. This "
 "service is not required if the implementation of <xref linkend=\"injection."
-"services\"/> takes care of <literal>@Resource</literal> injection."
+"services\" /> takes care of <literal>@Resource</literal> injection."
 msgstr ""
 "La risoluzione di di riferimenti web service (per l'iniezione come risorse "
 "Java EE) è delegata al container. Occorre fornire un'implementazione di "
@@ -511,13 +473,11 @@
 "<literal>mappedName</literal>"
 
 #. Tag: title
-#: ri-spi.xml:283
 #, fuzzy, no-c-format
 msgid "Injection Services"
 msgstr "Servizi di transazione"
 
 #. Tag: para
-#: ri-spi.xml:285
 #, no-c-format
 msgid ""
 "An integrator may wish to use <literal>InjectionServices</literal> to "
@@ -528,7 +488,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:291
 #, no-c-format
 msgid ""
 "<literal>InjectionServices</literal> provides a very simple contract, the "
@@ -539,7 +498,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:298
 #, no-c-format
 msgid ""
 "The <literal>InjectionContext</literal> can be used to discover additional "
@@ -550,13 +508,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:307
 #, fuzzy, no-c-format
 msgid "Security Services"
 msgstr "Servizi di risorse"
 
 #. Tag: para
-#: ri-spi.xml:309
 #, no-c-format
 msgid ""
 "In order to obtain the <literal>Principal</literal> representing the current "
@@ -565,13 +521,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:317
 #, fuzzy, no-c-format
 msgid "Bean Validation Services"
 msgstr "Servizi di transazione"
 
 #. Tag: para
-#: ri-spi.xml:319
 #, no-c-format
 msgid ""
 "In order to obtain the default <literal>ValidatorFactory</literal> for the "
@@ -580,13 +534,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:327
 #, no-c-format
 msgid "Identifying the BDA being addressed"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:329
 #, no-c-format
 msgid ""
 "When a client makes a request to an application which uses Weld, the request "
@@ -597,43 +549,39 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:337
 #, no-c-format
 msgid ""
-"Most Servlet contains use a classloader-per-WAR, this may provide a good way "
+"Most Servlet contains use a classloader-per-war, this may provide a good way "
 "to identify the BDA in use for web requests."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:343
 #, no-c-format
 msgid ""
 "When Weld needs to identify the BDA, it will use one of these services, "
 "depending on what is servicing the request:"
 msgstr ""
 
-#. Tag: literal
-#: ri-spi.xml:350
+#. Tag: term
 #, no-c-format
-msgid "ServletServices.getBeanDeploymentArchive(ServletContext ctx)"
+msgid ""
+"<literal>ServletServices.getBeanDeploymentArchive(ServletContext ctx)</"
+"literal>"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:352
 #, no-c-format
 msgid ""
-"Identify the WAR in use. The <literal>ServletContext</literal> is provided "
+"Identify the war in use. The <literal>ServletContext</literal> is provided "
 "for additional context."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:362
 #, no-c-format
 msgid "The bean store"
 msgstr "Il bean store"
 
 #. Tag: para
-#: ri-spi.xml:364
 #, fuzzy, no-c-format
 msgid ""
 "Weld uses a map like structure to store bean instances - <literal>org.jboss."
@@ -646,13 +594,11 @@
 "ConcurrentHashMapBeanStore</literal>."
 
 #. Tag: title
-#: ri-spi.xml:372
 #, no-c-format
 msgid "The application context"
 msgstr "Il contesto applicazione"
 
 #. Tag: para
-#: ri-spi.xml:374
 #, fuzzy, no-c-format
 msgid ""
 "Weld expects the Application Server or other container to provide the "
@@ -666,13 +612,11 @@
 "fornire uno storage con scope applicazione."
 
 #. Tag: title
-#: ri-spi.xml:383
 #, fuzzy, no-c-format
 msgid "Initialization and shutdown"
 msgstr "Bootstrap e spegnimento"
 
 #. Tag: para
-#: ri-spi.xml:384
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>org.jboss.weld.bootstrap.api.Bootstrap</literal> interface "
@@ -688,7 +632,6 @@
 "in uso, e poi chiedere che il container venga avviato."
 
 #. Tag: para
-#: ri-spi.xml:391
 #, fuzzy, no-c-format
 msgid ""
 "The bootstrap is split into phases, container initialization, bean "
@@ -704,7 +647,6 @@
 "definiti con XML; e validerà tutti i bean."
 
 #. Tag: para
-#: ri-spi.xml:398
 #, fuzzy, no-c-format
 msgid ""
 "To initialize the container, you call <literal>Bootstrap.startInitialization"
@@ -722,7 +664,6 @@
 "store."
 
 #. Tag: para
-#: ri-spi.xml:405
 #, fuzzy, no-c-format
 msgid ""
 "Having called <literal>startInitialization()</literal>, the "
@@ -734,7 +675,6 @@
 "literal>."
 
 #. Tag: para
-#: ri-spi.xml:410
 #, fuzzy, no-c-format
 msgid ""
 "To deploy the discovered beans, call <literal>Bootstrap.deployBeans()</"
@@ -742,7 +682,6 @@
 msgstr "Per avviare il container chiamare <literal>Bootstrap.boot()</literal>."
 
 #. Tag: para
-#: ri-spi.xml:414
 #, fuzzy, no-c-format
 msgid ""
 "To validate the deployed beans, call <literal>Bootstrap.validateBeans()</"
@@ -750,7 +689,6 @@
 msgstr "Per avviare il container chiamare <literal>Bootstrap.boot()</literal>."
 
 #. Tag: para
-#: ri-spi.xml:418
 #, fuzzy, no-c-format
 msgid ""
 "To place the container into a state where it can service requests, call "
@@ -758,7 +696,6 @@
 msgstr "Per avviare il container chiamare <literal>Bootstrap.boot()</literal>."
 
 #. Tag: para
-#: ri-spi.xml:423
 #, fuzzy, no-c-format
 msgid ""
 "To shutdown the container you call <literal>Bootstrap.shutdown()</literal>. "
@@ -769,13 +706,11 @@
 "container di eseguire ogni pulizia necessaria delle operazioni."
 
 #. Tag: title
-#: ri-spi.xml:431
 #, no-c-format
 msgid "Resource loading"
 msgstr "Caricamento risorse"
 
 #. Tag: para
-#: ri-spi.xml:433
 #, fuzzy, no-c-format
 msgid ""
 "Weld needs to load classes and resources from the classpath at various "
@@ -792,13 +727,11 @@
 "ResourceLoader</literal>:"
 
 #. Tag: title
-#: ri-spi.xml:445
 #, no-c-format
 msgid "The contract with the container"
 msgstr "Il contratto con il container"
 
 #. Tag: para
-#: ri-spi.xml:447
 #, fuzzy, no-c-format
 msgid ""
 "There are a number of requirements that Weld places on the container for "
@@ -808,13 +741,11 @@
 "sono un numero di requisiti che Web Beans RI pone nel container."
 
 #. Tag: term
-#: ri-spi.xml:454
 #, no-c-format
 msgid "Classloader isolation"
 msgstr "Isolamento del classloader"
 
 #. Tag: para
-#: ri-spi.xml:458
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into an environment that supports deployment of "
@@ -827,13 +758,11 @@
 "Web Beans."
 
 #. Tag: term
-#: ri-spi.xml:466
 #, no-c-format
 msgid "Servlet"
 msgstr "Servlet"
 
 #. Tag: para
-#: ri-spi.xml:470
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a Servlet environment you must register "
@@ -847,7 +776,6 @@
 "ciascuna applicazione Web Beans che usa Servlet."
 
 #. Tag: para
-#: ri-spi.xml:475
 #, no-c-format
 msgid ""
 "You must ensure that that <literal>WeldListener.contextInitialized()</"
@@ -856,13 +784,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:482
 #, no-c-format
-msgid "<term>JSF</term>"
-msgstr "<term>JSF</term>"
+msgid "JSF"
+msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:487
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -874,7 +800,6 @@
 "ciascuna applicazione Web Beans che usa Servlet."
 
 #. Tag: para
-#: ri-spi.xml:492
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -887,7 +812,6 @@
 "ciascuna applicazione Web Beans che usa Servlet."
 
 #. Tag: para
-#: ri-spi.xml:497
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -900,7 +824,6 @@
 "ciascuna applicazione Web Beans che usa Servlet."
 
 #. Tag: para
-#: ri-spi.xml:502
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -912,7 +835,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:509
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -922,7 +844,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:516 ri-spi.xml:562
 #, no-c-format
 msgid ""
 "There are a number of ways you can obtain the bean manager for the module. "
@@ -932,7 +853,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:523
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -948,19 +868,16 @@
 "venir registrato in modo sicuro per tutti i deploy dei servlet."
 
 #. Tag: para
-#: ri-spi.xml:531
 #, fuzzy, no-c-format
 msgid "Weld only supports JSF 1.2 and above."
 msgstr "Web Beans supporta solo JSF 1.2 e superiori."
 
 #. Tag: term
-#: ri-spi.xml:538
-#, fuzzy, no-c-format
-msgid "<term>JSP</term>"
-msgstr "<term>JSF</term>"
+#, no-c-format
+msgid "JSP"
+msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:543
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must register "
@@ -973,7 +890,6 @@
 "ciascuna applicazione Web Beans che usa Servlet."
 
 #. Tag: para
-#: ri-spi.xml:548
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -984,7 +900,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:555
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -994,20 +909,20 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:572
 #, no-c-format
 msgid "Session Bean Interceptor"
 msgstr "Session Bean Interceptor"
 
 #. Tag: para
-#: ri-spi.xml:576
 #, fuzzy, no-c-format
 msgid ""
-"If you are integrating Weld into an EJB environment you must register "
-"<literal>org.jboss.weld.ejb.SessionBeanInterceptor</literal> as a EJB "
-"interceptor for all EJBs in the application, either automatically, or "
-"through user configuration, for each CDI application which uses enterprise "
-"beans."
+"If you are integrating Weld into an EJB environment you must register the "
+"<literal>aroundInvoke</literal> method of <literal>org.jboss.weld.ejb."
+"SessionBeanInterceptor</literal> as a EJB around-invoke interceptor for all "
+"EJBs in the application, either automatically, or through user "
+"configuration, for each CDI application which uses enterprise beans. If you "
+"are running in a EJB 3.1 environment, you should register this as an around-"
+"timeout interceptor as well."
 msgstr ""
 "Se si integra Web Beans in un ambiente EJB occorre registrare <literal>org."
 "jboss.webbeans.ejb.SessionBeanInterceptor</literal> come interceptor EJB per "
@@ -1016,7 +931,6 @@
 "enterprise."
 
 #. Tag: para
-#: ri-spi.xml:583
 #, no-c-format
 msgid ""
 "You must register the <literal>SessionBeanInterceptor</literal> as the inner "
@@ -1026,13 +940,11 @@
 "interceptor più interno allo stack per tutti gli EJB."
 
 #. Tag: term
-#: ri-spi.xml:591
 #, fuzzy, no-c-format
 msgid "The <literal>weld-core.jar</literal>"
 msgstr "<literal>webbeans-core.jar</literal>"
 
 #. Tag: para
-#: ri-spi.xml:595
 #, no-c-format
 msgid ""
 "Weld can reside on an isolated classloader, or on a shared classloader. If "
@@ -1044,7 +956,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:601
 #, no-c-format
 msgid ""
 "You can provide your own implementation of <literal>Singleton</literal> and "
@@ -1053,7 +964,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:606
 #, no-c-format
 msgid ""
 "Weld also provides an implementation of Thread Context Classloader per "
@@ -1061,13 +971,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:613
 #, no-c-format
 msgid "Binding the manager in JNDI"
 msgstr "Associare il manager a JNDI"
 
 #. Tag: para
-#: ri-spi.xml:617
 #, fuzzy, no-c-format
 msgid ""
 "You should bind the bean manager for the bean deployment archive into JNDI "
@@ -1083,13 +991,11 @@
 "resources.ManagerObjectFactory</literal>"
 
 #. Tag: term
-#: ri-spi.xml:627
 #, no-c-format
 msgid "Performing CDI injection on Java EE component classes"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:631
 #, no-c-format
 msgid ""
 "The CDI specification requires the container to provide injection into non-"
@@ -1101,7 +1007,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:639
 #, no-c-format
 msgid ""
 "The CDI specification also requires that a <literal>ProcessInjectionTarget</"
@@ -1112,7 +1017,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:646
 #, no-c-format
 msgid ""
 "To help the integrator, Weld provides <literal>WeldManager."
@@ -1120,36 +1024,7 @@
 "<literal>InjectionTarget</literal> to use."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:651
-#, no-c-format
-msgid ""
-"<![CDATA[// Fire ProcessInjectionTarget, returning the InjectionTarget\n"
-"// to use\n"
-"InjectionTarget it = weldBeanManager.fireProcessInjectionTarget(clazz);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = beanManager.createCreationalContext(null);\n"
-"\n"
-"// Produce the instance, performing any constructor injection required\n"
-"Object instance = it.produce();\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
-
 #. Tag: para
-#: ri-spi.xml:652
 #, no-c-format
 msgid ""
 "The container may intersperse other operations between these calls. Further, "
@@ -1158,7 +1033,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:656
 #, no-c-format
 msgid ""
 "When performing injections on EJBs you must use the Weld-defined SPI, "
@@ -1167,42 +1041,13 @@
 "EJB."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:661
-#, no-c-format
-msgid ""
-"<![CDATA[// Obtain the EjbDescriptor for the EJB\n"
-"// You may choose to use this utility method to get the descriptor\n"
-"EjbDescriptor<?> ejbDescriptor = beanManager.getEjbDescriptor(ejbName);\n"
-"\n"
-"// Get an the Bean object\n"
-"Bean<?> bean = beanManager.getBean(ejbDescriptor);\n"
-"\n"
-"// Create the injection target\n"
-"InjectionTarget it = deploymentBeanManager.createInjectionTarget"
-"(ejbDescriptor);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = deploymentBeanManager.createCreationalContext"
-"(bean);\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// You may choose to have CDI call the post construct and pre destroy\n"
-"// lifecycle callbacks\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
+#~ msgid "<term>JSF</term>"
+#~ msgstr "<term>JSF</term>"
 
+#, fuzzy
+#~ msgid "<term>JSP</term>"
+#~ msgstr "<term>JSF</term>"
+
 #~ msgid ""
 #~ "Currently Web Beans only runs in JBoss AS 5; integrating the RI into "
 #~ "other EE environments (for example another application server like "

Modified: doc/trunk/reference/it-IT/scopescontexts.po
===================================================================
--- doc/trunk/reference/it-IT/scopescontexts.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/scopescontexts.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-26 13:03+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: scopescontexts.xml:5
 #, no-c-format
 msgid "Scopes and contexts"
 msgstr "Scope e contesti"
 
 #. Tag: para
-#: scopescontexts.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "So far, we've seen a few examples of <emphasis>scope type annotations</"
@@ -34,20 +32,17 @@
 "istanze di Web Bean. Secondo la specifica Web Bean, uno scope determina:"
 
 #. Tag: para
-#: scopescontexts.xml:16
 #, fuzzy, no-c-format
 msgid "When a new instance of any bean with that scope is created"
 msgstr "Quando una nuova istanza di un Web Bean con tale scope viene creata"
 
 #. Tag: para
-#: scopescontexts.xml:19
 #, fuzzy, no-c-format
 msgid "When an existing instance of any bean with that scope is destroyed"
 msgstr ""
 "Quando un'istanza esistente di un Web Bean con tale scope viene distrutta"
 
 #. Tag: para
-#: scopescontexts.xml:22
 #, fuzzy, no-c-format
 msgid ""
 "Which injected references refer to any instance of a bean with that scope"
@@ -55,7 +50,6 @@
 "Quali riferimenti iniettati puntano a istanze di un Web Bean con tale scope"
 
 #. Tag: para
-#: scopescontexts.xml:27
 #, fuzzy, no-c-format
 msgid ""
 "For example, if we have a session-scoped bean, <literal>CurrentUser</"
@@ -74,7 +68,6 @@
 "sessione termina. "
 
 #. Tag: para
-#: scopescontexts.xml:35
 #, no-c-format
 msgid ""
 "JPA entities aren't a great fit for this model. Entities have their whole "
@@ -87,13 +80,11 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:45
 #, no-c-format
 msgid "Scope types"
 msgstr "Tipi di scope"
 
 #. Tag: para
-#: scopescontexts.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "CDI features an <emphasis>extensible context model</emphasis>. It's possible "
@@ -103,22 +94,7 @@
 "E' possibile definire nuovi scope creando una nuova annotazione di un tipo "
 "di scope."
 
-#. Tag: programlisting
-#: scopescontexts.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ScopeType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"public @interface ClusterScoped {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"@ScopeType\n"
-"public @interface ClusterScoped {}]]>"
-
 #. Tag: para
-#: scopescontexts.xml:54
 #, fuzzy, no-c-format
 msgid ""
 "Of course, that's the easy part of the job. For this scope type to be "
@@ -134,7 +110,6 @@
 "literal> è compito molto tecnico, inteso solo per lo sviluppo di framework."
 
 #. Tag: para
-#: scopescontexts.xml:61
 #, fuzzy, no-c-format
 msgid ""
 "We can apply a scope type annotation to a bean implementation class to "
@@ -143,66 +118,47 @@
 "Si può applicare un'annotazione con un tipo scope ad una classe di "
 "implementazione Web Bean per specificare lo scope del Web Bean:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-msgstr ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:67
 #, fuzzy, no-c-format
 msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr "Solitamente si userà uno degli scopi predefiniti di Web Beans."
 
 #. Tag: title
-#: scopescontexts.xml:72
 #, no-c-format
 msgid "Built-in scopes"
 msgstr "Scope predefiniti"
 
 #. Tag: para
-#: scopescontexts.xml:74
 #, fuzzy, no-c-format
 msgid "CDI defines four built-in scopes:"
 msgstr "Web Beans definisce quattro scope predefiniti:"
 
-#. Tag: literal
-#: scopescontexts.xml:78
-#, no-c-format
-msgid "@RequestScoped"
-msgstr "@RequestScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@RequestScoped</literal>"
+msgstr "Annotazione <literal>@New</literal>"
 
-#. Tag: literal
-#: scopescontexts.xml:81
-#, no-c-format
-msgid "@SessionScoped"
-msgstr "@SessionScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@SessionScoped</literal>"
+msgstr "Annotazione <literal>@New</literal>"
 
-#. Tag: literal
-#: scopescontexts.xml:84
-#, no-c-format
-msgid "@ApplicationScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@ApplicationScoped</literal>"
 msgstr "@ApplicationScoped"
 
-#. Tag: literal
-#: scopescontexts.xml:87
-#, no-c-format
-msgid "@ConversationScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@ConversationScoped</literal>"
 msgstr "@ConversationScoped"
 
 #. Tag: para
-#: scopescontexts.xml:91
 #, fuzzy, no-c-format
 msgid "For a web application that uses CDI:"
 msgstr "Per un'applicazione web che impiega Web Beans:"
 
 #. Tag: para
-#: scopescontexts.xml:95
 #, no-c-format
 msgid ""
 "any servlet request has access to active request, session and application "
@@ -212,13 +168,11 @@
 "e applicazione e, in aggiunta"
 
 #. Tag: para
-#: scopescontexts.xml:100
 #, no-c-format
 msgid "any JSF request has access to an active conversation scope."
 msgstr "qualsiasi richiesta JSF ha accesso allo scope attivo di conversazione"
 
 #. Tag: para
-#: scopescontexts.xml:105
 #, no-c-format
 msgid ""
 "A CDI extension can implement support for the conversation scope in other "
@@ -226,49 +180,41 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:108
 #, no-c-format
 msgid "The request and application scopes are also active:"
 msgstr "Gli scope di richiesta ed applicazione sono pure attivi:"
 
 #. Tag: para
-#: scopescontexts.xml:112
 #, no-c-format
 msgid "during invocations of EJB remote methods,"
 msgstr "durante le invocazioni a metodi remoti EJB,"
 
 #. Tag: para
-#: scopescontexts.xml:115
 #, fuzzy, no-c-format
 msgid "during invocations of EJB asynchronous methods,"
 msgstr "durante le invocazioni a metodi remoti EJB,"
 
 #. Tag: para
-#: scopescontexts.xml:118
 #, no-c-format
 msgid "during EJB timeouts,"
 msgstr "durante i timeout EJB,"
 
 #. Tag: para
-#: scopescontexts.xml:121
 #, fuzzy, no-c-format
 msgid "during message delivery to a message-driven bean,"
 msgstr "durante la consegna dei messaggi a bean message-drive, e"
 
 #. Tag: para
-#: scopescontexts.xml:124
 #, fuzzy, no-c-format
 msgid "during message delivery to a <literal>MessageListener</literal>, and"
 msgstr "durante la consegna dei messaggi a bean message-drive, e"
 
 #. Tag: para
-#: scopescontexts.xml:127
 #, no-c-format
 msgid "during web service invocations."
 msgstr "durante invocazioni web service."
 
 #. Tag: para
-#: scopescontexts.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "If the application tries to invoke a bean with a scope that does not have an "
@@ -280,7 +226,6 @@
 "lanciata a runtime dal manager Web Bean."
 
 #. Tag: para
-#: scopescontexts.xml:136
 #, no-c-format
 msgid ""
 "Managed beans with scope <literal>@SessionScoped</literal> or "
@@ -289,7 +234,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:141
 #, no-c-format
 msgid ""
 "Three of the four built-in scopes should be extremely familiar to every Java "
@@ -301,13 +245,11 @@
 "Uno degli scope è comunque nuovo."
 
 #. Tag: title
-#: scopescontexts.xml:149
 #, no-c-format
 msgid "The conversation scope"
 msgstr "Lo scope conversazione"
 
 #. Tag: para
-#: scopescontexts.xml:151
 #, fuzzy, no-c-format
 msgid ""
 "The conversation scope is a bit like the traditional session scope in that "
@@ -321,13 +263,11 @@
 "scope di sessione, lo scope di conversazione:"
 
 #. Tag: para
-#: scopescontexts.xml:159
 #, no-c-format
 msgid "is demarcated explicitly by the application, and"
 msgstr "è demarcato esplicitamente dall'applicazione, e"
 
 #. Tag: para
-#: scopescontexts.xml:162
 #, no-c-format
 msgid ""
 "holds state associated with a particular web browser tab in a JSF "
@@ -336,13 +276,12 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:169
 #, fuzzy, no-c-format
 msgid ""
-"A conversation represents a task&#8212;a unit of work from the point of view "
-"of the user. The conversation context holds state associated with what the "
-"user is currently working on. If the user is doing multiple things at the "
-"same time, there are multiple conversations."
+"A conversation represents a task—a unit of work from the point of view of "
+"the user. The conversation context holds state associated with what the user "
+"is currently working on. If the user is doing multiple things at the same "
+"time, there are multiple conversations."
 msgstr ""
 "Una conversazione rappresenta un task, un'unità di lavoro dal punto di vista "
 "dell'utente. Il contesto di conversazione mantiene uno stato associato "
@@ -350,7 +289,6 @@
 "contemporaneamente ci saranno più conversazioni."
 
 #. Tag: para
-#: scopescontexts.xml:175
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context is active during any JSF request. Most "
@@ -365,13 +303,11 @@
 "running</emphasis>."
 
 #. Tag: title
-#: scopescontexts.xml:182
 #, no-c-format
 msgid "Conversation demarcation"
 msgstr "Demarcazione della conversazione"
 
 #. Tag: para
-#: scopescontexts.xml:184
 #, fuzzy, no-c-format
 msgid ""
 "CDI provides a built-in bean for controlling the lifecycle of conversations "
@@ -381,14 +317,7 @@
 "delle conversazioni in un'applicazione JSF. QUesto Web Bean può essere "
 "ottenuto per iniezione:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:189
-#, fuzzy, no-c-format
-msgid "@Inject Conversation conversation;"
-msgstr "@Current Conversation conversation;"
-
 #. Tag: para
-#: scopescontexts.xml:191
 #, no-c-format
 msgid ""
 "To promote the conversation associated with the current request to a long-"
@@ -403,7 +332,6 @@
 "conversazione long-running, si chiami <literal>end()</literal>."
 
 #. Tag: para
-#: scopescontexts.xml:197
 #, fuzzy, no-c-format
 msgid ""
 "In the following example, a conversation-scoped bean controls the "
@@ -412,72 +340,7 @@
 "Nel seguente esempio un Web Bean con scope di conversazione controlla la "
 "conversazione alla quale è associato:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:201
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"   private Order order;\n"
-"   private @Inject Conversation conversation;\n"
-"   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
-"   \n"
-"   @Produces public Order getOrder() {\n"
-"      return order;\n"
-"   }\n"
-"\n"
-"   public Order createOrder() {\n"
-"      order = new Order();\n"
-"      conversation.begin();\n"
-"      return order;\n"
-"   }\n"
-"   \n"
-"   public void addLineItem(Product product, int quantity) {\n"
-"      order.add(new LineItem(product, quantity));\n"
-"   }\n"
-"\n"
-"   public void saveOrder(Order order) {\n"
-"      em.persist(order);\n"
-"      conversation.end();\n"
-"   }\n"
-"   \n"
-"   @Remove\n"
-"   public void destroy() {}\n"
-"}]]>"
-msgstr ""
-"@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"\n"
-"    private Order order;\n"
-"    private @Current Conversation conversation;\n"
-"    private @PersistenceContext(type=EXTENDED) EntityManager em;\n"
-"    \n"
-"    @Produces public Order getOrder() {\n"
-"        return order;\n"
-"    }\n"
-"\n"
-"    public Order createOrder() {\n"
-"        order = new Order();\n"
-"        conversation.begin();\n"
-"        return order;\n"
-"    }\n"
-"    \n"
-"    public void addLineItem(Product product, int quantity) {\n"
-"        order.add( new LineItem(product, quantity) );\n"
-"    }\n"
-"\n"
-"    public void saveOrder(Order order) {\n"
-"        em.persist(order);\n"
-"        conversation.end();\n"
-"    }\n"
-"    \n"
-"    @Remove\n"
-"    public void destroy() {}\n"
-"    \n"
-"}"
-
 #. Tag: para
-#: scopescontexts.xml:203
 #, fuzzy, no-c-format
 msgid ""
 "This bean is able to control its own lifecycle through use of the "
@@ -489,13 +352,11 @@
 "ciclo di vita che dipende completamente da un altro oggetto."
 
 #. Tag: title
-#: scopescontexts.xml:211
 #, no-c-format
 msgid "Conversation propagation"
 msgstr "Propagazione della conversazione"
 
 #. Tag: para
-#: scopescontexts.xml:213
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context automatically propagates with any JSF faces request "
@@ -507,7 +368,6 @@
 "con richiesta non-faces, per esempio, navigazione tramite un link."
 
 #. Tag: para
-#: scopescontexts.xml:218
 #, fuzzy, no-c-format
 msgid ""
 "We can force the conversation to propagate with a non-faces request by "
@@ -526,38 +386,16 @@
 "<literal>conversation</literal>."
 
 #. Tag: para
-#: scopescontexts.xml:225
 #, no-c-format
 msgid "Therefore, the following link propagates the conversation:"
 msgstr "Quindi il seguente link propaga la conversazione:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:229
-#, no-c-format
-msgid ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-msgstr ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-
 #. Tag: para
-#: scopescontexts.xml:231
 #, no-c-format
 msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:235
-#, no-c-format
-msgid ""
-"<![CDATA[<h:link outcome=\"/addProduct.xhtml value=\"Add Product\">\n"
-"   <f:param name=\"cid\" value=\"#{conversation.id}\"/>\n"
-"</h:link>]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:238
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context propagates across redirects, making it very easy to "
@@ -572,21 +410,19 @@
 "aggiunge automaticamente un parametro di richiesta all'URL di redirect."
 
 #. Tag: title
-#: scopescontexts.xml:248
 #, no-c-format
 msgid "Conversation timeout"
 msgstr "Timeout della conversazione"
 
 #. Tag: para
-#: scopescontexts.xml:250
 #, fuzzy, no-c-format
 msgid ""
 "The container is permitted to destroy a conversation and all state held in "
 "its context at any time in order to conserve resources. A CDI implementation "
-"will normally do this on the basis of some kind of timeout&#8212;though this "
-"is not required by the specification. The timeout is the period of "
-"inactivity before the conversation is destroyed (as opposed to the amount of "
-"time the conversation is active)."
+"will normally do this on the basis of some kind of timeout—though this is "
+"not required by the specification. The timeout is the period of inactivity "
+"before the conversation is destroyed (as opposed to the amount of time the "
+"conversation is active)."
 msgstr ""
 "Al manager Web Bean è permesso di distruggere una conversazione e tutto lo "
 "stato mantenuto nel contesto in qualsiasi momento al fine di preservare le "
@@ -596,7 +432,6 @@
 "venga distrutta."
 
 #. Tag: para
-#: scopescontexts.xml:257
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Conversation</literal> object provides a method to set the "
@@ -607,20 +442,12 @@
 "iltimeout. Questo è solo un suggerimento al manager Web Bean, che è libero "
 "di ignorare quest'impostazione."
 
-#. Tag: programlisting
-#: scopescontexts.xml:262
-#, no-c-format
-msgid "conversation.setTimeout(timeoutInMillis);"
-msgstr "conversation.setTimeout(timeoutInMillis);"
-
 #. Tag: title
-#: scopescontexts.xml:269
 #, fuzzy, no-c-format
 msgid "The singleton pseudo-scope"
 msgstr "Pseudo-scope dipendente"
 
 #. Tag: para
-#: scopescontexts.xml:271
 #, fuzzy, no-c-format
 msgid ""
 "In addition to the four built-in scopes, CDI also supports two "
@@ -633,7 +460,6 @@
 "per un Web Bean che non dichiara esplicitamente un tipo di scope."
 
 #. Tag: para
-#: scopescontexts.xml:277
 #, no-c-format
 msgid ""
 "Unlike the other scopes, which belong to the package <literal>javax."
@@ -642,7 +468,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:283
 #, no-c-format
 msgid ""
 "You can guess what \"singleton\" means here. It means a bean that is "
@@ -657,7 +482,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:292
 #, no-c-format
 msgid ""
 "Now, if the singleton instance is a simple, immutable, serializable object "
@@ -668,7 +492,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:298
 #, no-c-format
 msgid ""
 "There are several ways to ensure that the singleton bean remains a singleton "
@@ -676,7 +499,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:302
 #, no-c-format
 msgid ""
 "have the singleton bean implement <literal>writeResolve()</literal> and "
@@ -685,7 +507,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:308
 #, no-c-format
 msgid ""
 "make sure the client keeps only a transient reference to the singleton bean, "
@@ -693,7 +514,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:313
 #, no-c-format
 msgid ""
 "give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
@@ -701,7 +521,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:320
 #, no-c-format
 msgid ""
 "A fourth, better solution is to instead use <literal>@ApplicationScoped</"
@@ -710,13 +529,11 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:326
 #, no-c-format
 msgid "The dependent pseudo-scope"
 msgstr "Pseudo-scope dipendente"
 
 #. Tag: para
-#: scopescontexts.xml:328
 #, fuzzy, no-c-format
 msgid ""
 "Finally, CDI features the so-called <emphasis>dependent pseudo-scope</"
@@ -728,7 +545,6 @@
 "per un Web Bean che non dichiara esplicitamente un tipo di scope."
 
 #. Tag: para
-#: scopescontexts.xml:333
 #, fuzzy, no-c-format
 msgid ""
 "For example, this bean has the scope type <literal>@Dependent</literal>:"
@@ -736,14 +552,7 @@
 "Per esempio questo Web Bean ha uno scope di tipo <literal>@Dependent</"
 "literal>:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:337
-#, no-c-format
-msgid "<![CDATA[public class Calculator { ... }]]>"
-msgstr "<![CDATA[public class Calculator { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:339
 #, no-c-format
 msgid ""
 "An instance of a dependent bean is never shared between different clients or "
@@ -754,7 +563,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:345
 #, no-c-format
 msgid ""
 "If a Unified EL expression refers to a dependent bean by EL name, an "
@@ -763,7 +571,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:351
 #, no-c-format
 msgid ""
 "If you need to access a bean directly by EL name in a JSF page, you probably "
@@ -778,7 +585,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:361
 #, no-c-format
 msgid ""
 "Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
@@ -786,7 +592,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:366
 #, fuzzy, no-c-format
 msgid ""
 "CDI makes it easy to obtain a dependent instance of a bean, even if the bean "
@@ -797,27 +602,18 @@
 "con qualche altro tipo di scope."
 
 #. Tag: title
-#: scopescontexts.xml:374
 #, fuzzy, no-c-format
 msgid "The <literal>@New</literal> qualifier"
 msgstr "Annotazione <literal>@New</literal>"
 
 #. Tag: para
-#: scopescontexts.xml:376
 #, no-c-format
 msgid ""
 "The built-in qualifier <literal>@New</literal> allows us to obtain a "
 "dependent object of a specified class."
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:380
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
-msgstr "<![CDATA[@New Calculator calculator;]]>"
-
 #. Tag: para
-#: scopescontexts.xml:382
 #, no-c-format
 msgid ""
 "The class must be a valid managed bean or session bean, but need not be an "
@@ -825,7 +621,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:384
 #, fuzzy, no-c-format
 msgid ""
 "This works even if <literal>Calculator</literal> is <emphasis>already</"
@@ -834,18 +629,7 @@
 "Questo è vero se <literal>Calculator</literal> è <emphasis>già</emphasis> "
 "dichiarato con un tipo di scope differente, per esempio:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-msgstr ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:391
 #, no-c-format
 msgid ""
 "So the following injected attributes each get a different instance of "
@@ -854,24 +638,7 @@
 "Quindi i seguenti attributi iniettati ricevono ciascuno un'istanza di "
 "<literal>Calculator</literal>:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:395
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class PaymentCalc {\n"
-"   @Inject Calculator calculator;\n"
-"   @Inject @New Calculator newCalculator;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class PaymentCalc {\n"
-"\n"
-"    @Current Calculator calculator;\n"
-"    @New Calculator newCalculator;\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: scopescontexts.xml:397
 #, no-c-format
 msgid ""
 "The <literal>calculator</literal> field has a conversation-scoped instance "
@@ -886,7 +653,6 @@
 "<literal>PaymentCalc</literal>."
 
 #. Tag: para
-#: scopescontexts.xml:403
 #, no-c-format
 msgid ""
 "This feature is particularly useful with producer methods, as we'll see in "
@@ -895,7 +661,136 @@
 "Questa caratteristica è particolarmente utile con i metodi produttori, come "
 "si vedrà nel prossimo capitolo."
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@ScopeType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD})\n"
+#~ "public @interface ClusterScoped {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD})\n"
+#~ "@ScopeType\n"
+#~ "public @interface ClusterScoped {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ClusterScoped\n"
+#~ "public class SecondLevelCache { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ClusterScoped\n"
+#~ "public class SecondLevelCache { ... }]]>"
+
+#~ msgid "@RequestScoped"
+#~ msgstr "@RequestScoped"
+
+#~ msgid "@SessionScoped"
+#~ msgstr "@SessionScoped"
+
+#, fuzzy
+#~ msgid "@Inject Conversation conversation;"
+#~ msgstr "@Current Conversation conversation;"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ConversationScoped @Stateful\n"
+#~ "public class OrderBuilder {\n"
+#~ "   private Order order;\n"
+#~ "   private @Inject Conversation conversation;\n"
+#~ "   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
+#~ "   \n"
+#~ "   @Produces public Order getOrder() {\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public Order createOrder() {\n"
+#~ "      order = new Order();\n"
+#~ "      conversation.begin();\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void addLineItem(Product product, int quantity) {\n"
+#~ "      order.add(new LineItem(product, quantity));\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public void saveOrder(Order order) {\n"
+#~ "      em.persist(order);\n"
+#~ "      conversation.end();\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Remove\n"
+#~ "   public void destroy() {}\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@ConversationScoped @Stateful\n"
+#~ "public class OrderBuilder {\n"
+#~ "\n"
+#~ "    private Order order;\n"
+#~ "    private @Current Conversation conversation;\n"
+#~ "    private @PersistenceContext(type=EXTENDED) EntityManager em;\n"
+#~ "    \n"
+#~ "    @Produces public Order getOrder() {\n"
+#~ "        return order;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "    public Order createOrder() {\n"
+#~ "        order = new Order();\n"
+#~ "        conversation.begin();\n"
+#~ "        return order;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void addLineItem(Product product, int quantity) {\n"
+#~ "        order.add( new LineItem(product, quantity) );\n"
+#~ "    }\n"
+#~ "\n"
+#~ "    public void saveOrder(Order order) {\n"
+#~ "        em.persist(order);\n"
+#~ "        conversation.end();\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    @Remove\n"
+#~ "    public void destroy() {}\n"
+#~ "    \n"
+#~ "}"
+
+#~ msgid ""
+#~ "<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</"
+#~ "a>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</"
+#~ "a>]]>"
+
+#~ msgid "conversation.setTimeout(timeoutInMillis);"
+#~ msgstr "conversation.setTimeout(timeoutInMillis);"
+
+#~ msgid "<![CDATA[public class Calculator { ... }]]>"
+#~ msgstr "<![CDATA[public class Calculator { ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
+#~ msgstr "<![CDATA[@New Calculator calculator;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ConversationScoped\n"
+#~ "public class Calculator { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ConversationScoped\n"
+#~ "public class Calculator { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class PaymentCalc {\n"
+#~ "   @Inject Calculator calculator;\n"
+#~ "   @Inject @New Calculator newCalculator;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class PaymentCalc {\n"
+#~ "\n"
+#~ "    @Current Calculator calculator;\n"
+#~ "    @New Calculator newCalculator;\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "holds state associated with a particular web browser tab in a JSF "
 #~ "application."
 #~ msgstr ""

Modified: doc/trunk/reference/it-IT/specialization.po
===================================================================
--- doc/trunk/reference/it-IT/specialization.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/specialization.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-05 00:30+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: specialization.xml:5
 #, no-c-format
 msgid "Specialization, inheritance and alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:7
 #, no-c-format
 msgid ""
 "When you first start developing with CDI, you'll likely be dealing only with "
@@ -35,7 +33,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:16
 #, no-c-format
 msgid ""
 "The CDI specification recognizes two distinct scenarios in which one bean "
@@ -43,7 +40,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:23
 #, no-c-format
 msgid ""
 "The second bean <emphasis>specializes</emphasis> the first bean in certain "
@@ -52,7 +48,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:29
 #, no-c-format
 msgid ""
 "The second bean is simply reusing the Java implementation, and otherwise "
@@ -61,7 +56,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:37
 #, no-c-format
 msgid ""
 "The second case is the default assumed by CDI. It's possible to have two "
@@ -71,7 +65,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:43
 #, no-c-format
 msgid ""
 "The first case is the exception, and also requires more care. In any given "
@@ -83,13 +76,11 @@
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:51
 #, no-c-format
 msgid "Using alternative stereotypes"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:53
 #, fuzzy, no-c-format
 msgid ""
 "CDI lets you <emphasis>override</emphasis> the implementation of a bean type "
@@ -103,23 +94,7 @@
 "un'implementazione di un API <literal>PaymentProcessor</literal> in "
 "produzione:"
 
-#. Tag: programlisting
-#: specialization.xml:59
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DefaultPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless\n"
-"public class CreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:61
 #, fuzzy, no-c-format
 msgid ""
 "But in our staging environment, we don't really want to submit payments to "
@@ -129,46 +104,12 @@
 "Ma in quest'ambiente di prova si procede con l'override dell'implementazione "
 "di <literal>PaymentProcessor</literal> con un Web Bean differente:"
 
-#. Tag: programlisting
-#: specialization.xml:66
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless\n"
-"public class CreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:68
 #, no-c-format
-msgid "<para>or</para>"
+msgid "or"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:70
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      extends DefaultPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@Stateless @Staging @Specializes\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        extends CreditCardPaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:72
 #, no-c-format
 msgid ""
 "We've already seen how we can enable this alternative by listing its class "
@@ -176,7 +117,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:77
 #, no-c-format
 msgid ""
 "But suppose we have many alternatives in the staging environment. It would "
@@ -186,67 +126,21 @@
 "this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:84
-#, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Staging {}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:86
 #, no-c-format
 msgid ""
 "Then we replace the <literal>@Alternative</literal> annotation on our bean "
 "with <literal>@Staging</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:90
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Staging\n"
-"public class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless @Staging\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:92
 #, no-c-format
 msgid ""
 "Finally, we activate the <literal>@Staging</literal> stereotype in the "
 "<literal>beans.xml</literal> descriptor:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:96
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <stereotype>org.mycompany.myapp.Staging</stereotype>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:98
 #, no-c-format
 msgid ""
 "Now, no matter how many staging beans we have, they will all be enabled at "
@@ -254,13 +148,11 @@
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:105
 #, no-c-format
 msgid "A minor problem with alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:107
 #, no-c-format
 msgid ""
 "When we enable an alternative, does that mean the default implementation is "
@@ -269,15 +161,7 @@
 "not, you could still inject the default implementation."
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:113
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @LargeTransaction PaymentProcessor paymentProcessor;]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:115
 #, no-c-format
 msgid ""
 "So we haven't completely replaced the default implementation in this "
@@ -290,7 +174,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "CDI provides a special feature, called <emphasis>specialization</emphasis>, "
@@ -305,13 +188,11 @@
 "che fornisce. "
 
 #. Tag: title
-#: specialization.xml:132
 #, no-c-format
 msgid "Using specialization"
 msgstr "Usare la specializzazione"
 
 #. Tag: para
-#: specialization.xml:134
 #, no-c-format
 msgid ""
 "When the goal is to replace one bean implementation with a second, to help "
@@ -319,13 +200,11 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:141
 #, no-c-format
 msgid "directly extend the bean class of the second bean, or"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:146
 #, no-c-format
 msgid ""
 "directly override the producer method, in the case that the second bean is a "
@@ -333,7 +212,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:152
 #, fuzzy, no-c-format
 msgid ""
 "explicitly declare that it <emphasis>specializes</emphasis> the second bean:"
@@ -341,24 +219,7 @@
 "Si dice che il Web Bean a più alta priorità <emphasis>specializza</emphasis> "
 "la sua superclasse."
 
-#. Tag: programlisting
-#: specialization.xml:154
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Specializes\n"
-"public class MockCreditCardPaymentProcessor \n"
-"      extends CreditCardPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@Stateless @Staging @Specializes\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        extends CreditCardPaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:156
 #, no-c-format
 msgid ""
 "When an enabled bean specializes another bean, the other bean is never "
@@ -367,7 +228,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:161
 #, no-c-format
 msgid ""
 "So why does specialization work, and what does it have to do with "
@@ -375,7 +235,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:165
 #, no-c-format
 msgid ""
 "Since we're informing the container that our alternative bean is meant to "
@@ -387,7 +246,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:172
 #, no-c-format
 msgid ""
 "Furthermore, if the default implementation declares a bean EL name using "
@@ -395,6 +253,75 @@
 "alternative bean."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DefaultPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      extends DefaultPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Stateless @Staging @Specializes\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        extends CreditCardPaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Staging\n"
+#~ "public class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless @Staging\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative @Specializes\n"
+#~ "public class MockCreditCardPaymentProcessor \n"
+#~ "      extends CreditCardPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Stateless @Staging @Specializes\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        extends CreditCardPaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
 #~ msgid "Specialization"
 #~ msgstr "Specializzazione"
 

Modified: doc/trunk/reference/it-IT/stereotypes.po
===================================================================
--- doc/trunk/reference/it-IT/stereotypes.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/stereotypes.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-25 22:17+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,19 +14,16 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: stereotypes.xml:5
 #, no-c-format
 msgid "Stereotypes"
 msgstr "Stereotipi"
 
 #. Tag: para
-#: stereotypes.xml:7
 #, no-c-format
 msgid "The CDI specification defines a stereotype as follows:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:11
 #, fuzzy, no-c-format
 msgid ""
 "In many systems, use of architectural patterns produces a set of recurring "
@@ -40,31 +37,26 @@
 "Bean con tale ruolo come parte principale."
 
 #. Tag: para
-#: stereotypes.xml:17
 #, no-c-format
 msgid "A stereotype encapsulates any combination of:"
 msgstr "Uno stereotipo incapsula qualsiasi combinazione di:"
 
 #. Tag: para
-#: stereotypes.xml:21
 #, fuzzy, no-c-format
 msgid "a default scope, and"
 msgstr "un tipo di scope di default,"
 
 #. Tag: para
-#: stereotypes.xml:24
 #, fuzzy, no-c-format
 msgid "a set of interceptor bindings."
 msgstr "un set di annotazioni di interceptor binding."
 
 #. Tag: para
-#: stereotypes.xml:28
 #, no-c-format
 msgid "A stereotype may also specify that:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:34
 #, fuzzy, no-c-format
 msgid "all beans with the stereotype have defaulted bean EL names, or that"
 msgstr ""
@@ -72,13 +64,11 @@
 "stereotipo abbiano nomi Web Bean di default."
 
 #. Tag: para
-#: stereotypes.xml:37
 #, no-c-format
 msgid "all beans with the stereotype are alternatives."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:41
 #, no-c-format
 msgid ""
 "A bean may declare zero, one or multiple stereotypes. Stereotype annotations "
@@ -86,7 +76,6 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype is an annotation, annotated <literal>@Stereotype</literal>, "
@@ -96,39 +85,12 @@
 "Uno stereotipo è un tipo di annotazione Java. Questo stereotipo identifica "
 "le classi di azione in alcuni framework MVC:"
 
-#. Tag: programlisting
-#: stereotypes.xml:53
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"...\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:55
 #, fuzzy, no-c-format
 msgid "We use the stereotype by applying the annotation to a bean."
 msgstr "Lo stereotipo viene impiegato applicando l'annotazione al Web Bean."
 
-#. Tag: programlisting
-#: stereotypes.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-
 #. Tag: para
-#: stereotypes.xml:61
 #, no-c-format
 msgid ""
 "Of course, we need to apply some other annotations to our stereotype or else "
@@ -136,13 +98,11 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:66
 #, fuzzy, no-c-format
 msgid "Default scope for a stereotype"
 msgstr "Scope di default e tipo di deploy per uno stereotipo"
 
 #. Tag: para
-#: stereotypes.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype may specify a default scope for beans annotated with the "
@@ -151,41 +111,14 @@
 "Uno stereotipo può anche specificare che tutti i Web Beans con tale "
 "stereotipo abbiano nomi Web Bean di default."
 
-#. Tag: programlisting
-#: stereotypes.xml:72
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:74
 #, fuzzy, no-c-format
 msgid "A particular action may still override this default if necessary:"
 msgstr ""
 "Certamente una particolare azione può comunque fare l'override di questi "
 "valore se necessario:"
 
-#. Tag: programlisting
-#: stereotypes.xml:78
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Dependent @Action \n"
-"public class DependentScopedLoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Dependent @Mock @Action \n"
-"public class MockLoginAction { ... }]]>"
-
 #. Tag: para
-#: stereotypes.xml:80
 #, no-c-format
 msgid ""
 "Naturally, overriding a single default isn't much use. But remember, "
@@ -193,13 +126,11 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:88
 #, no-c-format
 msgid "Interceptor bindings for stereotypes"
 msgstr "Interceptor binding per gli stereotipi"
 
 #. Tag: para
-#: stereotypes.xml:90
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype may specify a set of interceptor bindings to be inherited by "
@@ -208,29 +139,7 @@
 "Uno stereotipo può specificare un set di interceptor binding da ereditare da "
 "tutti i Web Bean con quello stereotipo."
 
-#. Tag: programlisting
-#: stereotypes.xml:94
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@WebTier\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "This helps us get technical concerns, like transactions and security, even "
@@ -240,13 +149,11 @@
 "business!"
 
 #. Tag: title
-#: stereotypes.xml:103
 #, no-c-format
 msgid "Name defaulting with stereotypes"
 msgstr "Assegnare nomi di default con gli stereotipi"
 
 #. Tag: para
-#: stereotypes.xml:105
 #, fuzzy, no-c-format
 msgid ""
 "We can specify that all beans with a certain stereotype have a defaulted EL "
@@ -259,31 +166,7 @@
 "d'uso perfetto per questa funzionalità. Basta aggiungere un'annotazione "
 "vuota <literal>@Named</literal>:"
 
-#. Tag: programlisting
-#: stereotypes.xml:110
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@WebTier\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:112
 #, fuzzy, no-c-format
 msgid ""
 "Now, the <literal>LoginAction</literal> bean will have the defaulted name "
@@ -292,13 +175,11 @@
 "Ora, <literal>LoginAction</literal> avrà nome <literal>loginAction</literal>."
 
 #. Tag: title
-#: stereotypes.xml:119
 #, fuzzy, no-c-format
 msgid "Alternative stereotypes"
 msgstr "Stereotipi standard"
 
 #. Tag: para
-#: stereotypes.xml:121
 #, no-c-format
 msgid ""
 "A stereotype can indicate that all beans to which it is applied are "
@@ -306,47 +187,19 @@
 "emphasis> lets us classify beans by deployment scenario."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:126
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Mock {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:128
 #, no-c-format
 msgid ""
 "We can apply an alternative stereotype to a whole set of beans, and activate "
 "them all with one line of code in <literal>beans.xml</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:133
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Mock\n"
-"public class MockLoginAction extends LoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-
 #. Tag: title
-#: stereotypes.xml:141
 #, fuzzy, no-c-format
 msgid "Stereotype stacking"
 msgstr "Stereotipi"
 
 #. Tag: para
-#: stereotypes.xml:143
 #, no-c-format
 msgid ""
 "This may blow your mind a bit, but stereotypes may declare other "
@@ -357,39 +210,18 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:150
 #, no-c-format
 msgid ""
 "Here's an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:155
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Auditable\n"
-"@Action\n"
-"@Stereotype\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface AuditableAction {}]]>"
-msgstr ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {} ]]>"
-
 #. Tag: title
-#: stereotypes.xml:160
 #, fuzzy, no-c-format
 msgid "Built-in stereotypes"
 msgstr "Stereotipi standard"
 
 #. Tag: para
-#: stereotypes.xml:162
 #, fuzzy, no-c-format
 msgid ""
 "We've already met two standard stereotypes defined by the CDI specification: "
@@ -399,33 +231,13 @@
 "<literal>@Interceptor</literal> e <literal>@Decorator</literal>."
 
 #. Tag: para
-#: stereotypes.xml:167
 #, no-c-format
 msgid ""
 "CDI defines one further standard stereotype, <literal>@Model</literal>, "
 "which is expected to be used frequently in web applications:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:172
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {}]]>"
-msgstr ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {} ]]>"
-
 #. Tag: para
-#: stereotypes.xml:174
 #, fuzzy, no-c-format
 msgid ""
 "Instead of using JSF managed beans, just annotate a bean <literal>@Model</"
@@ -435,6 +247,140 @@
 "da JSF, basta annotare un Web Bean con <literal>@Model</literal>, e usarlo "
 "direttamente nelle pagine JSF."
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "...\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Dependent @Action \n"
+#~ "public class DependentScopedLoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Dependent @Mock @Action \n"
+#~ "public class MockLoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@WebTier\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Named\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Named\n"
+#~ "@WebTier\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Mock {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Mock\n"
+#~ "public class MockLoginAction extends LoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Auditable\n"
+#~ "@Action\n"
+#~ "@Stereotype\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface AuditableAction {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {} ]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {} ]]>"
+
 #~ msgid "According to the Web Beans specification:"
 #~ msgstr "Secondo la specifica Web Beans:"
 

Modified: doc/trunk/reference/it-IT/viewlayers.po
===================================================================
--- doc/trunk/reference/it-IT/viewlayers.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/viewlayers.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-05-10 12:43+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -15,19 +15,16 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: viewlayers.xml:5
 #, no-c-format
 msgid "Alternative view layers"
 msgstr "Layer di vista alternativi"
 
 #. Tag: title
-#: viewlayers.xml:8
 #, no-c-format
 msgid "Wicket CDI integration"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:10
 #, no-c-format
 msgid ""
 "Weld provides integration between the Apache Wicket web framework and CDI. "
@@ -37,7 +34,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:16
 #, no-c-format
 msgid ""
 "This section describes some of the utilities provided by the Wicket "
@@ -45,13 +41,11 @@
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:22
 #, no-c-format
 msgid "The <literal>WebApplication</literal> class"
 msgstr "La classe <literal>WebApplication</literal>"
 
 #. Tag: para
-#: viewlayers.xml:24
 #, fuzzy, no-c-format
 msgid ""
 "Each wicket application must have a <literal>WebApplication</literal> "
@@ -65,7 +59,6 @@
 "WebBeansApplication</literal>."
 
 #. Tag: para
-#: viewlayers.xml:31
 #, fuzzy, no-c-format
 msgid ""
 "If you would prefer not to subclass <literal>WeldApplication</literal>, you "
@@ -79,37 +72,16 @@
 "<literal>WebBeansApplication</literal> illustra questo."
 
 #. Tag: para
-#: viewlayers.xml:38
 #, no-c-format
 msgid "For example:"
 msgstr "Per esempio:"
 
-#. Tag: programlisting
-#: viewlayers.xml:41
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class SampleApplication extends WeldApplication {\n"
-"   @Override\n"
-"   public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class SampleApplication extends WebBeansApplication {\n"
-"   @Override\n"
-"   public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-
 #. Tag: title
-#: viewlayers.xml:45
 #, no-c-format
 msgid "Conversations with Wicket"
 msgstr "Conversazioni con Wicket"
 
 #. Tag: para
-#: viewlayers.xml:46
 #, no-c-format
 msgid ""
 "Wicket can also take advantage of the conversation scope from CDI, provided "
@@ -117,7 +89,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:52
 #, no-c-format
 msgid ""
 "Setting up the conversation context at the beginning of a Wicket request, "
@@ -127,7 +98,6 @@
 "distruggerlo più avanti"
 
 #. Tag: para
-#: viewlayers.xml:58
 #, no-c-format
 msgid ""
 "Storing the id of any long-running conversation in Wicket's metadata when "
@@ -137,7 +107,6 @@
 "quando è completa la risposta della pagina"
 
 #. Tag: para
-#: viewlayers.xml:64
 #, no-c-format
 msgid ""
 "Activating the correct long-running conversation based upon which page is "
@@ -147,7 +116,6 @@
 "acceduta"
 
 #. Tag: para
-#: viewlayers.xml:69
 #, no-c-format
 msgid ""
 "Propagating the conversation context for any long-running conversation to "
@@ -157,13 +125,11 @@
 "nelle nuove pagine"
 
 #. Tag: title
-#: viewlayers.xml:76
 #, no-c-format
 msgid "Starting and stopping conversations in Wicket"
 msgstr "Avviare ed interrompere le conversazioni in Wicket"
 
 #. Tag: para
-#: viewlayers.xml:77
 #, fuzzy, no-c-format
 msgid ""
 "As in JSF applications, a conversation <emphasis>always</emphasis> exists "
@@ -182,27 +148,12 @@
 "invocando <literal>conversation.begin()</literal>. Similmente le "
 "conversazioni vengono terminate con <literal>conversation.end()</literal>."
 
-#. Tag: programlisting
-#: viewlayers.xml:86
-#, no-c-format
-msgid ""
-"<![CDATA[private @Inject Conversation conversation;\n"
-"...\n"
-"// begin a conversation\n"
-"conversation.begin();\n"
-"...\n"
-"// end a conversation\n"
-"conversation.end();]]>"
-msgstr ""
-
 #. Tag: title
-#: viewlayers.xml:91
 #, no-c-format
 msgid "Long running conversation propagation in Wicket"
 msgstr "Propagazione di conversazioni long running in Wicket"
 
 #. Tag: para
-#: viewlayers.xml:92
 #, fuzzy, no-c-format
 msgid ""
 "When a conversation is marked as long-running, the id of that conversation "
@@ -231,6 +182,22 @@
 "conversazione verrà propagato attraverso un parametro di richiesta, e poi "
 "memorizzato nei metadati della pagina dopo il redirect."
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class SampleApplication extends WeldApplication {\n"
+#~ "   @Override\n"
+#~ "   public Class getHomePage() {\n"
+#~ "      return HomePage.class;\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class SampleApplication extends WebBeansApplication {\n"
+#~ "   @Override\n"
+#~ "   public Class getHomePage() {\n"
+#~ "      return HomePage.class;\n"
+#~ "   }\n"
+#~ "}]]>"
+
 #~ msgid "Using Web Beans with Wicket"
 #~ msgstr "Usare Web Beans con Wicket"
 

Modified: doc/trunk/reference/it-IT/weldexamples.po
===================================================================
--- doc/trunk/reference/it-IT/weldexamples.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/weldexamples.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-11-23 21:23+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: weldexamples.xml:5
 #, no-c-format
 msgid "Diving into the Weld examples"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:7
 #, no-c-format
 msgid ""
 "It's time to pull the covers back and dive into the internals of Weld "
@@ -29,13 +27,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:13
 #, no-c-format
 msgid "The numberguess example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:15
 #, no-c-format
 msgid ""
 "In the numberguess application you get 10 attempts to guess a number between "
@@ -44,16 +40,14 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:20
 #, no-c-format
 msgid ""
 "The numberguess example is comprised of a number of beans, configuration "
-"files and Facelets (JSF) views, packaged as a WAR module. Let's start by "
+"files and Facelets (JSF) views, packaged as a war module. Let's start by "
 "examining the configuration files."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:25
 #, no-c-format
 msgid ""
 "All the configuration files for this example are located in <literal>WEB-INF/"
@@ -64,28 +58,7 @@
 "to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:33
-#, no-c-format
-msgid ""
-"<![CDATA[<faces-config version=\"2.0\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd\">\n"
-"</faces-config>]]>"
-msgstr ""
-"<![CDATA[<faces-config version=\"2.0\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd\">\n"
-"</faces-config>]]>"
-
 #. Tag: para
-#: weldexamples.xml:35
 #, no-c-format
 msgid ""
 "There's also an empty <literal>beans.xml</literal> file, which tells the "
@@ -94,241 +67,120 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:40
 #, no-c-format
 msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:42
+#. Tag: para
 #, no-c-format
+msgid "Enable and initialize the JSF servlet"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"faces.servlet\" coords=\"10\"/> "
-"<area id=\"faces.servlet.mapping\" coords=\"16\"/> <area id=\"faces.default."
-"suffix\" coords=\"21\"/> <area id=\"session.timeout\" coords=\"26\"/> </"
-"areaspec> <programlisting role=\"XML\"><![CDATA[<web-app version=\"2.5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n"
-"   \n"
-"   <display-name>weld-jsf-numberguess-war</display-name>\n"
-"   <description>Weld JSF numberguess example (WAR)</description>\n"
-"\n"
-"   <servlet>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>\n"
-"      <load-on-startup>1</load-on-startup>\n"
-"   </servlet>\n"
-"\n"
-"   <servlet-mapping>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <url-pattern>*.jsf</url-pattern>\n"
-"   </servlet-mapping>\n"
-"   \n"
-"   <context-param>\n"
-"      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>\n"
-"      <param-value>.xhtml</param-value>\n"
-"   </context-param>\n"
-"\n"
-"   <session-config>\n"
-"      <session-timeout>10</session-timeout>\n"
-"   </session-config>\n"
-"\n"
-"</web-app>]]></programlisting> <calloutlist> <callout arearefs=\"faces."
-"servlet\"> <para> Enable and initialize the JSF servlet </para> </callout> "
-"<callout arearefs=\"faces.servlet.mapping\"> <para> Configure requests for "
-"URLs ending in <literal>.jsf</literal> to be handled by JSF </para> </"
-"callout> <callout arearefs=\"faces.default.suffix\"> <para> Tell JSF that we "
-"will be giving our JSF views (Facelets templates) an extension of <literal>."
-"xhtml</literal> </para> </callout> <callout arearefs=\"session.timeout\"> "
-"<para> Configure a session timeout of 10 minutes </para> </callout> </"
-"calloutlist> </programlistingco> <note> <para> This demo uses JSF 2 as the "
-"view framework, but you can use Weld with any servlet-based web framework, "
-"such as JSF 1.2 or Wicket. </para> </note> <para> Let's take a look at the "
-"main JSF view, <literal>src/main/webapp/home.xhtml</literal>. </para> "
-"<programlistingco> <areaspec> <area id=\"template\" coords=\"8\"/> <area id="
-"\"statusMessages\" coords=\"12\"/> <area id=\"instructions\" coords=\"20\"/> "
-"<area id=\"guess\" coords=\"27\"/> <area id=\"validator\" coords=\"29\"/> "
-"<area id=\"submit\" coords=\"30\"/> </areaspec> <programlisting role=\"XML"
-"\"><![CDATA[<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN"
-"\"\n"
-"   \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
-"<html xmlns=\"http://www.w3.org/1999/xhtml\"\n"
-"   xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n"
-"   xmlns:h=\"http://java.sun.com/jsf/html\"\n"
-"   xmlns:f=\"http://java.sun.com/jsf/core\">\n"
-"\n"
-"   <ui:composition template=\"/template.xhtml\">\n"
-"      <ui:define name=\"content\">\n"
-"         <h1>Guess a number...</h1>\n"
-"         <h:form id=\"numberGuess\">\n"
-"            <div style=\"color: red\">\n"
-"               <h:messages id=\"messages\" globalOnly=\"false\"/>\n"
-"               <h:outputText id=\"Higher\" value=\"Higher!\"\n"
-"                  rendered=\"#{game.number gt game.guess and game.guess ne 0}"
-"\"/>\n"
-"               <h:outputText id=\"Lower\" value=\"Lower!\"\n"
-"                  rendered=\"#{game.number lt game.guess and game.guess ne 0}"
-"\"/>\n"
-"            </div>\n"
-"    \n"
-"            <div>\n"
-"               I'm thinking of a number between #{game.smallest} and #{game."
-"biggest}.\n"
-"               You have #{game.remainingGuesses} guesses remaining.\n"
-"            </div>\n"
-"       \n"
-"            <div>\n"
-"               Your guess: \n"
-"               <h:inputText id=\"inputGuess\" value=\"#{game.guess}\"\n"
-"                  size=\"3\" required=\"true\" disabled=\"#{game.number eq "
-"game.guess}\"\n"
-"                  validator=\"#{game.validateNumberRange}\"/>\n"
-"               <h:commandButton id=\"guessButton\" value=\"Guess\" \n"
-"                  action=\"#{game.check}\" disabled=\"#{game.number eq game."
-"guess}\"/>\n"
-"            </div>\n"
-"            <div>\n"
-"              <h:commandButton id=\"restartButton\" value=\"Reset\" action="
-"\"#{game.reset}\" immediate=\"true\"/>\n"
-"            </div>\n"
-"         </h:form>\n"
-"      </ui:define>\n"
-"   </ui:composition>\n"
-"</html>]]></programlisting> <calloutlist> <callout arearefs=\"template\"> "
-"<para> Facelets is the built-in templating language for JSF. Here we are "
-"wrapping our page in a template which defines the layout. </para> </callout> "
-"<callout arearefs=\"statusMessages\"> <para> There are a number of messages "
-"which can be sent to the user, \"Higher!\", \"Lower!\" and \"Correct!\" </"
-"para> </callout> <callout arearefs=\"instructions\"> <para> As the user "
-"guesses, the range of numbers they can guess gets smaller - this sentence "
-"changes to make sure they know the number range of a valid guess. </para> </"
-"callout> <callout arearefs=\"guess\"> <para> This input field is bound to a "
-"bean property using a value expression. </para> </callout> <callout arearefs="
-"\"validator\"> <para> A validator binding is used to make sure the user "
-"doesn't accidentally input a number outside of the range in which they can "
-"guess - if the validator wasn't here, the user might use up a guess on an "
-"out of bounds number. </para> </callout> <callout arearefs=\"submit\"> "
-"<para> And, of course, there must be a way for the user to send their guess "
-"to the server. Here we bind to an action method on the bean. </para> </"
-"callout> </calloutlist> </programlistingco>"
+"Configure requests for URLs ending in <literal>.jsf</literal> to be handled "
+"by JSF"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:142
 #, no-c-format
 msgid ""
-"The example exists of 4 classes, the first two of which are qualifiers. "
-"First, there is the <literal>@Random</literal> qualifier, used for injecting "
-"a random number:"
+"Tell JSF that we will be giving our JSF views (Facelets templates) an "
+"extension of <literal>.xhtml</literal>"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:147
+#. Tag: para
 #, no-c-format
+msgid "Configure a session timeout of 10 minutes"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Random {}]]>"
+"This demo uses JSF 2 as the view framework, but you can use Weld with any "
+"servlet-based web framework, such as JSF 1.2 or Wicket."
 msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Random {}]]>"
 
 #. Tag: para
-#: weldexamples.xml:149
 #, no-c-format
 msgid ""
-"There is also the <literal>@MaxNumber</literal> qualifier, used for "
-"injecting the maximum number that can be injected:"
+"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
+"literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:154
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface MaxNumber {}\n"
-"]]>"
+"Facelets is the built-in templating language for JSF. Here we are wrapping "
+"our page in a template which defines the layout."
 msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Random {}]]>"
 
 #. Tag: para
-#: weldexamples.xml:156
 #, no-c-format
 msgid ""
-"The application-scoped <literal>Generator</literal> class is responsible for "
-"creating the random number, via a producer method. It also exposes the "
-"maximum possible number via a producer method:"
+"There are a number of messages which can be sent to the user, \"Higher!\", "
+"\"Lower!\" and \"Correct!\""
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:161
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class Generator implements Serializable {\n"
-"\n"
-"   private java.util.Random random = new java.util.Random(System."
-"currentTimeMillis());\n"
-"   \n"
-"   private int maxNumber = 100;\n"
-"   \n"
-"   java.util.Random getRandom() {\n"
-"      return random;\n"
-"   }\n"
-"   \n"
-"   @Produces @Random int next() { \n"
-"      return getRandom().nextInt(maxNumber); \n"
-"   }\n"
-"   \n"
-"   @Produces @MaxNumber int getMaxNumber() {\n"
-"      return maxNumber;\n"
-"   }\n"
-"\n"
-"}]]>"
+"As the user guesses, the range of numbers they can guess gets smaller - this "
+"sentence changes to make sure they know the number range of a valid guess."
 msgstr ""
-"<![CDATA[@ApplicationScoped\n"
-"public class Generator implements Serializable {\n"
-"\n"
-"   private java.util.Random random = new java.util.Random(System."
-"currentTimeMillis());\n"
-"   \n"
-"   private int maxNumber = 100;\n"
-"   \n"
-"   java.util.Random getRandom() {\n"
-"      return random;\n"
-"   }\n"
-"   \n"
-"   @Produces @Random int next() { \n"
-"      return getRandom().nextInt(maxNumber); \n"
-"   }\n"
-"   \n"
-"   @Produces @MaxNumber int getMaxNumber() {\n"
-"      return maxNumber;\n"
-"   }\n"
-"\n"
-"}]]>"
 
 #. Tag: para
-#: weldexamples.xml:163
 #, no-c-format
+msgid "This input field is bound to a bean property using a value expression."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
+"A validator binding is used to make sure the user doesn't accidentally input "
+"a number outside of the range in which they can guess - if the validator "
+"wasn't here, the user might use up a guess on an out of bounds number."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"And, of course, there must be a way for the user to send their guess to the "
+"server. Here we bind to an action method on the bean."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The example exists of 4 classes, the first two of which are qualifiers. "
+"First, there is the <literal>@Random</literal> qualifier, used for injecting "
+"a random number:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"There is also the <literal>@MaxNumber</literal> qualifier, used for "
+"injecting the maximum number that can be injected:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The application-scoped <literal>Generator</literal> class is responsible for "
+"creating the random number, via a producer method. It also exposes the "
+"maximum possible number via a producer method:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The <literal>Generator</literal> is application scoped, so we don't get a "
 "different random each time."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:168
 #, no-c-format
 msgid ""
 "The package declaration and imports have been excluded from these listings. "
@@ -336,7 +188,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:174
 #, no-c-format
 msgid ""
 "The final bean in the application is the session-scoped <literal>Game</"
@@ -349,7 +200,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:182
 #, no-c-format
 msgid ""
 "You'll notice that we've also added the <literal>@Named</literal> annotation "
@@ -357,204 +207,32 @@
 "bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:187
-#, no-c-format
-msgid ""
-"<![CDATA[@Named\n"
-"@SessionScoped\n"
-"public class Game implements Serializable {\n"
-"\n"
-"   private int number;\n"
-"   private int guess;\n"
-"   private int smallest;\n"
-"   private int biggest;\n"
-"   private int remainingGuesses;\n"
-"\n"
-"   @Inject @MaxNumber private int maxNumber;\n"
-"   @Inject @Random Instance<Integer> randomNumber;\n"
-"   \n"
-"   public Game() {}\n"
-"   \n"
-"   public void check() {\n"
-"      if (guess > number) {\n"
-"         biggest = guess - 1;\n"
-"      }\n"
-"      else if (guess < number) {\n"
-"         smallest = guess + 1;\n"
-"      }\n"
-"      else if (guess == number) {\n"
-"         FacesContext.getCurrentInstance().addMessage(null, new FacesMessage"
-"(\"Correct!\"));\n"
-"      }\n"
-"      remainingGuesses--;\n"
-"   }\n"
-"   \n"
-"   @PostConstruct\n"
-"   public void reset() {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = randomNumber.get();\n"
-"   }\n"
-"   \n"
-"   public void validateNumberRange(FacesContext context,  UIComponent "
-"toValidate, Object value) {\n"
-"      if (remainingGuesses <= 0) {\n"
-"         FacesMessage message = new FacesMessage(\"No guesses left!\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"         return;\n"
-"      }\n"
-"      int input = (Integer) value;\n"
-"\n"
-"      if (input < smallest || input > biggest) {\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"\n"
-"         FacesMessage message = new FacesMessage(\"Invalid guess\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"      }\n"
-"   }\n"
-"\n"
-"   public int getNumber() {\n"
-"      return number;\n"
-"   }\n"
-"   \n"
-"   public int getGuess() {\n"
-"      return guess;\n"
-"   }\n"
-"   \n"
-"   public void setGuess(int guess) {\n"
-"      this.guess = guess;\n"
-"   }\n"
-"   \n"
-"   public int getSmallest() {\n"
-"      return smallest;\n"
-"   }\n"
-"   \n"
-"   public int getBiggest() {\n"
-"      return biggest;\n"
-"   }\n"
-"   \n"
-"   public int getRemainingGuesses() {\n"
-"      return remainingGuesses;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named\n"
-"@SessionScoped\n"
-"public class Game implements Serializable {\n"
-"\n"
-"   private int number;\n"
-"   private int guess;\n"
-"   private int smallest;\n"
-"   private int biggest;\n"
-"   private int remainingGuesses;\n"
-"\n"
-"   @Inject @MaxNumber private int maxNumber;\n"
-"   @Inject @Random Instance<Integer> randomNumber;\n"
-"   \n"
-"   public Game() {}\n"
-"   \n"
-"   public void check() {\n"
-"      if (guess > number) {\n"
-"         biggest = guess - 1;\n"
-"      }\n"
-"      else if (guess < number) {\n"
-"         smallest = guess + 1;\n"
-"      }\n"
-"      else if (guess == number) {\n"
-"         FacesContext.getCurrentInstance().addMessage(null, new FacesMessage"
-"(\"Correct!\"));\n"
-"      }\n"
-"      remainingGuesses--;\n"
-"   }\n"
-"   \n"
-"   @PostConstruct\n"
-"   public void reset() {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = randomNumber.get();\n"
-"   }\n"
-"   \n"
-"   public void validateNumberRange(FacesContext context,  UIComponent "
-"toValidate, Object value) {\n"
-"      if (remainingGuesses <= 0) {\n"
-"         FacesMessage message = new FacesMessage(\"No guesses left!\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"         return;\n"
-"      }\n"
-"      int input = (Integer) value;\n"
-"\n"
-"      if (input < smallest || input > biggest) {\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"\n"
-"         FacesMessage message = new FacesMessage(\"Invalid guess\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"      }\n"
-"   }\n"
-"\n"
-"   public int getNumber() {\n"
-"      return number;\n"
-"   }\n"
-"   \n"
-"   public int getGuess() {\n"
-"      return guess;\n"
-"   }\n"
-"   \n"
-"   public void setGuess(int guess) {\n"
-"      this.guess = guess;\n"
-"   }\n"
-"   \n"
-"   public int getSmallest() {\n"
-"      return smallest;\n"
-"   }\n"
-"   \n"
-"   public int getBiggest() {\n"
-"      return biggest;\n"
-"   }\n"
-"   \n"
-"   public int getRemainingGuesses() {\n"
-"      return remainingGuesses;\n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: title
-#: weldexamples.xml:190
 #, no-c-format
 msgid "The numberguess example in Apache Tomcat or Jetty"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:192
 #, no-c-format
 msgid ""
 "A couple of modifications must be made to the numberguess artifact in order "
 "to deploy it to Tomcat or Jetty. First, Weld must be deployed as a Web "
 "Application library under <literal>WEB-INF/lib</literal> since the servlet "
 "container does not provide the CDI services. For your convenience we provide "
-"a single JAR suitable for running Weld in any servlet container (including "
+"a single jar suitable for running Weld in any servlet container (including "
 "Jetty), <literal>weld-servlet.jar</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:200
 #, no-c-format
 msgid ""
-"You must also include the JARs for JSF, EL, and the common annotations "
+"You must also include the jars for JSF, EL, and the common annotations "
 "(<literal>jsr250-api.jar</literal>), all of which are provided by the Java "
 "EE platform (a Java EE application server). Are you starting to appreciate "
 "why a Java EE platform is worth using?"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:207
 #, no-c-format
 msgid ""
 "Second, we need to explicitly specify the servlet listener in <literal>web."
@@ -562,22 +240,7 @@
 "The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:213
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-
 #. Tag: para
-#: weldexamples.xml:215
 #, no-c-format
 msgid ""
 "When Weld boots, it places the <literal>javax.enterprise.inject.spi."
@@ -588,13 +251,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:226
 #, no-c-format
 msgid "The numberguess example for Apache Wicket"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:227
 #, no-c-format
 msgid ""
 "Weld includes a number of portable extensions for JSR-299, including an "
@@ -604,7 +265,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:234
 #, no-c-format
 msgid ""
 "You may want to review the Wicket documentation at <ulink url=\"http://"
@@ -613,7 +273,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:241
 #, no-c-format
 msgid ""
 "Wicket is another environment that relies on the Weld servlet extension. The "
@@ -624,7 +283,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:249
 #, no-c-format
 msgid ""
 "We'll also be using the Eclipse IDE in these examples. Instructions are "
@@ -634,13 +292,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:257
 #, no-c-format
 msgid "Creating the Eclipse project"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:259
 #, no-c-format
 msgid ""
 "To use the Wicket example in Eclipse, you have one of two choices. You can "
@@ -652,17 +308,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:267
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -> Import... -> Maven Projects</"
-"emphasis>. Then, browse to the location of the Wicket numberguess example. "
-"You should see that Eclipse recognizes the existence of a Maven project."
+"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
+"Projects</emphasis>. Then, browse to the location of the Wicket numberguess "
+"example. You should see that Eclipse recognizes the existence of a Maven "
+"project."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:279
 #, no-c-format
 msgid ""
 "This will create a project in your workspace called <literal>weld-wicket-"
@@ -670,7 +325,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:283
 #, no-c-format
 msgid ""
 "You'll notice after importing, the project has a build error. That's because "
@@ -678,21 +332,24 @@
 "<emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> "
 "tab in the window that appears. In the form field labeled \"Active Maven "
 "Profiles (comma separated):\", type <literal>jetty</literal>. That will "
-"enable some extra dependencies that allow the project to compile. You're now "
-"ready to develop!"
+"enable some extra dependencies that allow the project to compile. "
+"Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven "
+"compile plugin when processing resources (recommended)\". That solves an "
+"incompatiblity between the m2eclipse plugin and the Maven enforcer plugin "
+"that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:292
 #, no-c-format
 msgid ""
-"You are also advised to uncheck the box \"Skip Maven compiler when "
-"processing resources\" in the Maven properties screen because of conflicts "
-"with the Maven enforcer plugin."
+"Be sure to uncheck the box \"Skip Maven compile plugin when processing "
+"resources (recommended)\" in the Maven properties screen or else the example "
+"might not run in Eclipse because beans.xml will be missing from the "
+"classpath! See the <ulink url=\"https://issues.sonatype.org/browse/"
+"MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:298
 #, no-c-format
 msgid ""
 "If you are not using the m2eclipse plugin, you have to follow different "
@@ -701,40 +358,26 @@
 "activated, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:304
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/wicket/numberguess\n"
-"mvn -Pjetty eclipse:eclipse]]>"
-msgstr ""
-"<![CDATA[$> cd examples/wicket/numberguess\n"
-"mvn -Pjetty eclipse:eclipse]]>"
-
 #. Tag: para
-#: weldexamples.xml:306
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -> Import... -> General -> "
-"Existing Projects into Workspace</emphasis>, select the root directory of "
-"the numberguess example, and click Finish. This will create a project in "
+"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
+"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
+"of the numberguess example, and click Finish. This will create a project in "
 "your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:318
 #, no-c-format
 msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:325
 #, no-c-format
 msgid "Running the example from Eclipse"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:327
 #, no-c-format
 msgid ""
 "This project follows the <literal>wicket-quickstart</literal> approach of "
@@ -749,13 +392,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:338
 #, no-c-format
 msgid "Running the example from the command line in JBoss AS or Tomcat"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:340
 #, no-c-format
 msgid ""
 "This example can also be deployed from the command line in a (similar to the "
@@ -765,26 +406,12 @@
 "run:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:346
-#, no-c-format
-msgid "<![CDATA[$> ant deploy]]>"
-msgstr "<![CDATA[$> ant deploy]]>"
-
 #. Tag: para
-#: weldexamples.xml:348
 #, no-c-format
 msgid "to deploy the example to JBoss AS, and:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:350
-#, no-c-format
-msgid "<![CDATA[$> ant tomcat.deploy]]>"
-msgstr "<![CDATA[$> ant tomcat.deploy]]>"
-
 #. Tag: para
-#: weldexamples.xml:352
 #, no-c-format
 msgid ""
 "to deploy the example to Tomcat. You can then access application at <ulink "
@@ -793,33 +420,23 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:357
 #, no-c-format
 msgid ""
 "Alternatively, you can run the application in place on an embedded Jetty "
 "container using the following Maven command:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:362
-#, no-c-format
-msgid "<![CDATA[$> mvn jetty:run -Pjetty]]>"
-msgstr "<![CDATA[$> mvn jetty:run -Pjetty]]>"
-
 #. Tag: para
-#: weldexamples.xml:364
 #, no-c-format
 msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:371
 #, no-c-format
 msgid "Understanding the code"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:373
 #, no-c-format
 msgid ""
 "The code in the wicket numberguess example is very similar to the JSF-based "
@@ -833,7 +450,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:382
 #, no-c-format
 msgid ""
 "The integration of Weld with Wicket takes advantage of the same qualifier "
@@ -843,13 +459,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:388
 #, no-c-format
 msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:394
 #, no-c-format
 msgid ""
 "Each wicket application must have a <literal>WeldApplication</literal> "
@@ -857,24 +471,7 @@
 "<literal>NumberGuessApplication</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:398
-#, no-c-format
-msgid ""
-"<![CDATA[public class NumberGuessApplication extends WeldApplication {\n"
-"   @Override public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class NumberGuessApplication extends WeldApplication {\n"
-"   @Override public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-
 #. Tag: para
-#: weldexamples.xml:399
 #, no-c-format
 msgid ""
 "This class specifies which page Wicket should treat as our home page, in our "
@@ -882,7 +479,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:405
 #, no-c-format
 msgid ""
 "In <literal>HomePage</literal>, we see typical Wicket code to set up page "
@@ -890,76 +486,14 @@
 "literal> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:410
-#, no-c-format
-msgid "<![CDATA[@Inject Game game;]]>"
-msgstr "<![CDATA[@Inject Game game;]]>"
-
 #. Tag: para
-#: weldexamples.xml:412
 #, no-c-format
 msgid ""
 "The <literal>Game</literal> bean is can then be used, for example, by the "
 "code for submitting a guess:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:417
-#, no-c-format
-msgid ""
-"<![CDATA[final Component guessButton = new AjaxButton(\"GuessButton\") {\n"
-"   protected void onSubmit(AjaxRequestTarget target, Form form) {\n"
-"      if (game.check()) {\n"
-"         info(\"Correct!\");\n"
-"         setVisible(false);\n"
-"         prompt.setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == 0) {\n"
-"         info(\"Sorry, the answer was \" + game.getNumber());\n"
-"         setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getNumber() > game.getGuess()) {\n"
-"         info(\"Higher!\");\n"
-"      }\n"
-"      else if (game.getNumber() < game.getGuess()) {\n"
-"         info(\"Lower\");\n"
-"      }\n"
-"      target.addComponent(form);\n"
-"   } \n"
-"};      ]]>"
-msgstr ""
-"<![CDATA[final Component guessButton = new AjaxButton(\"GuessButton\") {\n"
-"   protected void onSubmit(AjaxRequestTarget target, Form form) {\n"
-"      if (game.check()) {\n"
-"         info(\"Correct!\");\n"
-"         setVisible(false);\n"
-"         prompt.setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == 0) {\n"
-"         info(\"Sorry, the answer was \" + game.getNumber());\n"
-"         setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getNumber() > game.getGuess()) {\n"
-"         info(\"Higher!\");\n"
-"      }\n"
-"      else if (game.getNumber() < game.getGuess()) {\n"
-"         info(\"Lower\");\n"
-"      }\n"
-"      target.addComponent(form);\n"
-"   } \n"
-"};      ]]>"
-
 #. Tag: para
-#: weldexamples.xml:420
 #, no-c-format
 msgid ""
 "All injections may be serialized; actual storage of the bean is managed by "
@@ -968,7 +502,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:425
 #, no-c-format
 msgid ""
 "Wicket components allow injection, but they <emphasis>cannot</emphasis> use "
@@ -978,7 +511,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:433
 #, no-c-format
 msgid ""
 "The example uses AJAX for processing of button events, and dynamically hides "
@@ -987,7 +519,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:440
 #, no-c-format
 msgid ""
 "In order to activate Wicket for this webapp, the Wicket filter is added to "
@@ -995,44 +526,7 @@
 "<literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:445
-#, no-c-format
-msgid ""
-"<![CDATA[<filter>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-"
-"class>\n"
-"   <init-param>\n"
-"      <param-name>applicationClassName</param-name>\n"
-"      <param-value>org.jboss.weld.examples.wicket.NumberGuessApplication</"
-"param-value>\n"
-"   </init-param>\n"
-"</filter>\n"
-"\n"
-"<filter-mapping>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <url-pattern>/*</url-pattern>\n"
-"</filter-mapping>]]>"
-msgstr ""
-"<![CDATA[<filter>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-"
-"class>\n"
-"   <init-param>\n"
-"      <param-name>applicationClassName</param-name>\n"
-"      <param-value>org.jboss.weld.examples.wicket.NumberGuessApplication</"
-"param-value>\n"
-"   </init-param>\n"
-"</filter>\n"
-"\n"
-"<filter-mapping>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <url-pattern>/*</url-pattern>\n"
-"</filter-mapping>]]>"
-
 #. Tag: para
-#: weldexamples.xml:447
 #, no-c-format
 msgid ""
 "The servlet listener is still required, as in the Tomcat example, to "
@@ -1043,32 +537,12 @@
 "descriptor to be appended to the <literal>web.xml</literal> configuration."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:455
-#, no-c-format
-msgid ""
-"<![CDATA[<web-app version=\"2.4\" ...>\n"
-"   <listener>\n"
-"      <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"   </listener>\n"
-"</web-app>]]>"
-msgstr ""
-"<![CDATA[<web-app version=\"2.4\" ...>\n"
-"   <listener>\n"
-"      <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"   </listener>\n"
-"</web-app>]]>"
-
 #. Tag: title
-#: weldexamples.xml:464
 #, no-c-format
 msgid "The numberguess example for Java SE with Swing"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:466
 #, no-c-format
 msgid ""
 "This example shows how to use the Weld SE extension to in a Java SE based "
@@ -1078,19 +552,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:473
 #, no-c-format
 msgid "To run the example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:479
 #, no-c-format
 msgid "Ensure that Maven 2 (version 2.0.10+) is installed and in your PATH"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:484
 #, no-c-format
 msgid ""
 "Ensure that the <literal>JAVA_HOME</literal> environment variable is "
@@ -1098,7 +569,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:490
 #, no-c-format
 msgid ""
 "Open a command line or terminal window in the <literal>examples/se/"
@@ -1106,19 +576,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:496
 #, no-c-format
 msgid "Execute the following command"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:499
-#, no-c-format
-msgid "mvn -Drun"
-msgstr "mvn -Drun"
-
 #. Tag: para
-#: weldexamples.xml:503
 #, no-c-format
 msgid ""
 "Let's have a look at the significant code and configuration files that make "
@@ -1126,7 +588,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:508
 #, no-c-format
 msgid ""
 "As usual, there is an empty <literal>beans.xml</literal> file in the root "
@@ -1135,7 +596,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:514
 #, no-c-format
 msgid ""
 "The game's main logic is located in <literal>Game.java</literal>. Here is "
@@ -1143,293 +603,170 @@
 "the web application version:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:518
+#. Tag: para
 #, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"scope\" coords=\"1\"/> <area id="
-"\"name\" coords=\"2\"/> <area id=\"messages1\" coords=\"26\"/> <area id="
-"\"validation\" coords=\"41\"/> <area id=\"reset\" coords=\"73\"/> </"
-"areaspec> <programlisting role=\"JAVA\"><![CDATA[@ApplicationScoped\n"
-"public class Game\n"
-"{\n"
-"\n"
-"   public static final int MAX_NUM_GUESSES = 10;\n"
-"\n"
-"   private Integer number;\n"
-"   private int guess = 0;\n"
-"   private int smallest = 0;\n"
-"\n"
-"   @Inject\n"
-"   @MaxNumber\n"
-"   private int maxNumber;\n"
-"\n"
-"   private int biggest;\n"
-"   private int remainingGuesses = MAX_NUM_GUESSES;\n"
-"   private boolean validNumberRange = true;\n"
-"\n"
-"   @Inject\n"
-"   Generator rndGenerator;\n"
-"\n"
-"   public Game()\n"
-"   {\n"
-"   }\n"
-"\n"
-"   ...\n"
-"\n"
-"   public boolean isValidNumberRange()\n"
-"   {\n"
-"      return validNumberRange;\n"
-"   }\n"
-"\n"
-"   public boolean isGameWon()\n"
-"   {\n"
-"      return guess == number;\n"
-"   }\n"
-"\n"
-"   public boolean isGameLost()\n"
-"   {\n"
-"      return guess != number && remainingGuesses <= 0;\n"
-"   }\n"
-"\n"
-"   public boolean check()\n"
-"   {\n"
-"      boolean result = false;\n"
-"\n"
-"      if (checkNewNumberRangeIsValid())\n"
-"      {\n"
-"         if (guess > number)\n"
-"         {\n"
-"            biggest = guess - 1;\n"
-"         }\n"
-"\n"
-"         if (guess < number)\n"
-"         {\n"
-"            smallest = guess + 1;\n"
-"         }\n"
-"\n"
-"         if (guess == number)\n"
-"         {\n"
-"            result = true;\n"
-"         }\n"
-"\n"
-"         remainingGuesses--;\n"
-"      }\n"
-"\n"
-"      return result;\n"
-"   }\n"
-"\n"
-"   private boolean checkNewNumberRangeIsValid()\n"
-"   {\n"
-"      return validNumberRange = ((guess >= smallest) && (guess <= "
-"biggest));\n"
-"   }\n"
-"\n"
-"   @PostConstruct\n"
-"   public void reset()\n"
-"   {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = rndGenerator.next();\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"scope\"> <para> The "
-"bean is application scoped rather than session scoped, since an instance of "
-"a Swing application typically represents a single 'session'. </para> </"
-"callout> <callout arearefs=\"name\"> <para> Notice that the bean is not "
-"named, since it doesn't need to be accessed via EL. </para> </callout> "
-"<callout arearefs=\"messages1\"> <para> In Java SE there is no JSF "
-"<literal>FacesContext</literal> to which messages can be added. Instead the "
-"<literal>Game</literal> class provides additional information about the "
-"state of the current game including: </para> <itemizedlist> <listitem> "
-"<para> If the game has been won or lost </para> </listitem> <listitem> "
-"<para> If the most recent guess was invalid </para> </listitem> </"
-"itemizedlist> <para> This allows the Swing UI to query the state of the "
-"game, which it does indirectly via a class called <literal>MessageGenerator</"
-"literal>, in order to determine the appropriate messages to display to the "
-"user during the game. </para> </callout> <callout arearefs=\"validation\"> "
-"<para> Since there is no dedicated validation phase, validation of user "
-"input is performed during the <literal>check()</literal> method. </para> </"
-"callout> <callout arearefs=\"reset\"> <para> The <literal>reset()</literal> "
-"method makes a call to the injected <literal>rndGenerator</literal> in order "
-"to get the random number at the start of each game. Note that it can't use "
-"<literal>Instance.get()</literal> like the JSF example does because there "
-"will not be any active contexts like there are during a JSF request. </para> "
-"</callout> </calloutlist> </programlistingco> <para> The "
-"<literal>MessageGenerator</literal> class depends on the current instance of "
-"<literal>Game</literal> and queries its state in order to determine the "
-"appropriate messages to provide as the prompt for the user's next guess and "
-"the response to the previous guess. The code for <literal>MessageGenerator</"
-"literal> is as follows: </para> <programlistingco> <areaspec> <area id=\"game"
-"\" coords=\"3\"/> <area id=\"challenge\" coords=\"6\"/> <area id=\"result\" "
-"coords=\"17\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA[public "
-"class MessageGenerator\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   public String getChallengeMessage()\n"
-"   {\n"
-"      StringBuilder challengeMsg = new StringBuilder(\"I'm thinking of a "
-"number between \");\n"
-"      challengeMsg.append(game.getSmallest());\n"
-"      challengeMsg.append(\" and \");\n"
-"      challengeMsg.append(game.getBiggest());\n"
-"      challengeMsg.append(\". Can you guess what it is?\");\n"
-"\n"
-"      return challengeMsg.toString();\n"
-"   }\n"
-"\n"
-"   public String getResultMessage()\n"
-"   {\n"
-"      if (game.isGameWon())\n"
-"      {\n"
-"         return \"You guessed it! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (game.isGameLost())\n"
-"      {\n"
-"         return \"You are fail! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (!game.isValidNumberRange())\n"
-"      {\n"
-"         return \"Invalid number range!\";\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == Game.MAX_NUM_GUESSES)\n"
-"      {\n"
-"         return \"What is your first guess?\";\n"
-"      }\n"
-"      else\n"
-"      {\n"
-"         String direction = null;\n"
-"\n"
-"         if (game.getGuess() < game.getNumber())\n"
-"         {\n"
-"            direction = \"Higher\";\n"
-"         }\n"
-"         else\n"
-"         {\n"
-"            direction = \"Lower\";\n"
-"         }\n"
-"\n"
-"         return direction + \"! You have \" + game.getRemainingGuesses() + "
-"\" guesses left.\";\n"
-"      }\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"game\"> <para> The "
-"instance of <literal>Game</literal> for the application is injected here. </"
-"para> </callout> <callout arearefs=\"challenge\"> <para> The <literal>Game</"
-"literal>'s state is interrogated to determine the appropriate challenge "
-"message ... </para> </callout> <callout arearefs=\"result\"> <para> ... and "
-"again to determine whether to congratulate, console or encourage the user to "
-"continue. </para> </callout> </calloutlist> </programlistingco> <para> "
+"The bean is application scoped rather than session scoped, since an instance "
+"of a Swing application typically represents a single 'session'."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Notice that the bean is not named, since it doesn't need to be accessed via "
+"EL."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"In Java SE there is no JSF <literal>FacesContext</literal> to which messages "
+"can be added. Instead the <literal>Game</literal> class provides additional "
+"information about the state of the current game including:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the game has been won or lost"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the most recent guess was invalid"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This allows the Swing UI to query the state of the game, which it does "
+"indirectly via a class called <literal>MessageGenerator</literal>, in order "
+"to determine the appropriate messages to display to the user during the game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Since there is no dedicated validation phase, validation of user input is "
+"performed during the <literal>check()</literal> method."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>reset()</literal> method makes a call to the injected "
+"<literal>rndGenerator</literal> in order to get the random number at the "
+"start of each game. Note that it can't use <literal>Instance.get()</literal> "
+"like the JSF example does because there will not be any active contexts like "
+"there are during a JSF request."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>MessageGenerator</literal> class depends on the current "
+"instance of <literal>Game</literal> and queries its state in order to "
+"determine the appropriate messages to provide as the prompt for the user's "
+"next guess and the response to the previous guess. The code for "
+"<literal>MessageGenerator</literal> is as follows:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The instance of <literal>Game</literal> for the application is injected here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>Game</literal>'s state is interrogated to determine the "
+"appropriate challenge message ..."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"... and again to determine whether to congratulate, console or encourage the "
+"user to continue."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "Finally we come to the <literal>NumberGuessFrame</literal> class which "
-"provides the Swing front end to our guessing game. </para> "
-"<programlistingco> <areaspec> <area id=\"gameIn\" coords=\"3\"/> <area id="
-"\"messagesIn\" coords=\"6\"/> <area id=\"start\" coords=\"9\"/> <area id="
-"\"init\" coords=\"21\"/> <area id=\"guess1\" coords=\"38\"/> <area id="
-"\"replay\" coords=\"48\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA"
-"[public class NumberGuessFrame extends javax.swing.JFrame\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   @Inject\n"
-"   private MessageGenerator msgGenerator;\n"
-"\n"
-"   public void start(@Observes ContainerInitialized event)\n"
-"   {\n"
-"      java.awt.EventQueue.invokeLater(new Runnable()\n"
-"      {\n"
-"         public void run()\n"
-"         {\n"
-"            initComponents();\n"
-"            setVisible(true);\n"
-"         }\n"
-"      });\n"
-"   }\n"
-"\n"
-"   private void initComponents()\n"
-"   {\n"
-"\n"
-"      buttonPanel = new javax.swing.JPanel();\n"
-"      mainMsgPanel = new javax.swing.JPanel();\n"
-"      mainLabel = new javax.swing.JLabel();\n"
-"      messageLabel = new javax.swing.JLabel();\n"
-"      guessText = new javax.swing.JTextField();\n"
-"      ...\n"
-"      mainLabel.setText(msgGenerator.getChallengeMessage());\n"
-"      mainMsgPanel.add(mainLabel);\n"
-"\n"
-"      messageLabel.setText(msgGenerator.getResultMessage());\n"
-"      mainMsgPanel.add(messageLabel);\n"
-"      ...\n"
-"   }\n"
-"\n"
-"   private void guessButtonActionPerformed( java.awt.event.ActionEvent "
-"evt )\n"
-"   {\n"
-"      int guess =  Integer.parseInt(guessText.getText());\n"
-"      game.setGuess( guess );\n"
-"      game.check();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void replayBtnActionPerformed(java.awt.event.ActionEvent evt)\n"
-"   {\n"
-"      game.reset();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void refreshUI() {\n"
-"      mainLabel.setText( msgGenerator.getChallengeMessage() );\n"
-"      messageLabel.setText( msgGenerator.getResultMessage() );\n"
-"      guessText.setText( \"\" );\n"
-"      guessesLeftBar.setValue( game.getRemainingGuesses() );\n"
-"      guessText.requestFocus();\n"
-"   }\n"
-"\n"
-"   // swing components\n"
-"   private javax.swing.JPanel borderPanel;\n"
-"   ...\n"
-"   private javax.swing.JButton replayBtn;\n"
-"\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"gameIn\"> <para> The "
-"injected instance of the game (logic and state). </para> </callout> <callout "
-"arearefs=\"messagesIn\"> <para> The injected message generator for UI "
-"messages. </para> </callout> <callout arearefs=\"start\"> <para> This "
-"application is started in the prescribed Weld SE way, by observing the "
-"<literal>ContainerInitialized</literal> event. </para> </callout> <callout "
-"arearefs=\"init\"> <para> This method initializes all of the Swing "
-"components. Note the use of the <literal>msgGenerator</literal> here. </"
-"para> </callout> <callout arearefs=\"guess1\"> <para> "
+"provides the Swing front end to our guessing game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected instance of the game (logic and state)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected message generator for UI messages."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This application is started in the prescribed Weld SE way, by observing the "
+"<literal>ContainerInitialized</literal> event."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This method initializes all of the Swing components. Note the use of the "
+"<literal>msgGenerator</literal> here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
-"button is clicked, and it does the following: </para> <itemizedlist> "
-"<listitem> <para> Gets the guess entered by the user and sets it as the "
-"current guess in the <literal>Game</literal> </para> </listitem> <listitem> "
-"<para> Calls <literal>game.check()</literal> to validate and perform one "
-"'turn' of the game </para> </listitem> <listitem> <para> Calls "
-"<literal>refreshUI</literal>. If there were validation errors with the "
+"button is clicked, and it does the following:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Gets the guess entered by the user and sets it as the current guess in the "
+"<literal>Game</literal>"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
+"the game"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>refreshUI</literal>. If there were validation errors with the "
 "input, this will have been captured during <literal>game.check()</literal> "
 "and as such will be reflected in the messages returned by "
 "<literal>MessageGenerator</literal> and subsequently presented to the user. "
 "If there are no validation errors then the user will be told to guess again "
 "(higher or lower) or that the game has ended either in a win (correct guess) "
-"or a loss (ran out of guesses). </para> </listitem> </itemizedlist> </"
-"callout> <callout arearefs=\"replay\"> <para> "
+"or a loss (ran out of guesses)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>replayBtnActionPerformed</literal> simply calls <literal>game.reset"
-"()</literal> to start a new game and refreshes the messages in the UI. </"
-"para> </callout> </calloutlist> </programlistingco>"
+"()</literal> to start a new game and refreshes the messages in the UI."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:716
 #, no-c-format
 msgid "The translator example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:718
 #, no-c-format
 msgid ""
 "The translator example will take any sentences you enter, and translate them "
@@ -1438,65 +775,29 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:723
 #, no-c-format
 msgid ""
-"The translator example is built as an EAR and contains EJBs. As a result, "
+"The translator example is built as an ear and contains EJBs. As a result, "
 "it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:729
 #, no-c-format
 msgid ""
-"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a WAR, which "
+"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a war, which "
 "will make this structure much simpler! Still, there are other advantages of "
-"using an EAR."
+"using an ear."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:735
 #, no-c-format
 msgid ""
-"First, let's take a look at the EAR aggregator, which is located in the "
+"First, let's take a look at the ear aggregator, which is located in the "
 "example's <literal>ear</literal> directory. Maven automatically generates "
 "the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:740
-#, no-c-format
-msgid ""
-"<![CDATA[<plugin>\n"
-"   <groupId>org.apache.maven.plugins</groupId>\n"
-"   <artifactId>maven-ear-plugin</artifactId>\n"
-"   <configuration>\n"
-"      <modules>\n"
-"         <webModule>\n"
-"            <groupId>org.jboss.weld.examples.jsf.translator</groupId>\n"
-"            <artifactId>weld-jsf-translator-war</artifactId>\n"
-"            <contextRoot>/weld-translator</contextRoot>\n"
-"         </webModule>\n"
-"      </modules>\n"
-"   </configuration>\n"
-"</plugin>]]>"
-msgstr ""
-"<![CDATA[<plugin>\n"
-"   <groupId>org.apache.maven.plugins</groupId>\n"
-"   <artifactId>maven-ear-plugin</artifactId>\n"
-"   <configuration>\n"
-"      <modules>\n"
-"         <webModule>\n"
-"            <groupId>org.jboss.weld.examples.jsf.translator</groupId>\n"
-"            <artifactId>weld-jsf-translator-war</artifactId>\n"
-"            <contextRoot>/weld-translator</contextRoot>\n"
-"         </webModule>\n"
-"      </modules>\n"
-"   </configuration>\n"
-"</plugin>]]>"
-
 #. Tag: para
-#: weldexamples.xml:742
 #, no-c-format
 msgid ""
 "This configuration overrides the web context path, resulting in this "
@@ -1505,64 +806,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:748
 #, no-c-format
 msgid ""
 "If you weren't using Maven to generate these files, you would need "
 "<literal>META-INF/application.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:753
-#, no-c-format
-msgid ""
-"<![CDATA[<application version=\"5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/application_5.xsd\">\n"
-"\n"
-"  <display-name>weld-jsf-translator-ear</display-name>\n"
-"  <description>The Weld JSF translator example (EAR)</description>\n"
-"  \n"
-"  <module>\n"
-"    <web>\n"
-"      <web-uri>weld-translator.war</web-uri>\n"
-"      <context-root>/weld-translator</context-root>\n"
-"    </web>\n"
-"  </module>\n"
-"  <module>\n"
-"    <ejb>weld-translator.jar</ejb>\n"
-"  </module>\n"
-"</application>]]>"
-msgstr ""
-"<![CDATA[<application version=\"5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/application_5.xsd\">\n"
-"\n"
-"  <display-name>weld-jsf-translator-ear</display-name>\n"
-"  <description>The Weld JSF translator example (EAR)</description>\n"
-"  \n"
-"  <module>\n"
-"    <web>\n"
-"      <web-uri>weld-translator.war</web-uri>\n"
-"      <context-root>/weld-translator</context-root>\n"
-"    </web>\n"
-"  </module>\n"
-"  <module>\n"
-"    <ejb>weld-translator.jar</ejb>\n"
-"  </module>\n"
-"</application>]]>"
-
 #. Tag: para
-#: weldexamples.xml:756
 #, no-c-format
 msgid ""
-"Next, lets look at the WAR, which is located in the example's <literal>war</"
+"Next, lets look at the war, which is located in the example's <literal>war</"
 "literal> directory. Just as in the numberguess example, we have a "
 "<literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</"
 "literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/"
@@ -1570,7 +823,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:762
 #, no-c-format
 msgid ""
 "More interesting is the JSF view used to translate text. Just as in the "
@@ -1578,68 +830,7 @@
 "here for brevity):"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:767
-#, no-c-format
-msgid ""
-"<![CDATA[<h:form id=\"translator\">\n"
-"\n"
-"   <table>\n"
-"      <tr align=\"center\" style=\"font-weight: bold\">\n"
-"         <td>\n"
-"            Your text\n"
-"         </td>\n"
-"         <td>\n"
-"            Translation\n"
-"         </td>\n"
-"      </tr>\n"
-"      <tr>\n"
-"         <td>\n"
-"            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
-"required=\"true\" rows=\"5\" cols=\"80\"/>\n"
-"         </td>\n"
-"         <td>\n"
-"            <h:outputText value=\"#{translator.translatedText}\"/>\n"
-"         </td>\n"
-"      </tr>\n"
-"   </table>\n"
-"   <div>\n"
-"      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
-"{translator.translate}\"/>\n"
-"   </div>\n"
-"   \n"
-"</h:form>]]>"
-msgstr ""
-"<![CDATA[<h:form id=\"translator\">\n"
-"\n"
-"   <table>\n"
-"      <tr align=\"center\" style=\"font-weight: bold\">\n"
-"         <td>\n"
-"            Your text\n"
-"         </td>\n"
-"         <td>\n"
-"            Translation\n"
-"         </td>\n"
-"      </tr>\n"
-"      <tr>\n"
-"         <td>\n"
-"            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
-"required=\"true\" rows=\"5\" cols=\"80\"/>\n"
-"         </td>\n"
-"         <td>\n"
-"            <h:outputText value=\"#{translator.translatedText}\"/>\n"
-"         </td>\n"
-"      </tr>\n"
-"   </table>\n"
-"   <div>\n"
-"      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
-"{translator.translate}\"/>\n"
-"   </div>\n"
-"   \n"
-"</h:form>]]>"
-
 #. Tag: para
-#: weldexamples.xml:769
 #, no-c-format
 msgid ""
 "The user can enter some text in the left-hand textarea, and hit the "
@@ -1647,7 +838,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:774
 #, no-c-format
 msgid ""
 "Finally, let's look at the EJB module, which is located in the example's "
@@ -1657,7 +847,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:780
 #, no-c-format
 msgid ""
 "We've saved the most interesting bit to last, the code! The project has two "
@@ -1669,7 +858,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:787
 #, no-c-format
 msgid ""
 "Both <literal>SentenceParser</literal> and <literal>TextTranslator</literal> "
@@ -1677,52 +865,7 @@
 "injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:792
-#, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator implements Serializable { \n"
-"\n"
-"   private SentenceParser sentenceParser; \n"
-"\n"
-"   @EJB private Translator translator; \n"
-"   \n"
-"   @Inject public TextTranslator(SentenceParser sentenceParser) { \n"
-"      this.sentenceParser = sentenceParser; \n"
-"   }\n"
-"   \n"
-"   public String translate(String text) { \n"
-"      StringBuilder sb = new StringBuilder(); \n"
-"      for (String sentence: sentenceParser.parse(text)) { \n"
-"         sb.append(translator.translate(sentence)).append(\". \"); \n"
-"      } \n"
-"      return sb.toString().trim(); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TextTranslator implements Serializable { \n"
-"\n"
-"   private SentenceParser sentenceParser; \n"
-"\n"
-"   @EJB private Translator translator; \n"
-"   \n"
-"   @Inject public TextTranslator(SentenceParser sentenceParser) { \n"
-"      this.sentenceParser = sentenceParser; \n"
-"   }\n"
-"   \n"
-"   public String translate(String text) { \n"
-"      StringBuilder sb = new StringBuilder(); \n"
-"      for (String sentence: sentenceParser.parse(text)) { \n"
-"         sb.append(translator.translate(sentence)).append(\". \"); \n"
-"      } \n"
-"      return sb.toString().trim(); \n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: weldexamples.xml:794
 #, no-c-format
 msgid ""
 "<literal>TextTranslator</literal> uses the simple bean (really just a plain "
@@ -1733,30 +876,7 @@
 "convincing enough to anyone who doesn't understand Latin!"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:802
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator { \n"
-"\n"
-"   public String translate(String sentence) { \n"
-"      return \"Lorem ipsum dolor sit amet\"; \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator { \n"
-"\n"
-"   public String translate(String sentence) { \n"
-"      return \"Lorem ipsum dolor sit amet\"; \n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: weldexamples.xml:804
 #, no-c-format
 msgid ""
 "Finally, there is UI orientated controller. This is a request scoped, named, "
@@ -1765,77 +885,657 @@
 "and setters for all the fields on the page."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:810
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"@RequestScoped\n"
-"@Named(\"translator\")\n"
-"public class TranslatorControllerBean implements TranslatorController {\n"
-"\n"
-"   @Inject private TextTranslator translator;\n"
-"   \n"
-"   private String inputText;\n"
-"   \n"
-"   private String translatedText;\n"
-"   \n"
-"   public void translate() {\n"
-"      translatedText = translator.translate(inputText);\n"
-"   }\n"
-"   \n"
-"   public String getText() {\n"
-"      return inputText;\n"
-"   }\n"
-"   \n"
-"   public void setText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"   \n"
-"   public String getTranslatedText() {\n"
-"      return translatedText;\n"
-"   }\n"
-"   \n"
-"   @Remove public void remove() {}\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateful\n"
-"@RequestScoped\n"
-"@Named(\"translator\")\n"
-"public class TranslatorControllerBean implements TranslatorController {\n"
-"\n"
-"   @Inject private TextTranslator translator;\n"
-"   \n"
-"   private String inputText;\n"
-"   \n"
-"   private String translatedText;\n"
-"   \n"
-"   public void translate() {\n"
-"      translatedText = translator.translate(inputText);\n"
-"   }\n"
-"   \n"
-"   public String getText() {\n"
-"      return inputText;\n"
-"   }\n"
-"   \n"
-"   public void setText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"   \n"
-"   public String getTranslatedText() {\n"
-"      return translatedText;\n"
-"   }\n"
-"   \n"
-"   @Remove public void remove() {}\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: weldexamples.xml:814
 #, no-c-format
 msgid ""
 "That concludes our short tour of the Weld starter examples. For more "
 "information on Weld, please visit <ulink url=\"http://www.seamframework.org/"
 "Weld\">http://www.seamframework.org/Weld</ulink>."
 msgstr ""
+
+#~ msgid ""
+#~ "<![CDATA[<faces-config version=\"2.0\"\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd\">\n"
+#~ "</faces-config>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<faces-config version=\"2.0\"\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd\">\n"
+#~ "</faces-config>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Random {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Random {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface MaxNumber {}\n"
+#~ "]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Random {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped\n"
+#~ "public class Generator implements Serializable {\n"
+#~ "\n"
+#~ "   private java.util.Random random = new java.util.Random(System."
+#~ "currentTimeMillis());\n"
+#~ "   \n"
+#~ "   private int maxNumber = 100;\n"
+#~ "   \n"
+#~ "   java.util.Random getRandom() {\n"
+#~ "      return random;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Produces @Random int next() { \n"
+#~ "      return getRandom().nextInt(maxNumber); \n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Produces @MaxNumber int getMaxNumber() {\n"
+#~ "      return maxNumber;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped\n"
+#~ "public class Generator implements Serializable {\n"
+#~ "\n"
+#~ "   private java.util.Random random = new java.util.Random(System."
+#~ "currentTimeMillis());\n"
+#~ "   \n"
+#~ "   private int maxNumber = 100;\n"
+#~ "   \n"
+#~ "   java.util.Random getRandom() {\n"
+#~ "      return random;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Produces @Random int next() { \n"
+#~ "      return getRandom().nextInt(maxNumber); \n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Produces @MaxNumber int getMaxNumber() {\n"
+#~ "      return maxNumber;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Named\n"
+#~ "@SessionScoped\n"
+#~ "public class Game implements Serializable {\n"
+#~ "\n"
+#~ "   private int number;\n"
+#~ "   private int guess;\n"
+#~ "   private int smallest;\n"
+#~ "   private int biggest;\n"
+#~ "   private int remainingGuesses;\n"
+#~ "\n"
+#~ "   @Inject @MaxNumber private int maxNumber;\n"
+#~ "   @Inject @Random Instance<Integer> randomNumber;\n"
+#~ "   \n"
+#~ "   public Game() {}\n"
+#~ "   \n"
+#~ "   public void check() {\n"
+#~ "      if (guess > number) {\n"
+#~ "         biggest = guess - 1;\n"
+#~ "      }\n"
+#~ "      else if (guess < number) {\n"
+#~ "         smallest = guess + 1;\n"
+#~ "      }\n"
+#~ "      else if (guess == number) {\n"
+#~ "         FacesContext.getCurrentInstance().addMessage(null, new "
+#~ "FacesMessage(\"Correct!\"));\n"
+#~ "      }\n"
+#~ "      remainingGuesses--;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @PostConstruct\n"
+#~ "   public void reset() {\n"
+#~ "      this.smallest = 0;\n"
+#~ "      this.guess = 0;\n"
+#~ "      this.remainingGuesses = 10;\n"
+#~ "      this.biggest = maxNumber;\n"
+#~ "      this.number = randomNumber.get();\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void validateNumberRange(FacesContext context,  UIComponent "
+#~ "toValidate, Object value) {\n"
+#~ "      if (remainingGuesses <= 0) {\n"
+#~ "         FacesMessage message = new FacesMessage(\"No guesses left!\");\n"
+#~ "         context.addMessage(toValidate.getClientId(context), message);\n"
+#~ "         ((UIInput) toValidate).setValid(false);\n"
+#~ "         return;\n"
+#~ "      }\n"
+#~ "      int input = (Integer) value;\n"
+#~ "\n"
+#~ "      if (input < smallest || input > biggest) {\n"
+#~ "         ((UIInput) toValidate).setValid(false);\n"
+#~ "\n"
+#~ "         FacesMessage message = new FacesMessage(\"Invalid guess\");\n"
+#~ "         context.addMessage(toValidate.getClientId(context), message);\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public int getNumber() {\n"
+#~ "      return number;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getGuess() {\n"
+#~ "      return guess;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void setGuess(int guess) {\n"
+#~ "      this.guess = guess;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getSmallest() {\n"
+#~ "      return smallest;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getBiggest() {\n"
+#~ "      return biggest;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getRemainingGuesses() {\n"
+#~ "      return remainingGuesses;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named\n"
+#~ "@SessionScoped\n"
+#~ "public class Game implements Serializable {\n"
+#~ "\n"
+#~ "   private int number;\n"
+#~ "   private int guess;\n"
+#~ "   private int smallest;\n"
+#~ "   private int biggest;\n"
+#~ "   private int remainingGuesses;\n"
+#~ "\n"
+#~ "   @Inject @MaxNumber private int maxNumber;\n"
+#~ "   @Inject @Random Instance<Integer> randomNumber;\n"
+#~ "   \n"
+#~ "   public Game() {}\n"
+#~ "   \n"
+#~ "   public void check() {\n"
+#~ "      if (guess > number) {\n"
+#~ "         biggest = guess - 1;\n"
+#~ "      }\n"
+#~ "      else if (guess < number) {\n"
+#~ "         smallest = guess + 1;\n"
+#~ "      }\n"
+#~ "      else if (guess == number) {\n"
+#~ "         FacesContext.getCurrentInstance().addMessage(null, new "
+#~ "FacesMessage(\"Correct!\"));\n"
+#~ "      }\n"
+#~ "      remainingGuesses--;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @PostConstruct\n"
+#~ "   public void reset() {\n"
+#~ "      this.smallest = 0;\n"
+#~ "      this.guess = 0;\n"
+#~ "      this.remainingGuesses = 10;\n"
+#~ "      this.biggest = maxNumber;\n"
+#~ "      this.number = randomNumber.get();\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void validateNumberRange(FacesContext context,  UIComponent "
+#~ "toValidate, Object value) {\n"
+#~ "      if (remainingGuesses <= 0) {\n"
+#~ "         FacesMessage message = new FacesMessage(\"No guesses left!\");\n"
+#~ "         context.addMessage(toValidate.getClientId(context), message);\n"
+#~ "         ((UIInput) toValidate).setValid(false);\n"
+#~ "         return;\n"
+#~ "      }\n"
+#~ "      int input = (Integer) value;\n"
+#~ "\n"
+#~ "      if (input < smallest || input > biggest) {\n"
+#~ "         ((UIInput) toValidate).setValid(false);\n"
+#~ "\n"
+#~ "         FacesMessage message = new FacesMessage(\"Invalid guess\");\n"
+#~ "         context.addMessage(toValidate.getClientId(context), message);\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public int getNumber() {\n"
+#~ "      return number;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getGuess() {\n"
+#~ "      return guess;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void setGuess(int guess) {\n"
+#~ "      this.guess = guess;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getSmallest() {\n"
+#~ "      return smallest;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getBiggest() {\n"
+#~ "      return biggest;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getRemainingGuesses() {\n"
+#~ "      return remainingGuesses;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<listener>\n"
+#~ "   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
+#~ "class>\n"
+#~ "</listener>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<listener>\n"
+#~ "   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
+#~ "class>\n"
+#~ "</listener>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/wicket/numberguess\n"
+#~ "mvn -Pjetty eclipse:eclipse]]>"
+#~ msgstr ""
+#~ "<![CDATA[$> cd examples/wicket/numberguess\n"
+#~ "mvn -Pjetty eclipse:eclipse]]>"
+
+#~ msgid "<![CDATA[$> ant deploy]]>"
+#~ msgstr "<![CDATA[$> ant deploy]]>"
+
+#~ msgid "<![CDATA[$> ant tomcat.deploy]]>"
+#~ msgstr "<![CDATA[$> ant tomcat.deploy]]>"
+
+#~ msgid "<![CDATA[$> mvn jetty:run -Pjetty]]>"
+#~ msgstr "<![CDATA[$> mvn jetty:run -Pjetty]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class NumberGuessApplication extends WeldApplication {\n"
+#~ "   @Override public Class getHomePage() {\n"
+#~ "      return HomePage.class;\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class NumberGuessApplication extends WeldApplication {\n"
+#~ "   @Override public Class getHomePage() {\n"
+#~ "      return HomePage.class;\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid "<![CDATA[@Inject Game game;]]>"
+#~ msgstr "<![CDATA[@Inject Game game;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[final Component guessButton = new AjaxButton(\"GuessButton\") {\n"
+#~ "   protected void onSubmit(AjaxRequestTarget target, Form form) {\n"
+#~ "      if (game.check()) {\n"
+#~ "         info(\"Correct!\");\n"
+#~ "         setVisible(false);\n"
+#~ "         prompt.setVisible(false);\n"
+#~ "         guessLabel.setVisible(false);\n"
+#~ "         inputGuess.setVisible(false);\n"
+#~ "      }\n"
+#~ "      else if (game.getRemainingGuesses() == 0) {\n"
+#~ "         info(\"Sorry, the answer was \" + game.getNumber());\n"
+#~ "         setVisible(false);\n"
+#~ "         guessLabel.setVisible(false);\n"
+#~ "         inputGuess.setVisible(false);\n"
+#~ "      }\n"
+#~ "      else if (game.getNumber() > game.getGuess()) {\n"
+#~ "         info(\"Higher!\");\n"
+#~ "      }\n"
+#~ "      else if (game.getNumber() < game.getGuess()) {\n"
+#~ "         info(\"Lower\");\n"
+#~ "      }\n"
+#~ "      target.addComponent(form);\n"
+#~ "   } \n"
+#~ "};      ]]>"
+#~ msgstr ""
+#~ "<![CDATA[final Component guessButton = new AjaxButton(\"GuessButton\") {\n"
+#~ "   protected void onSubmit(AjaxRequestTarget target, Form form) {\n"
+#~ "      if (game.check()) {\n"
+#~ "         info(\"Correct!\");\n"
+#~ "         setVisible(false);\n"
+#~ "         prompt.setVisible(false);\n"
+#~ "         guessLabel.setVisible(false);\n"
+#~ "         inputGuess.setVisible(false);\n"
+#~ "      }\n"
+#~ "      else if (game.getRemainingGuesses() == 0) {\n"
+#~ "         info(\"Sorry, the answer was \" + game.getNumber());\n"
+#~ "         setVisible(false);\n"
+#~ "         guessLabel.setVisible(false);\n"
+#~ "         inputGuess.setVisible(false);\n"
+#~ "      }\n"
+#~ "      else if (game.getNumber() > game.getGuess()) {\n"
+#~ "         info(\"Higher!\");\n"
+#~ "      }\n"
+#~ "      else if (game.getNumber() < game.getGuess()) {\n"
+#~ "         info(\"Lower\");\n"
+#~ "      }\n"
+#~ "      target.addComponent(form);\n"
+#~ "   } \n"
+#~ "};      ]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<filter>\n"
+#~ "   <filter-name>Wicket Filter</filter-name>\n"
+#~ "   <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-"
+#~ "class>\n"
+#~ "   <init-param>\n"
+#~ "      <param-name>applicationClassName</param-name>\n"
+#~ "      <param-value>org.jboss.weld.examples.wicket.NumberGuessApplication</"
+#~ "param-value>\n"
+#~ "   </init-param>\n"
+#~ "</filter>\n"
+#~ "\n"
+#~ "<filter-mapping>\n"
+#~ "   <filter-name>Wicket Filter</filter-name>\n"
+#~ "   <url-pattern>/*</url-pattern>\n"
+#~ "</filter-mapping>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<filter>\n"
+#~ "   <filter-name>Wicket Filter</filter-name>\n"
+#~ "   <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-"
+#~ "class>\n"
+#~ "   <init-param>\n"
+#~ "      <param-name>applicationClassName</param-name>\n"
+#~ "      <param-value>org.jboss.weld.examples.wicket.NumberGuessApplication</"
+#~ "param-value>\n"
+#~ "   </init-param>\n"
+#~ "</filter>\n"
+#~ "\n"
+#~ "<filter-mapping>\n"
+#~ "   <filter-name>Wicket Filter</filter-name>\n"
+#~ "   <url-pattern>/*</url-pattern>\n"
+#~ "</filter-mapping>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<web-app version=\"2.4\" ...>\n"
+#~ "   <listener>\n"
+#~ "      <listener-class>org.jboss.weld.environment.servlet.Listener</"
+#~ "listener-class>\n"
+#~ "   </listener>\n"
+#~ "</web-app>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<web-app version=\"2.4\" ...>\n"
+#~ "   <listener>\n"
+#~ "      <listener-class>org.jboss.weld.environment.servlet.Listener</"
+#~ "listener-class>\n"
+#~ "   </listener>\n"
+#~ "</web-app>]]>"
+
+#~ msgid "mvn -Drun"
+#~ msgstr "mvn -Drun"
+
+#~ msgid ""
+#~ "<![CDATA[<plugin>\n"
+#~ "   <groupId>org.apache.maven.plugins</groupId>\n"
+#~ "   <artifactId>maven-ear-plugin</artifactId>\n"
+#~ "   <configuration>\n"
+#~ "      <modules>\n"
+#~ "         <webModule>\n"
+#~ "            <groupId>org.jboss.weld.examples.jsf.translator</groupId>\n"
+#~ "            <artifactId>weld-jsf-translator-war</artifactId>\n"
+#~ "            <contextRoot>/weld-translator</contextRoot>\n"
+#~ "         </webModule>\n"
+#~ "      </modules>\n"
+#~ "   </configuration>\n"
+#~ "</plugin>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<plugin>\n"
+#~ "   <groupId>org.apache.maven.plugins</groupId>\n"
+#~ "   <artifactId>maven-ear-plugin</artifactId>\n"
+#~ "   <configuration>\n"
+#~ "      <modules>\n"
+#~ "         <webModule>\n"
+#~ "            <groupId>org.jboss.weld.examples.jsf.translator</groupId>\n"
+#~ "            <artifactId>weld-jsf-translator-war</artifactId>\n"
+#~ "            <contextRoot>/weld-translator</contextRoot>\n"
+#~ "         </webModule>\n"
+#~ "      </modules>\n"
+#~ "   </configuration>\n"
+#~ "</plugin>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<application version=\"5\"\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/application_5.xsd\">\n"
+#~ "\n"
+#~ "  <display-name>weld-jsf-translator-ear</display-name>\n"
+#~ "  <description>The Weld JSF translator example (EAR)</description>\n"
+#~ "  \n"
+#~ "  <module>\n"
+#~ "    <web>\n"
+#~ "      <web-uri>weld-translator.war</web-uri>\n"
+#~ "      <context-root>/weld-translator</context-root>\n"
+#~ "    </web>\n"
+#~ "  </module>\n"
+#~ "  <module>\n"
+#~ "    <ejb>weld-translator.jar</ejb>\n"
+#~ "  </module>\n"
+#~ "</application>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<application version=\"5\"\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/application_5.xsd\">\n"
+#~ "\n"
+#~ "  <display-name>weld-jsf-translator-ear</display-name>\n"
+#~ "  <description>The Weld JSF translator example (EAR)</description>\n"
+#~ "  \n"
+#~ "  <module>\n"
+#~ "    <web>\n"
+#~ "      <web-uri>weld-translator.war</web-uri>\n"
+#~ "      <context-root>/weld-translator</context-root>\n"
+#~ "    </web>\n"
+#~ "  </module>\n"
+#~ "  <module>\n"
+#~ "    <ejb>weld-translator.jar</ejb>\n"
+#~ "  </module>\n"
+#~ "</application>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<h:form id=\"translator\">\n"
+#~ "\n"
+#~ "   <table>\n"
+#~ "      <tr align=\"center\" style=\"font-weight: bold\">\n"
+#~ "         <td>\n"
+#~ "            Your text\n"
+#~ "         </td>\n"
+#~ "         <td>\n"
+#~ "            Translation\n"
+#~ "         </td>\n"
+#~ "      </tr>\n"
+#~ "      <tr>\n"
+#~ "         <td>\n"
+#~ "            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
+#~ "required=\"true\" rows=\"5\" cols=\"80\"/>\n"
+#~ "         </td>\n"
+#~ "         <td>\n"
+#~ "            <h:outputText value=\"#{translator.translatedText}\"/>\n"
+#~ "         </td>\n"
+#~ "      </tr>\n"
+#~ "   </table>\n"
+#~ "   <div>\n"
+#~ "      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
+#~ "{translator.translate}\"/>\n"
+#~ "   </div>\n"
+#~ "   \n"
+#~ "</h:form>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<h:form id=\"translator\">\n"
+#~ "\n"
+#~ "   <table>\n"
+#~ "      <tr align=\"center\" style=\"font-weight: bold\">\n"
+#~ "         <td>\n"
+#~ "            Your text\n"
+#~ "         </td>\n"
+#~ "         <td>\n"
+#~ "            Translation\n"
+#~ "         </td>\n"
+#~ "      </tr>\n"
+#~ "      <tr>\n"
+#~ "         <td>\n"
+#~ "            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
+#~ "required=\"true\" rows=\"5\" cols=\"80\"/>\n"
+#~ "         </td>\n"
+#~ "         <td>\n"
+#~ "            <h:outputText value=\"#{translator.translatedText}\"/>\n"
+#~ "         </td>\n"
+#~ "      </tr>\n"
+#~ "   </table>\n"
+#~ "   <div>\n"
+#~ "      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
+#~ "{translator.translate}\"/>\n"
+#~ "   </div>\n"
+#~ "   \n"
+#~ "</h:form>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class TextTranslator implements Serializable { \n"
+#~ "\n"
+#~ "   private SentenceParser sentenceParser; \n"
+#~ "\n"
+#~ "   @EJB private Translator translator; \n"
+#~ "   \n"
+#~ "   @Inject public TextTranslator(SentenceParser sentenceParser) { \n"
+#~ "      this.sentenceParser = sentenceParser; \n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public String translate(String text) { \n"
+#~ "      StringBuilder sb = new StringBuilder(); \n"
+#~ "      for (String sentence: sentenceParser.parse(text)) { \n"
+#~ "         sb.append(translator.translate(sentence)).append(\". \"); \n"
+#~ "      } \n"
+#~ "      return sb.toString().trim(); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TextTranslator implements Serializable { \n"
+#~ "\n"
+#~ "   private SentenceParser sentenceParser; \n"
+#~ "\n"
+#~ "   @EJB private Translator translator; \n"
+#~ "   \n"
+#~ "   @Inject public TextTranslator(SentenceParser sentenceParser) { \n"
+#~ "      this.sentenceParser = sentenceParser; \n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public String translate(String text) { \n"
+#~ "      StringBuilder sb = new StringBuilder(); \n"
+#~ "      for (String sentence: sentenceParser.parse(text)) { \n"
+#~ "         sb.append(translator.translate(sentence)).append(\". \"); \n"
+#~ "      } \n"
+#~ "      return sb.toString().trim(); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator { \n"
+#~ "\n"
+#~ "   public String translate(String sentence) { \n"
+#~ "      return \"Lorem ipsum dolor sit amet\"; \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator { \n"
+#~ "\n"
+#~ "   public String translate(String sentence) { \n"
+#~ "      return \"Lorem ipsum dolor sit amet\"; \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Stateful\n"
+#~ "@RequestScoped\n"
+#~ "@Named(\"translator\")\n"
+#~ "public class TranslatorControllerBean implements TranslatorController {\n"
+#~ "\n"
+#~ "   @Inject private TextTranslator translator;\n"
+#~ "   \n"
+#~ "   private String inputText;\n"
+#~ "   \n"
+#~ "   private String translatedText;\n"
+#~ "   \n"
+#~ "   public void translate() {\n"
+#~ "      translatedText = translator.translate(inputText);\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public String getText() {\n"
+#~ "      return inputText;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void setText(String text) {\n"
+#~ "      this.inputText = text;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public String getTranslatedText() {\n"
+#~ "      return translatedText;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Remove public void remove() {}\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateful\n"
+#~ "@RequestScoped\n"
+#~ "@Named(\"translator\")\n"
+#~ "public class TranslatorControllerBean implements TranslatorController {\n"
+#~ "\n"
+#~ "   @Inject private TextTranslator translator;\n"
+#~ "   \n"
+#~ "   private String inputText;\n"
+#~ "   \n"
+#~ "   private String translatedText;\n"
+#~ "   \n"
+#~ "   public void translate() {\n"
+#~ "      translatedText = translator.translate(inputText);\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public String getText() {\n"
+#~ "      return inputText;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void setText(String text) {\n"
+#~ "      this.inputText = text;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public String getTranslatedText() {\n"
+#~ "      return translatedText;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Remove public void remove() {}\n"
+#~ "\n"
+#~ "}]]>"

Modified: doc/trunk/reference/it-IT/xml.po
===================================================================
--- doc/trunk/reference/it-IT/xml.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/it-IT/xml.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-11-23 21:23+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,338 +14,401 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: xml.xml:5
 #, fuzzy, no-c-format
 msgid "Defining beans using XML"
 msgstr "Definire i Web Beans tramite XML"
 
 #. Tag: para
-#: xml.xml:7
 #, fuzzy, no-c-format
-msgid "So far, we've seen plenty of examples of beans declared using annotations. However, there are a couple of occasions when we can't use annotations to define the bean:"
-msgstr "Finora si sono visti molti esempi di Web Bean dichiarati usando annotazioni. Comunque ci sono varie occasioni in cui non è possibile usare le annotazioni per definire un Web Bean:"
+msgid ""
+"So far, we've seen plenty of examples of beans declared using annotations. "
+"However, there are a couple of occasions when we can't use annotations to "
+"define the bean:"
+msgstr ""
+"Finora si sono visti molti esempi di Web Bean dichiarati usando annotazioni. "
+"Comunque ci sono varie occasioni in cui non è possibile usare le annotazioni "
+"per definire un Web Bean:"
 
 #. Tag: para
-#: xml.xml:14
 #, no-c-format
 msgid "when the implementation class comes from some preexisting library, or"
-msgstr "quando la classe d'implementazione proviene da qualche libreria preesistente, o"
+msgstr ""
+"quando la classe d'implementazione proviene da qualche libreria "
+"preesistente, o"
 
 #. Tag: para
-#: xml.xml:19
 #, fuzzy, no-c-format
 msgid "when there should be multiple beans with the same implementation class."
-msgstr "quando devrebbero esserci Web Beans multipli con la stessa classe d'implementazione."
+msgstr ""
+"quando devrebbero esserci Web Beans multipli con la stessa classe "
+"d'implementazione."
 
 #. Tag: para
-#: xml.xml:25
 #, no-c-format
-msgid "One way to address these problems is to write a producer method. Weld offers another option: declare the bean using XML. This feature will hopefully one day be part of the CDI specification. Until then, it remains a portable extension."
+msgid ""
+"One way to address these problems is to write a producer method. Weld offers "
+"another option: declare the bean using XML. This feature will hopefully one "
+"day be part of the CDI specification. Until then, it remains a portable "
+"extension."
 msgstr ""
 
 #. Tag: para
-#: xml.xml:31
 #, fuzzy, no-c-format
-msgid "Many frameworks use XML to provide metadata relating to Java classes. However, Weld uses a very different approach to specifying the names of Java classes, fields or methods to most other frameworks. Instead of writing class and member names as the string values of XML elements and attributes, Weld lets you use the class or member name as the name of the XML element."
-msgstr "Molti framework utilizzano XML per scrivere metadati relazionati alle classi. Web Beans usa un approccio molto diverso rispetto agli altri framework per specificare i nomi delle classi Java, dei campi o dei metodi. Invece di scrivere i nomi delle classi o dei membri come valori stringa di elementi e atttributi XML, Web Beans consente di utilizzare il nome della classe o del membro come nome dell'elemento XML."
+msgid ""
+"Many frameworks use XML to provide metadata relating to Java classes. "
+"However, Weld uses a very different approach to specifying the names of Java "
+"classes, fields or methods to most other frameworks. Instead of writing "
+"class and member names as the string values of XML elements and attributes, "
+"Weld lets you use the class or member name as the name of the XML element."
+msgstr ""
+"Molti framework utilizzano XML per scrivere metadati relazionati alle "
+"classi. Web Beans usa un approccio molto diverso rispetto agli altri "
+"framework per specificare i nomi delle classi Java, dei campi o dei metodi. "
+"Invece di scrivere i nomi delle classi o dei membri come valori stringa di "
+"elementi e atttributi XML, Web Beans consente di utilizzare il nome della "
+"classe o del membro come nome dell'elemento XML."
 
 #. Tag: para
-#: xml.xml:38
 #, no-c-format
-msgid "The advantage of this approach is that you can write an XML schema that prevents spelling errors in your XML document. It's even possible for a tool to generate the XML schema automatically from the compiled Java code. Or, an integrated development environment could perform the same validation without the need for the explicit intermediate generation step."
-msgstr "Il vantaggio di quest'approccio è che risulta possibile scrivere uno schemaXML che previene gli errori di scrittura nei documenti XML. E' comunque possibile per un tool generare lo schema XML in modo automatico dal codice Java compilato. Oppure un ambiente di sviluppo integrato può eseguire la stessa validazionesenza il bisogno di un passo di generazione intermedio ed esplicito."
+msgid ""
+"The advantage of this approach is that you can write an XML schema that "
+"prevents spelling errors in your XML document. It's even possible for a tool "
+"to generate the XML schema automatically from the compiled Java code. Or, an "
+"integrated development environment could perform the same validation without "
+"the need for the explicit intermediate generation step."
+msgstr ""
+"Il vantaggio di quest'approccio è che risulta possibile scrivere uno "
+"schemaXML che previene gli errori di scrittura nei documenti XML. E' "
+"comunque possibile per un tool generare lo schema XML in modo automatico dal "
+"codice Java compilato. Oppure un ambiente di sviluppo integrato può eseguire "
+"la stessa validazionesenza il bisogno di un passo di generazione intermedio "
+"ed esplicito."
 
 #. Tag: title
-#: xml.xml:46
 #, fuzzy, no-c-format
 msgid "Declaring beans"
 msgstr "Dichiarare classi Web Bean"
 
 #. Tag: para
-#: xml.xml:48
 #, fuzzy, no-c-format
-msgid "For each Java package, Weld defines a corresponding XML namespace. The namespace is formed by prepending <literal>urn:java:</literal> to the Java package name. For the package <literal>com.mydomain.myapp</literal>, the XML namespace is <literal>urn:java:com.mydomain.myapp</literal>."
-msgstr "Per ogni pacchetto Java, Web Beans definisce un corrispondente namespace XML. Ilnamespace è formato aggiungendo il prefisso <literal>urn:java:</literal> al nomedel pacchetto Java. Per il pacchetto <literal>com.mydomain.myapp</literal>, il namespace XML è <literal>urn:java:com.mydomain.myapp</literal>."
+msgid ""
+"For each Java package, Weld defines a corresponding XML namespace. The "
+"namespace is formed by prepending <literal>urn:java:</literal> to the Java "
+"package name. For the package <literal>com.mydomain.myapp</literal>, the XML "
+"namespace is <literal>urn:java:com.mydomain.myapp</literal>."
+msgstr ""
+"Per ogni pacchetto Java, Web Beans definisce un corrispondente namespace "
+"XML. Ilnamespace è formato aggiungendo il prefisso <literal>urn:java:</"
+"literal> al nomedel pacchetto Java. Per il pacchetto <literal>com.mydomain."
+"myapp</literal>, il namespace XML è <literal>urn:java:com.mydomain.myapp</"
+"literal>."
 
 #. Tag: para
-#: xml.xml:54
 #, no-c-format
-msgid "Java types belonging to a package are referred to using an XML element in the namespace corresponding to the package. The name of the element is the name of the Java type. Fields and methods of the type are specified by child elements in the same namespace. If the type is an annotation, members are specified by attributes of the element."
-msgstr "I tipi Java appartenenti al pacchetto vengono riferiti usando un elemento XML nel namespace corrispondente al pacchetto. Il nome dell'elemento è un nome di tipo Java. I campi e metodi del tipo vengono specificati dagli elementi figlio nello stesso namespace. Se il tipo è un'annotazione, i membri sonospecificati dagli attributi dell'elemento."
+msgid ""
+"Java types belonging to a package are referred to using an XML element in "
+"the namespace corresponding to the package. The name of the element is the "
+"name of the Java type. Fields and methods of the type are specified by child "
+"elements in the same namespace. If the type is an annotation, members are "
+"specified by attributes of the element."
+msgstr ""
+"I tipi Java appartenenti al pacchetto vengono riferiti usando un elemento "
+"XML nel namespace corrispondente al pacchetto. Il nome dell'elemento è un "
+"nome di tipo Java. I campi e metodi del tipo vengono specificati dagli "
+"elementi figlio nello stesso namespace. Se il tipo è un'annotazione, i "
+"membri sonospecificati dagli attributi dell'elemento."
 
 #. Tag: para
-#: xml.xml:61
 #, no-c-format
-msgid "For example, the element <literal>&lt;util:Date/&gt;</literal> in the following XML fragment refers to the class <literal>java.util.Date</literal>:"
-msgstr "Per esempio l'elemento <literal>&lt;util:Date/&gt;</literal> nel seguente frammento XML si riferisce alla classe <literal>java.util.Date</literal>:"
-
-#. Tag: programlisting
-#: xml.xml:66
-#, no-c-format
 msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:util=\"urn:java:java.util\">\n"
-"   <util:Date/>\n"
-"</beans>]]>"
+"For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
+"following XML fragment refers to the class <literal>java.util.Date</literal>:"
 msgstr ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:util=\"urn:java:java.util\">\n"
-"   <util:Date/>\n"
-"</beans>]]>"
+"Per esempio l'elemento <literal>&lt;util:Date/&gt;</literal> nel seguente "
+"frammento XML si riferisce alla classe <literal>java.util.Date</literal>:"
 
 #. Tag: para
-#: xml.xml:68
 #, fuzzy, no-c-format
-msgid "And this is all the code we need to declare that <literal>Date</literal> is a bean! An instance of <literal>Date</literal> may now be injected by any other bean:"
-msgstr "E questo è tutto il codice per dichiarare che <literal>Date</literal> è un Web Bean semplice! Un'istanza di <literal>Date</literal> ora può essere iniettata da qualsiasi altro Web Bean:"
+msgid ""
+"And this is all the code we need to declare that <literal>Date</literal> is "
+"a bean! An instance of <literal>Date</literal> may now be injected by any "
+"other bean:"
+msgstr ""
+"E questo è tutto il codice per dichiarare che <literal>Date</literal> è un "
+"Web Bean semplice! Un'istanza di <literal>Date</literal> ora può essere "
+"iniettata da qualsiasi altro Web Bean:"
 
-#. Tag: programlisting
-#: xml.xml:73
-#, no-c-format
-msgid "<![CDATA[private @Inject Date date;]]>"
-msgstr "<![CDATA[private @Inject Date date;]]>"
-
 #. Tag: title
-#: xml.xml:78
 #, fuzzy, no-c-format
 msgid "Declaring bean metadata"
 msgstr "Dichiarare metadati Web Bean"
 
 #. Tag: para
-#: xml.xml:80
 #, fuzzy, no-c-format
-msgid "We can declare the scope, deployment type and interceptor binding types using direct child elements of the bean declaration:"
-msgstr "E' possibile dichiarare lo scope, il tipo di deploy ed i tipi di binding degli interceptor usando elementi figli diretti della dichiarazione Web Bean:"
-
-#. Tag: programlisting
-#: xml.xml:85
-#, no-c-format
 msgid ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"   <SessionScoped/>\n"
-"   <myfwk:Transactional requiresNew=\"true\"/>\n"
-"   <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
+"We can declare the scope, deployment type and interceptor binding types "
+"using direct child elements of the bean declaration:"
 msgstr ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"   <SessionScoped/>\n"
-"   <myfwk:Transactional requiresNew=\"true\"/>\n"
-"   <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
+"E' possibile dichiarare lo scope, il tipo di deploy ed i tipi di binding "
+"degli interceptor usando elementi figli diretti della dichiarazione Web Bean:"
 
 #. Tag: para
-#: xml.xml:87
 #, fuzzy, no-c-format
 msgid "We use exactly the same approach to specify names and qualifiers:"
-msgstr "Si utilizza esattamente lo stesso approccio per specificare i nomi ed il tipo di binding:"
-
-#. Tag: programlisting
-#: xml.xml:89
-#, no-c-format
-msgid ""
-"<![CDATA[<util:Date>\n"
-"   <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <SessionScoped/>\n"
-"   <myapp:Login/>\n"
-"   <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:SystemStart/>\n"
-"   <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
 msgstr ""
-"<![CDATA[<util:Date>\n"
-"   <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <SessionScoped/>\n"
-"   <myapp:Login/>\n"
-"   <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:SystemStart/>\n"
-"   <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
+"Si utilizza esattamente lo stesso approccio per specificare i nomi ed il "
+"tipo di binding:"
 
 #. Tag: para
-#: xml.xml:91
 #, fuzzy, no-c-format
-msgid "Where <literal>@Login</literal> and <literal>@SystemStart</literal> are qualifier annotations types."
-msgstr "Dove <literal>@Login</literal> e <literal>@SystemStart</literal> sono tipi di annotazioni di binding."
-
-#. Tag: programlisting
-#: xml.xml:95
-#, no-c-format
 msgid ""
-"<![CDATA[private @Inject Date currentTime;\n"
-"private @Login Date loginTime;\n"
-"private @SystemStart Date systemStartTime;]]>"
+"Where <literal>@Login</literal> and <literal>@SystemStart</literal> are "
+"qualifier annotations types."
 msgstr ""
-"<![CDATA[private @Inject Date currentTime;\n"
-"private @Login Date loginTime;\n"
-"private @SystemStart Date systemStartTime;]]>"
+"Dove <literal>@Login</literal> e <literal>@SystemStart</literal> sono tipi "
+"di annotazioni di binding."
 
 #. Tag: para
-#: xml.xml:97
 #, fuzzy, no-c-format
 msgid "As usual, a bean may support multiple qualifier types:"
 msgstr "Di nuovo un Web Bean può supportare tipi di binding multipli:"
 
-#. Tag: programlisting
-#: xml.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"   <myapp:PayByCheque/>\n"
-"   <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
-msgstr ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"   <myapp:PayByCheque/>\n"
-"   <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
-
 #. Tag: para
-#: xml.xml:101
 #, fuzzy, no-c-format
-msgid "Interceptors and decorators are beans as well, so they may be declared just like any other bean:"
-msgstr "Interceptor e decoratori sono solo eb Bean semplici, e quindi possono essere dichiarati come qualsiasi altro Web Bean semplice:"
-
-#. Tag: programlisting
-#: xml.xml:105
-#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"   <Interceptor/>\n"
-"   <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
+"Interceptors and decorators are beans as well, so they may be declared just "
+"like any other bean:"
 msgstr ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"    <Interceptor/>\n"
-"    <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
+"Interceptor e decoratori sono solo eb Bean semplici, e quindi possono essere "
+"dichiarati come qualsiasi altro Web Bean semplice:"
 
 #. Tag: title
-#: xml.xml:110
 #, fuzzy, no-c-format
 msgid "Declaring bean members"
 msgstr "Dichiarare membri Web Bean"
 
 #. Tag: para
-#: xml.xml:112
 #, no-c-format
 msgid "TODO!"
 msgstr "DA FARE!"
 
 #. Tag: title
-#: xml.xml:119
 #, fuzzy, no-c-format
 msgid "Declaring inline beans"
 msgstr "Dichiarazione inline dei Web Beans"
 
 #. Tag: para
-#: xml.xml:121
 #, fuzzy, no-c-format
 msgid "Weld lets us define a bean at an injection point. For example:"
-msgstr "I Web Beans consentono di definire un Web Bean ad un certo punto di iniezione. Per esempio:"
+msgstr ""
+"I Web Beans consentono di definire un Web Bean ad un certo punto di "
+"iniezione. Per esempio:"
 
-#. Tag: programlisting
-#: xml.xml:123
+#. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"<![CDATA[<myapp:System>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:admin>\n"
-"      <myapp:Name>\n"
-"         <myapp:firstname>Gavin</myapp:firstname>\n"
-"         <myapp:lastname>King</myapp:lastname>\n"
-"         <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"      </myapp:Name>\n"
-"   </myapp:admin>\n"
-"</myapp:System>]]>"
+"The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
+"<literal>@Dependent</literal> and class <literal>Name</literal>, with a set "
+"of initial field values. This bean has a special, container-generated "
+"qualifier and is therefore injectable only to the specific injection point "
+"at which it is declared."
 msgstr ""
-"<![CDATA[<myapp:System>\n"
-"    <ApplicationScoped/>\n"
-"    <myapp:admin>\n"
-"        <myapp:Name>\n"
-"            <myapp:firstname>Gavin</myapp:firstname>\n"
-"            <myapp:lastname>King</myapp:lastname>\n"
-"            <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"        </myapp:Name>\n"
-"    </myapp:admin>\n"
-"</myapp:System>]]>"
+"L'elemento <literal>&lt;Name&gt;</literal> dichiara un Web Bean semplice con "
+"scope <literal>@Dependent</literal> e classe <literal>Name</literal>, con un "
+"set di valori di campo iniziali. Questo Web Bean ha uno speciale binding "
+"generatore dal container e quindi è iniettabile solo allo specifico punto di "
+"iniezione al quale è stato dichiarato."
 
 #. Tag: para
-#: xml.xml:125
 #, fuzzy, no-c-format
-msgid "The <literal>&lt;Name&gt;</literal> element declares a bean of scope <literal>@Dependent</literal> and class <literal>Name</literal>, with a set of initial field values. This bean has a special, container-generated qualifier and is therefore injectable only to the specific injection point at which it is declared."
-msgstr "L'elemento <literal>&lt;Name&gt;</literal> dichiara un Web Bean semplice con scope <literal>@Dependent</literal> e classe <literal>Name</literal>, con un set di valori di campo iniziali. Questo Web Bean ha uno speciale binding generatore dal container e quindi è iniettabile solo allo specifico punto di iniezione al quale è stato dichiarato."
+msgid ""
+"This simple but powerful feature allows the Weld XML format to be used to "
+"specify whole graphs of Java objects. It's not quite a full databinding "
+"solution, but it's close!"
+msgstr ""
+"Questa caratteristica semplice e potente consente formato XML di Web Bean di "
+"essere usato per specificare l'intero grafo di oggetti Java. Non è ancora "
+"una completa soluzione di databinding, ma ci si avvicina!"
 
-#. Tag: para
-#: xml.xml:131
-#, fuzzy, no-c-format
-msgid "This simple but powerful feature allows the Weld XML format to be used to specify whole graphs of Java objects. It's not quite a full databinding solution, but it's close!"
-msgstr "Questa caratteristica semplice e potente consente formato XML di Web Bean di essere usato per specificare l'intero grafo di oggetti Java. Non è ancora una completa soluzione di databinding, ma ci si avvicina!"
-
 #. Tag: title
-#: xml.xml:139
 #, no-c-format
 msgid "Using a schema"
 msgstr "Uso di uno schema"
 
 # tradurre frase
 #. Tag: para
-#: xml.xml:141
 #, fuzzy, no-c-format
-msgid "If we want our XML document format to be authored by people who aren't Java developers, or who don't have access to our code, we need to provide a schema. There's nothing specific to Weld about writing or using the schema."
-msgstr "Se si vuole che il formato di documento XML sia scritto da persone che non sono sviluppatori Java o che non hanno accesso al codice, occorre fornire uno schema. There's nothing specific to Web Beans about writing or using the schema."
-
-#. Tag: programlisting
-#: xml.xml:147
-#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/beans-1.0.xsd\n"
-"   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"   <myapp:System>\n"
-"      ...\n"
-"   </myapp:System>\n"
-"\n"
-"</beans>]]>"
+"If we want our XML document format to be authored by people who aren't Java "
+"developers, or who don't have access to our code, we need to provide a "
+"schema. There's nothing specific to Weld about writing or using the schema."
 msgstr ""
-"<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
-"          xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"          xsi:schemaLocation=\"urn:java:javax.webbeans http://java.sun.com/jee/web-beans-1.0.xsd\n"
-"                              urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"    <myapp:System>\n"
-"        ...\n"
-"    </myapp:System>\n"
-"\n"
-"</WebBeans>]]>"
+"Se si vuole che il formato di documento XML sia scritto da persone che non "
+"sono sviluppatori Java o che non hanno accesso al codice, occorre fornire "
+"uno schema. There's nothing specific to Web Beans about writing or using the "
+"schema."
 
 #. Tag: para
-#: xml.xml:149
 #, fuzzy, no-c-format
-msgid "Writing an XML schema is quite tedious. Therefore, the Weld project will provide a tool which automatically generates the XML schema from compiled Java code."
-msgstr "Scrivere unoschema XML è abbastanza noiso. Quindi il progetto Web Beans RI fornirà uno strumento per generare automaticamente lo schema XML dal codice Java compilato."
+msgid ""
+"Writing an XML schema is quite tedious. Therefore, the Weld project will "
+"provide a tool which automatically generates the XML schema from compiled "
+"Java code."
+msgstr ""
+"Scrivere unoschema XML è abbastanza noiso. Quindi il progetto Web Beans RI "
+"fornirà uno strumento per generare automaticamente lo schema XML dal codice "
+"Java compilato."
 
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:util=\"urn:java:java.util\">\n"
+#~ "   <util:Date/>\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:util=\"urn:java:java.util\">\n"
+#~ "   <util:Date/>\n"
+#~ "</beans>]]>"
+
+#~ msgid "<![CDATA[private @Inject Date date;]]>"
+#~ msgstr "<![CDATA[private @Inject Date date;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "   <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "   <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "   <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myapp:Login/>\n"
+#~ "   <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:SystemStart/>\n"
+#~ "   <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "   <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myapp:Login/>\n"
+#~ "   <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:SystemStart/>\n"
+#~ "   <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[private @Inject Date currentTime;\n"
+#~ "private @Login Date loginTime;\n"
+#~ "private @SystemStart Date systemStartTime;]]>"
+#~ msgstr ""
+#~ "<![CDATA[private @Inject Date currentTime;\n"
+#~ "private @Login Date loginTime;\n"
+#~ "private @SystemStart Date systemStartTime;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "   <myapp:PayByCheque/>\n"
+#~ "   <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "   <myapp:PayByCheque/>\n"
+#~ "   <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "   <Interceptor/>\n"
+#~ "   <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "    <Interceptor/>\n"
+#~ "    <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:admin>\n"
+#~ "      <myapp:Name>\n"
+#~ "         <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "         <myapp:lastname>King</myapp:lastname>\n"
+#~ "         <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "      </myapp:Name>\n"
+#~ "   </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "    <ApplicationScoped/>\n"
+#~ "    <myapp:admin>\n"
+#~ "        <myapp:Name>\n"
+#~ "            <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "            <myapp:lastname>King</myapp:lastname>\n"
+#~ "            <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "        </myapp:Name>\n"
+#~ "    </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/"
+#~ "beans-1.0.xsd\n"
+#~ "   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "   <myapp:System>\n"
+#~ "      ...\n"
+#~ "   </myapp:System>\n"
+#~ "\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
+#~ "          xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "          xsi:schemaLocation=\"urn:java:javax.webbeans http://java.sun."
+#~ "com/jee/web-beans-1.0.xsd\n"
+#~ "                              urn:java:com.mydomain.myapp http://mydomain."
+#~ "com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "    <myapp:System>\n"
+#~ "        ...\n"
+#~ "    </myapp:System>\n"
+#~ "\n"
+#~ "</WebBeans>]]>"
+
 #~ msgid "In either of these cases, Web Beans gives us two options:"
 #~ msgstr "In entrambi i casi Web Beans fornisce due opzioni:"
+
 #~ msgid "write a producer method, or"
 #~ msgstr "scrivere un metodo produttore, o"
+
 #~ msgid "declare the Web Bean using XML."
 #~ msgstr "dichiarare il Web Bean usando XML."
-

Modified: doc/trunk/reference/ja-JP/Author_Group.po
===================================================================
--- doc/trunk/reference/ja-JP/Author_Group.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/Author_Group.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Author_Group\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-07-06 12:25+1000\n"
 "Last-Translator: Noriko Mizumoto <noriko at fedoraproject.org>\n"
 "Language-Team: Japanese <fedora-trans-ja at redhat.com>\n"
@@ -16,108 +16,122 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#. Tag: author
-#: Author_Group.xml:5
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Gavin</firstname> <surname>King</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+msgid "Gavin"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:8
 #, no-c-format
 msgid "JSR-299: Contexts and Dependency Injection Lead"
 msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:14
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+msgid "Pete"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:17
 #, no-c-format
 msgid "Weld (JSR-299 RI) Lead"
 msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:24
-#, fuzzy, no-c-format
-msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
-msgstr "<firstname>David</firstname> <surname>Allen</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Dan"
+msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:31
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>David</firstname> <surname>Allen</surname>"
-msgstr "<firstname>David</firstname> <surname>Allen</surname>"
+msgid "David"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:35
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
-msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+msgid "Nicola"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:38 Author_Group.xml:67
 #, no-c-format
 msgid "Italian Translation"
 msgstr "イタリア語翻訳"
 
-#. Tag: othercredit
-#: Author_Group.xml:40
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
-msgstr "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+msgid "Gladys"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:43
 #, no-c-format
 msgid "Spanish Translation"
 msgstr "スペイン語翻訳"
 
-#. Tag: othercredit
-#: Author_Group.xml:48
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
-msgstr "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+msgid "Eun-Ju"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:51
 #, no-c-format
 msgid "Korean Translation"
 msgstr "韓国語翻訳"
 
-#. Tag: othercredit
-#: Author_Group.xml:56
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
-msgstr "<firstname>Terry</firstname> <surname>Chuang</surname>"
+msgid "Terry"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:59
 #, no-c-format
 msgid "Traditional Chinese Translation"
 msgstr "繁體中文翻訳"
 
-#. Tag: othercredit
-#: Author_Group.xml:64
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
-msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+msgid "Francesco"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:69
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
-msgstr "<firstname>Sean</firstname> <surname>Wu</surname>"
+msgid "Sean"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:72
 #, no-c-format
 msgid "Simplified Chinese Translation"
 msgstr "簡体中文翻訳"
 
+#~ msgid "<firstname>Gavin</firstname> <surname>King</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#~ msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>David</firstname> <surname>Allen</surname>"
+
+#~ msgid "<firstname>David</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>David</firstname> <surname>Allen</surname>"
+
+#~ msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+#~ msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+
+#~ msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+#~ msgstr "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+
+#~ msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+#~ msgstr "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+
+#~ msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
+#~ msgstr "<firstname>Terry</firstname> <surname>Chuang</surname>"
+
+#~ msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+#~ msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+
+#~ msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
+#~ msgstr "<firstname>Sean</firstname> <surname>Wu</surname>"
+
 #~ msgid ""
 #~ "<jobtitle>JSR-299 specification lead</jobtitle> <orgname>Red Hat "
 #~ "Middleware LLC</orgname>"

Modified: doc/trunk/reference/ja-JP/Book_Info.po
===================================================================
--- doc/trunk/reference/ja-JP/Book_Info.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/Book_Info.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-06-09 03:51+0900\n"
 "Last-Translator: Shinobu NOGAMI <s-nogami at sourceforge.jp>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: Book_Info.xml:4
 #, no-c-format
 msgid "Weld - JSR-299 Reference Implementation"
 msgstr ""
 
 #. Tag: subtitle
-#: Book_Info.xml:5
 #, fuzzy, no-c-format
 msgid ""
 "JSR-299: The new Java standard for dependency injection and contextual "

Modified: doc/trunk/reference/ja-JP/beans.po
===================================================================
--- doc/trunk/reference/ja-JP/beans.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/beans.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: beans.xml:4
 #, no-c-format
 msgid "More about beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:6
 #, no-c-format
 msgid ""
 "A bean is usually an application class that contains business logic. It may "
@@ -32,7 +30,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:13
 #, no-c-format
 msgid ""
 "Let's back up a second. What does it really mean to be <emphasis>contextual</"
@@ -45,7 +42,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:21
 #, no-c-format
 msgid ""
 "However, like a stateless or singleton model, but <emphasis>unlike</"
@@ -55,19 +51,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:29
 #, no-c-format
 msgid "the lifecycle of each instance of the bean and"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:32
 #, no-c-format
 msgid "which clients share a reference to a particular instance of the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:36
 #, no-c-format
 msgid ""
 "For a given thread in a CDI application, there may be an <emphasis>active "
@@ -78,7 +71,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:43
 #, no-c-format
 msgid ""
 "Clients (for example, other beans) executing in the same context will see "
@@ -87,7 +79,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:49
 #, no-c-format
 msgid ""
 "One great advantage of the contextual model is that it allows stateful beans "
@@ -99,46 +90,39 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:58
 #, no-c-format
 msgid "they interact via well-defined public APIs"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:61
 #, no-c-format
 msgid "their lifecycles are completely decoupled"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:65
 #, no-c-format
 msgid ""
 "We can replace one bean with another different bean that implements the same "
 "interface and has a different lifecycle (a different scope) without "
 "affecting the other bean implementation. In fact, CDI defines a simple "
 "facility for overriding bean implementations at deployment time, as we will "
-"see in <xref linkend=\"alternatives\"/>."
+"see in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:71
 #, no-c-format
 msgid ""
 "Note that not all clients of a bean are beans themselves. Other objects such "
-"as servlets or message-driven beans&#8212;which are by nature not "
-"injectable, contextual objects&#8212;may also obtain references to beans by "
-"injection."
+"as servlets or message-driven beans—which are by nature not injectable, "
+"contextual objects—may also obtain references to beans by injection."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:78
 #, no-c-format
 msgid "The anatomy of a bean"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:80
 #, no-c-format
 msgid ""
 "Enough hand-waving. More formally, the anatomy of a bean, according to the "
@@ -146,67 +130,56 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:84
 #, no-c-format
 msgid "A bean comprises the following attributes:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:87
 #, no-c-format
 msgid "A (nonempty) set of bean types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:88
 #, no-c-format
 msgid "A (nonempty) set of qualifiers"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:89
 #, no-c-format
 msgid "A scope"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:90
 #, no-c-format
 msgid "Optionally, a bean EL name"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:91
 #, no-c-format
 msgid "A set of interceptor bindings"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:92
 #, no-c-format
 msgid "A bean implementation"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:95
 #, no-c-format
 msgid "Furthermore, a bean may or may not be an alternative."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:99
 #, no-c-format
 msgid "Let's see what all this new terminology means."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:102
 #, no-c-format
 msgid "Bean types, qualifiers and dependency injection"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:104
 #, no-c-format
 msgid ""
 "Beans usually acquire references to other beans via dependency injection. "
@@ -215,19 +188,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:110
 #, no-c-format
 msgid "a bean type, together with"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:111
 #, no-c-format
 msgid "a set of qualifiers."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:114
 #, no-c-format
 msgid ""
 "A bean type is a user-defined class or interface; a type that is client-"
@@ -237,19 +207,7 @@
 "types:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:120
-#, no-c-format
-msgid ""
-"<![CDATA[public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:122
 #, no-c-format
 msgid ""
 "The bean types are <literal>BookShop</literal>, <literal>Business</literal> "
@@ -259,7 +217,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:128
 #, no-c-format
 msgid ""
 "Meanwhile, this session bean has only the local interfaces "
@@ -268,29 +225,17 @@
 "<literal>BookShopBean</literal> is not a client-visible type."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"public class BookShopBean \n"
-"      extends Business \n"
-"      implements BookShop, Auditable {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:137
 #, no-c-format
 msgid ""
-"Most bean types you can probably figure out. One gotcha is primitive types. "
-"All primitive types are assumed to be identical to their corresponding "
-"wrapper types in <literal>java.lang</literal>."
+"The bean types of a session bean include local interfaces and the bean class "
+"local view (if any). EJB remote interfaces are not considered bean types of "
+"a session bean. You can't inject an EJB using its remote interface unless "
+"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
+"linkend=\"resources\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:143
 #, no-c-format
 msgid ""
 "Bean types may be restricted to an explicit set by annotating the bean with "
@@ -300,20 +245,7 @@
 "<literal>java.lang.Object</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:149
-#, no-c-format
-msgid ""
-"<![CDATA[@Typed(Shop.class)\n"
-"public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:151
 #, no-c-format
 msgid ""
 "Sometimes, a bean type alone does not provide enough information for the "
@@ -328,7 +260,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:160
 #, no-c-format
 msgid ""
 "A qualifier is a user-defined annotation that is itself annotated "
@@ -337,18 +268,7 @@
 "string-based names. Here's an example of a qualifier annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:166
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface CreditCard {}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:168
 #, no-c-format
 msgid ""
 "You may not be used to seeing the definition of an annotation. In fact, this "
@@ -358,7 +278,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:175
 #, no-c-format
 msgid ""
 "Pay attention to the names of the built-in annotations in CDI and EJB. "
@@ -368,7 +287,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:182
 #, no-c-format
 msgid ""
 "Now that we have defined a qualifier annotation, we can use it to "
@@ -377,14 +295,7 @@
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:188
-#, no-c-format
-msgid "<![CDATA[@Inject @CreditCard PaymentProcessor paymentProcessor]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:191
 #, no-c-format
 msgid ""
 "If an injection point does not explicitly specify a qualifier, it has the "
@@ -392,7 +303,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:197
 #, no-c-format
 msgid ""
 "For each injection point, the container searches for a bean which satisfies "
@@ -402,7 +312,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:203
 #, no-c-format
 msgid ""
 "How do we specify that qualifiers of a bean? By annotating the bean class, "
@@ -411,17 +320,7 @@
 "Therefore, it satisfies our qualified injection point:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:209
-#, no-c-format
-msgid ""
-"<![CDATA[@CreditCard\n"
-"public class CreditCardPaymentProcessor \n"
-"    implements PaymentProcessor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:212
 #, no-c-format
 msgid ""
 "If a bean does not explicitly specify a qualifier, it has the default "
@@ -429,23 +328,20 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:225
 #, no-c-format
 msgid ""
 "That's not quite the end of the story. CDI also defines a simple "
 "<emphasis>resolution rule</emphasis> that helps the container decide what to "
 "do if there is more than one bean that satisfies a particular contract. "
-"We'll get into the details in <xref linkend=\"injection\"/>."
+"We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:245
 #, no-c-format
 msgid "Scope"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:248
 #, no-c-format
 msgid ""
 "The <emphasis>scope</emphasis> of a bean defines the lifecycle and "
@@ -456,23 +352,13 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:255
 #, no-c-format
 msgid ""
 "For example, any web application may have <emphasis>session scoped</"
 "emphasis> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:259
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:261
 #, no-c-format
 msgid ""
 "An instance of a session-scoped bean is bound to a user session and is "
@@ -480,7 +366,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:265
 #, no-c-format
 msgid ""
 "Keep in mind that once a bean is bound to a context, it remains in that "
@@ -491,7 +376,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:273
 #, no-c-format
 msgid ""
 "If a scope is not explicitly specified, then the bean belongs to a special "
@@ -501,19 +385,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:279
 #, no-c-format
-msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\"/>."
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:284
 #, no-c-format
 msgid "EL name"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:286
 #, no-c-format
 msgid ""
 "If you want to reference a bean in non-Java code that supports Unified EL "
@@ -522,38 +403,18 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:291
 #, no-c-format
 msgid ""
 "The EL name is specified using the <literal>@Named</literal> annotation, as "
 "shown here:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:295
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named(\"cart\")\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:297
 #, no-c-format
 msgid "Now we can easily use the bean in any JSF or JSP page:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:299
-#, no-c-format
-msgid ""
-"<![CDATA[<h:dataTable value=\"#{cart.lineItems}\" var=\"item\">\n"
-"   ...\n"
-"</h:dataTable>]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:302
 #, no-c-format
 msgid ""
 "The <literal>@Named</literal> annotation is not what makes the class a bean. "
@@ -563,23 +424,13 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:309
 #, no-c-format
 msgid ""
 "We can let CDI choose a name for us by leaving off the value of the "
 "<literal>@Named</literal> annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:313
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:315
 #, no-c-format
 msgid ""
 "The name defaults to the unqualified class name, decapitalized; in this "
@@ -587,13 +438,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:325
 #, no-c-format
 msgid "Alternatives"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:327
 #, no-c-format
 msgid ""
 "We've already seen how qualifiers let us choose between multiple "
@@ -605,42 +454,30 @@
 "literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:335
-#, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class MockPaymentProcessor extends PaymentProcessorImpl { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:337
 #, no-c-format
 msgid ""
 "We normally annotate a bean <literal>@Alternative</literal> only when there "
 "is some other implementation of an interface it implements (or of any of its "
 "bean types). We can choose between alternatives at deployment time by "
 "<emphasis>selecting</emphasis> an alternative in the CDI deployment "
-"descriptor <literal>META-INF/beans.xml</literal> of the JAR or Java EE "
+"descriptor <literal>META-INF/beans.xml</literal> of the jar or Java EE "
 "module that uses it. Different modules can specify that they use different "
 "alternatives."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:345
 #, no-c-format
 msgid ""
-"We cover alternatives in more detail in <xref linkend=\"alternatives\"/>."
+"We cover alternatives in more detail in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:352
 #, no-c-format
 msgid "Interceptor binding types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:354
 #, no-c-format
 msgid ""
 "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, "
@@ -651,7 +488,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:361
 #, no-c-format
 msgid ""
 "The way that interceptors were defined in Java EE 5 was counter-intuitive. "
@@ -668,7 +504,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:372
 #, no-c-format
 msgid ""
 "CDI provides a new approach to binding interceptors to beans that introduces "
@@ -678,7 +513,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:378
 #, no-c-format
 msgid ""
 "An interceptor binding type is a user-defined annotation that is itself "
@@ -687,51 +521,21 @@
 "two classes."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:383
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Inherited\n"
-"@Target( { TYPE, METHOD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:385
 #, no-c-format
 msgid ""
 "The interceptor that implements transaction management declares this "
 "annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[public @Transactional @Interceptor\n"
-"class TransactionInterceptor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:391
 #, no-c-format
 msgid ""
 "We can apply the interceptor to a bean by annotating the bean class with the "
 "same interceptor binding type:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:395
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Transactional\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:397
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
@@ -740,32 +544,28 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:402
 #, no-c-format
 msgid ""
 "Interceptors are deployment-specific. (We don't need a "
 "<literal>TransactionInterceptor</literal> in our unit tests!) By default, an "
 "interceptor is disabled. We can enable an interceptor using the CDI "
-"deployment descriptor <literal>META-INF/beans.xml</literal> of the JAR or "
+"deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or "
 "Java EE module. This is also where we specify the interceptor ordering."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:409
 #, no-c-format
 msgid ""
 "We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
-"\"interceptors\"/> and <xref linkend=\"decorators\"/>."
+"\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:419
 #, no-c-format
 msgid "What kinds of classes are beans?"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:421
 #, no-c-format
 msgid ""
 "We've already seen two types of beans: JavaBeans and EJB session beans. Is "
@@ -774,13 +574,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:428
 #, no-c-format
 msgid "Managed beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:430
 #, no-c-format
 msgid ""
 "A managed bean is a Java class. The basic lifecycle and semantics of a "
@@ -792,19 +590,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:441
 #, no-c-format
 msgid "It is not a non-static inner class."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:444
 #, no-c-format
 msgid "It is a concrete class, or is annotated <literal>@Decorator</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:447
 #, no-c-format
 msgid ""
 "It is not annotated with an EJB component-defining annotation or declared as "
@@ -812,7 +607,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:453
 #, no-c-format
 msgid ""
 "It does not implement <literal>javax.enterprise.inject.spi.Extension</"
@@ -820,34 +614,41 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:456
 #, no-c-format
-msgid "It has an appropriate constructor&#8212;either:"
+msgid "It has an appropriate constructor—either:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:461
 #, no-c-format
 msgid "the class has a constructor with no parameters, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:464
 #, no-c-format
 msgid "the class declares a constructor annotated <literal>@Inject</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:472
 #, no-c-format
 msgid ""
+"According to this definition, JPA entities are technically managed beans. "
+"However, entities have their own special lifecycle, state and identity model "
+"and are usually instantiated by JPA or using <literal>new</literal>. "
+"Therefore we don't recommend directly injecting an entity class. We "
+"especially recommend against assigning a scope other than "
+"<literal>@Dependent</literal> to an entity class, since JPA is not able to "
+"persist injected CDI proxies."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The unrestricted set of bean types for a managed bean contains the bean "
 "class, every superclass and all interfaces it implements directly or "
 "indirectly."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:475
 #, no-c-format
 msgid ""
 "If a managed bean has a public field, it must have the default scope "
@@ -855,7 +656,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:477
 #, no-c-format
 msgid ""
 "Managed beans support the <literal>@PostConstruct</literal> and "
@@ -863,7 +663,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:480
 #, no-c-format
 msgid ""
 "Session beans are also, technically, managed beans. However, since they have "
@@ -873,13 +672,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:489
 #, no-c-format
 msgid "Session beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:491
 #, no-c-format
 msgid ""
 "Session beans belong to the EJB specification. They have a special "
@@ -892,7 +689,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:500
 #, no-c-format
 msgid ""
 "Message-driven and entity beans are by nature non-contextual objects and may "
@@ -904,7 +700,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:508
 #, no-c-format
 msgid ""
 "The unrestricted set of bean types for a session bean contains all local "
@@ -916,7 +711,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:516
 #, no-c-format
 msgid ""
 "There's no reason to explicitly declare the scope of a stateless session "
@@ -927,20 +721,18 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:520
 #, no-c-format
 msgid ""
 "Stateful session beans may define a <emphasis>remove method</emphasis>, "
 "annotated <literal>@Remove</literal>, that is used by the application to "
 "indicate that an instance should be destroyed. However, for a contextual "
-"instance of the bean&#8212;an instance under the control of CDI&#8212;this "
-"method may only be called by the application if the bean has scope "
-"<literal>@Dependent</literal>. For beans with other scopes, the application "
-"must let the container destroy the bean."
+"instance of the bean—an instance under the control of CDI—this method may "
+"only be called by the application if the bean has scope <literal>@Dependent</"
+"literal>. For beans with other scopes, the application must let the "
+"container destroy the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:528
 #, no-c-format
 msgid ""
 "So, when should we use a session bean instead of a plain managed bean? "
@@ -948,19 +740,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:535
 #, no-c-format
 msgid "method-level transaction management and security,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:538
 #, no-c-format
 msgid "concurrency management,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:541
 #, no-c-format
 msgid ""
 "instance-level passivation for stateful session beans and instance-pooling "
@@ -968,19 +757,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:545
 #, no-c-format
 msgid "remote or web service invocation, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:548
 #, no-c-format
 msgid "timers and asynchronous methods,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:552
 #, no-c-format
 msgid ""
 "When we don't need any of these things, an ordinary managed bean will serve "
@@ -988,7 +774,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:554
 #, no-c-format
 msgid ""
 "Many beans (including any <literal>@SessionScoped</literal> or "
@@ -998,7 +783,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:560
 #, no-c-format
 msgid ""
 "Beans which hold references to heavy-weight resources, or hold a lot of "
@@ -1008,7 +792,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:566
 #, no-c-format
 msgid ""
 "Finally, it's usually obvious when method-level transaction management, "
@@ -1017,7 +800,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:571
 #, no-c-format
 msgid ""
 "The point we're trying to make is: use a session bean when you need the "
@@ -1030,7 +812,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:579
 #, no-c-format
 msgid ""
 "On the other hand, don't be scared to use session beans just because you've "
@@ -1043,13 +824,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:590
 #, no-c-format
 msgid "Producer methods"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:592
 #, no-c-format
 msgid ""
 "Not everything that needs to be injected can be boiled down to a bean class "
@@ -1061,7 +840,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:600
 #, no-c-format
 msgid ""
 "A <emphasis>producer method</emphasis> is a method that acts as a source of "
@@ -1072,64 +850,31 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:607
 #, no-c-format
 msgid ""
 "A producer method is declared by annotating a method of a bean class with "
 "the <literal>@Produces</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:612
-#, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class RandomNumberGenerator {\n"
-"   \n"
-"   private Random random = new Random(System.currentTimeMillis());\n"
-"       \n"
-"   @Produces @Named @Random int getRandomNumber() {\n"
-"      return random.nextInt(100);\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:614
 #, no-c-format
 msgid ""
 "We can't write a bean class that is itself a random number. But we can "
 "certainly write a method that returns a random number. By making the method "
-"a producer method, we allow the return value of the method&#8212;in this "
-"case an <literal>Integer</literal>&#8212;to be injected. We can even specify "
-"a qualifier&#8212;in this case <literal>@Random</literal>, a scope&#8212;"
-"which in this case defaults to <literal>@Dependent</literal>, and an EL "
-"name&#8212;which in this case defaults to <literal>randomNumber</literal> "
-"according to the JavaBeans property name convention. Now we can get a random "
-"number anywhere:"
+"a producer method, we allow the return value of the method—in this case an "
+"<literal>Integer</literal>—to be injected. We can even specify a qualifier—"
+"in this case <literal>@Random</literal>, a scope—which in this case defaults "
+"to <literal>@Dependent</literal>, and an EL name—which in this case defaults "
+"to <literal>randomNumber</literal> according to the JavaBeans property name "
+"convention. Now we can get a random number anywhere:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:623
-#, no-c-format
-msgid "<![CDATA[@Inject @Random int randomNumber;]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:625
 #, no-c-format
 msgid "Even in a Unified EL expression:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:629
-#, no-c-format
-msgid "<![CDATA[<p>Your raffle number is #{randomNumber}.</p>]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:631
 #, no-c-format
 msgid ""
 "A producer method must be a non-abstract method of a managed bean class or "
@@ -1139,13 +884,11 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:637
 #, no-c-format
 msgid "The bean types of a producer method depend upon the method return type:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:643
 #, no-c-format
 msgid ""
 "If the return type is an interface, the unrestricted set of bean types "
@@ -1154,7 +897,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:649
 #, no-c-format
 msgid ""
 "If a return type is primitive or is a Java array type, the unrestricted set "
@@ -1163,7 +905,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:655
 #, no-c-format
 msgid ""
 "If the return type is a class, the unrestricted set of bean types contains "
@@ -1172,59 +913,43 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:662
 #, no-c-format
 msgid ""
-"If the producer method has method parameters, the container will look for a "
-"bean that satisfies the type and qualifiers of each parameter and pass it to "
-"the method automatically&#8212;another form of dependency injection."
+"Producer methods and fields may have a primitive bean type. For the purpose "
+"of resolving dependencies, primitive types are considered to be identical to "
+"their corresponding wrapper types in <literal>java.lang</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:668
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Produces Set<Roles> getRoles(User user) {\n"
-"   return user.getRoles();\n"
-"}]]>"
+"If the producer method has method parameters, the container will look for a "
+"bean that satisfies the type and qualifiers of each parameter and pass it to "
+"the method automatically—another form of dependency injection."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:670
 #, no-c-format
 msgid ""
 "We'll talk much more about producer methods in <xref linkend="
-"\"producermethods\"/>."
+"\"producermethods\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:675
 #, no-c-format
 msgid "Producer fields"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:677
 #, no-c-format
 msgid ""
 "A <emphasis>producer field</emphasis> is a simpler alternative to a producer "
 "method. A producer field is declared by annotating a field of a bean class "
-"with the <literal>@Produces</literal> annotation&#8212;the same annotation "
-"used for producer methods."
+"with the <literal>@Produces</literal> annotation—the same annotation used "
+"for producer methods."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:683
-#, no-c-format
-msgid ""
-"<![CDATA[public class Shop {\n"
-"   @Produces PaymentProcessor paymentProcessor = ....;\n"
-"   @Produces @Catalog List<Product> products = ....;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:685
 #, no-c-format
 msgid ""
 "The rules for determining the bean types of a producer field parallel the "
@@ -1232,415 +957,12 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:689
 #, no-c-format
 msgid ""
 "A producer field is really just a shortcut that lets us avoid writing a "
 "useless getter method. However, in addition to convenience, producer fields "
 "serve a specific purpose as an adaptor for Java EE component environment "
 "injection, but to learn more about that, you'll have to wait until <xref "
-"linkend=\"resources\"/>. Because we can't wait to get to work on some "
+"linkend=\"resources\" />. Because we can't wait to get to work on some "
 "examples."
 msgstr ""
-
-#. Tag: title
-#: beans.xml:701
-#, no-c-format
-msgid "The (minimal) bean descriptor"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:703
-#, no-c-format
-msgid ""
-"First, it's important to understand that the XML bean descriptor in CDI "
-"(beans.xml) is not there to define beans in XML, like in other popular bean "
-"containers. Rather, you use this file to enable CDI services for the current "
-"bean archive that is difficult to define consistently in Java or which you "
-"don't want to define in Java (e.g., to accomodate testing)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:710
-#, no-c-format
-msgid ""
-"For example, the XML is used to enable interceptors (which are disabled by "
-"default) and define interceptor ordering. So the bean descriptor "
-"<emphasis>complements</emphasis> the metadata that is provided in the Java "
-"language syntax. (You may still want to define beans in XML for other "
-"reasons, but that is the concern of an extension)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:717
-#, no-c-format
-msgid ""
-"Let's first ask why the beans.xml is required, then look at what services it "
-"is used used to enable."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:722
-#, no-c-format
-msgid "Why is beans.xml required?"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:724
-#, no-c-format
-msgid ""
-"You may be wondering, if beans are not described using XML, why do we need "
-"beans.xml at all, particularly if you don't have anything that you would "
-"need the bean descriptor to enable (alternatives, interceptors or "
-"decorators)?"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:730
-#, no-c-format
-msgid "There are two things about CDI that we need to keep in mind:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:736
-#, no-c-format
-msgid ""
-"CDI does not require any special declaration for a Java class to be injected "
-"- that's right, no annotation or XML declaration at all!"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:742
-#, no-c-format
-msgid ""
-"CDI does not define any special kind of module - CDI beans can be deployed "
-"in a library JAR, EJB JAR, WAR, RAR, or JVM classpath directory."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:749
-#, no-c-format
-msgid ""
-"The CDI specification calls the process of identifying beans in modules "
-"<emphasis>bean discovery</emphasis>."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:753
-#, no-c-format
-msgid ""
-"So there are potentially a lot of classes in the classpath which might be "
-"beans! We don't want to force the container to scan every one of those "
-"classes at startup and build its internal metamodel for each of them. This "
-"really could make bean discovery very slow."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:759
-#, no-c-format
-msgid ""
-"But there's another reason we need to give the user some control over which "
-"classes are available for injection. We don't want every class in the "
-"classpath to potentially match an injection point, including classes that "
-"were never intended to be injected into things. This would force the "
-"developer to have to use qualifiers much more often to disambiguate "
-"injection points."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:766
-#, no-c-format
-msgid "So we have two choices. We could have the developer:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:772
-#, no-c-format
-msgid "explicitly exclude modules which do not contain beans, or"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:775
-#, no-c-format
-msgid "explicitly declare modules which do contain beans."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:779
-#, no-c-format
-msgid ""
-"It should be clear that the second option is a much better way to go. Thus, "
-"CDI has the notion of a bean archive. A bean archive is just a module that "
-"has a file named beans.xml in the META-INF directory. The container looks "
-"for beans in bean archives. It ignores other modules."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:785
-#, no-c-format
-msgid ""
-"Now, you might be wondering if we've got the granularity wrong here. Why "
-"should module be the right criteria to use for including/excluding a class. "
-"Why not consider:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:792
-#, no-c-format
-msgid "a class-level annotation,"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:795
-#, no-c-format
-msgid "the package,"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:798
-#, no-c-format
-msgid "some type it implements or extends, or"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:801
-#, no-c-format
-msgid "some naming convention."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:805
-#, no-c-format
-msgid ""
-"We've got the first option covered. Annotate a bean <literal>@Alternative</"
-"literal>, or with an alternative stereotype, and it will be considered "
-"disabled by CDI, as long as you don't explicitly enable it in beans.xml. "
-"That's not quite the same thing as excluding the class from scanning "
-"altogether, but it's close. (One difference is that a portable extension "
-"with still get a <literal>ProcessAnnotatedType</literal> event for that "
-"class)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:813
-#, no-c-format
-msgid ""
-"A future version of CDI might allow you to declare excluded packages in "
-"beans.xml. Excluding a bean by type or naming convention isn't really that "
-"appealing. In the world of CDI, we use stereotypes for identifying "
-"architectural roles. We don't use marker interfaces or naming conventions. "
-"Names really shouldn't affect functionality as it is too fragile."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:820
-#, no-c-format
-msgid "Enough theory, what elements are available in beans.xml?"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:826
-#, no-c-format
-msgid "Bean descriptor schema"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:828
-#, no-c-format
-msgid ""
-"If you don't need to activate any interceptors, decorators or alternatives "
-"(you just have plain beans that you need to use in an archive), the beans."
-"xml file can be <emphasis>empty</emphasis>. If you do have one of these "
-"requirements, then you need to start popularing the descriptor."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:834
-#, no-c-format
-msgid ""
-"The root element of a beans.xml file is <literal>beans</literal>, with the "
-"following <ulink url=\"http://anonsvn.jboss.org/repos/weld/api/trunk/cdi/src/"
-"main/resources/beans.xsd\">schema</ulink>:"
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:839
-#, no-c-format
-msgid ""
-"<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<beans xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee \n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"</beans>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:841
-#, no-c-format
-msgid ""
-"The <literal>beans</literal> element can have one or more of each of the "
-"following children:"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:847
-#, no-c-format
-msgid "interceptors"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:850
-#, no-c-format
-msgid "decorators"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:853
-#, no-c-format
-msgid "alternatives"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:857
-#, no-c-format
-msgid "Let's look at each element in detail."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:862
-#, no-c-format
-msgid "&lt;interceptors&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:864
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled interceptors bound via interceptor "
-"bindings. An interceptor must be explicitly enabled by listing the fully "
-"qualified class name in a child &lt;class&gt; element of &lt;"
-"interceptors&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:870
-#, no-c-format
-msgid ""
-"There may be zero or more interceptor class elements. The order of the class "
-"declarations determines the interceptor ordering. Interceptors which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an interceptor "
-"class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:877
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.intercept.SecurityInterceptor</class>\n"
-"   <class>com.acme.intercept.TransactionInterceptor</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:883
-#, no-c-format
-msgid "&lt;decorators&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:885
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled decorators. A decorator must be "
-"explicitly enabled by listing the fully qualified class name in a child &lt;"
-"class&gt; element of &lt;decorators&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:891
-#, no-c-format
-msgid ""
-"There may be zero or more decorator class elements. The order of the class "
-"declarations determines the decorator ordering. Decorators which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an decorator class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:898
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.decorate.BigAccountDecorator</class>\n"
-"   <class>com.acme.decorate.SpecialGiftDecorator</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:903
-#, no-c-format
-msgid "&lt;alternatives&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:905
-#, no-c-format
-msgid ""
-"An alternative is a bean that must be explicitly declared in the beans.xml "
-"file if it should be available for lookup, injection or EL resolution. By "
-"default, a bean archive has no active alternatives. An alternative must be "
-"explicitly declared using the fully qualified bean class name or stereotype "
-"class name in either a child &lt;class&gt; or &lt;stereotype&gt; element of "
-"&lt;alternatives&gt;, respectively."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:913
-#, no-c-format
-msgid ""
-"An alternative is selected for the bean archive if either: the alternative "
-"is a managed bean or session bean and the bean class of the bean is listed, "
-"or the alternative is a producer method, field or resource, and the bean "
-"class that declares the method or field is listed, or any "
-"<literal>@Alternative</literal> stereotype of the alternative is listed."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:920
-#, no-c-format
-msgid ""
-"There may be zero or more alternative bean class elements. The same class "
-"may not be listed twice. And of course, the class must exist and it must be "
-"an alternative bean class."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:925
-#, no-c-format
-msgid ""
-"There may also be zero or more <literal>@Alternative</literal> stereotype "
-"elements. The same stereotype may not be listed twice. And of course, the "
-"stereotype class must exist and it must be an stereotype annotation."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:931
-#, no-c-format
-msgid ""
-"<![CDATA[<stereotypes>\n"
-"   <class>com.acme.business.MockPaymentProcessor</class>\n"
-"   <stereotype>com.acme.stereotype.Mock</stereotype>\n"
-"</stereotypes>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:935
-#, no-c-format
-msgid ""
-"And that's it! A very simple schema, used only to activate and order CDI "
-"services."
-msgstr ""

Modified: doc/trunk/reference/ja-JP/decorators.po
===================================================================
--- doc/trunk/reference/ja-JP/decorators.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/decorators.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-04-30 23:45+0900\n"
 "Last-Translator: Fusayuki Minamoto <miki.htmnet at nifty.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: decorators.xml:5
 #, no-c-format
 msgid "Decorators"
 msgstr "デコレータ"
 
 #. Tag: para
-#: decorators.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors are a powerful way to capture and separate concerns which are "
@@ -40,7 +38,6 @@
 "ではありません。"
 
 #. Tag: para
-#: decorators.xml:15
 #, fuzzy, no-c-format
 msgid ""
 "The reverse is true of <emphasis>decorators</emphasis>. A decorator "
@@ -62,32 +59,12 @@
 "す。"
 
 #. Tag: para
-#: decorators.xml:24
 #, no-c-format
 msgid "Suppose we have an interface that represents accounts:"
 msgstr ""
 "次のような口座 (account) を表現するインタフェースがあると仮定しましょう。"
 
-#. Tag: programlisting
-#: decorators.xml:26
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface Account {\n"
-"   public BigDecimal getBalance();\n"
-"   public User getOwner();\n"
-"   public void withdraw(BigDecimal amount);\n"
-"   public void deposit(BigDecimal amount);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface Account {\n"
-"    public BigDecimal getBalance();\n"
-"    public User getOwner();\n"
-"    public void withdraw(BigDecimal amount);\n"
-"    public void deposit(BigDecimal amount);\n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:28
 #, fuzzy, no-c-format
 msgid ""
 "Several different beans in our system implement the <literal>Account</"
@@ -101,7 +78,6 @@
 "です。"
 
 #. Tag: para
-#: decorators.xml:34
 #, fuzzy, no-c-format
 msgid ""
 "A decorator is a bean (possibly even an abstract class) that implements the "
@@ -110,74 +86,14 @@
 "デコレータは <literal>@Decorator</literal> というアノテーションによって修飾さ"
 "れた型を実装するシンプル Web Beanです。"
 
-#. Tag: programlisting
-#: decorators.xml:39
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[<Decorators>\n"
-"    <myapp:LargeTransactionDecorator/>\n"
-"</Decorators>]]>"
-
 #. Tag: para
-#: decorators.xml:41
 #, no-c-format
 msgid ""
 "The decorator implements the methods of the decorated type that it wants to "
 "intercept."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:45
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      ...\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator \n"
-"        implements Account {\n"
-"    \n"
-"    @Decorates Account account;\n"
-"    \n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    public void withdraw(BigDecimal amount) {\n"
-"        account.withdraw(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedWithdrawl(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"    public void deposit(BigDecimal amount);\n"
-"        account.deposit(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedDeposit(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "Unlike other beans, a decorator may be an abstract class. Therefore, if "
@@ -189,7 +105,6 @@
 "なことをする必要がなければ、そのメソッドを実装する必要はありません。"
 
 #. Tag: para
-#: decorators.xml:52
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors for a method are called before decorators that apply to the "
@@ -199,13 +114,11 @@
 "び出されます。"
 
 #. Tag: title
-#: decorators.xml:57
 #, fuzzy, no-c-format
 msgid "Delegate object"
 msgstr "移譲属性"
 
 #. Tag: para
-#: decorators.xml:59
 #, no-c-format
 msgid ""
 "Decorators have a special injection point, called the <emphasis>delegate "
@@ -215,38 +128,22 @@
 "method parameter or injected field."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:67
 #, fuzzy, no-c-format
 msgid "A decorator is bound to any bean which:"
 msgstr "デコレータは以下の任意のWeb Beanに結びつきます。"
 
 #. Tag: para
-#: decorators.xml:71
 #, fuzzy, no-c-format
 msgid "has the type of the delegate injection point as a bean type, and"
 msgstr "APIタイプとして移譲属性のタイプを持つものと、"
 
 #. Tag: para
-#: decorators.xml:74
 #, fuzzy, no-c-format
 msgid "has all qualifiers that are declared at the delegate injection point."
 msgstr "移譲属性によって宣言されるすべてのバインディングタイプを持つもの"
 
 #. Tag: para
-#: decorators.xml:78
 #, fuzzy, no-c-format
 msgid ""
 "This delegate injection point specifies that the decorator is bound to all "
@@ -255,14 +152,7 @@
 "この移譲属性は、デコレータが <literal>Account</literal> を実装するすべての"
 "Web Beansに対して結びついていることを指定します。"
 
-#. Tag: programlisting
-#: decorators.xml:83
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
-msgstr "<![CDATA[@Decorates Account account;]]>"
-
 #. Tag: para
-#: decorators.xml:85
 #, fuzzy, no-c-format
 msgid ""
 "A delegate injection point may specify any number of qualifier annotations. "
@@ -271,14 +161,7 @@
 "移譲属性はバインディングアノテーションを指定するかもしれません。そのときは、"
 "デコレータは同じバインディングを持つWeb Beansに結びつくだけです。"
 
-#. Tag: programlisting
-#: decorators.xml:90
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
-msgstr "<![CDATA[@Decorates @Foreign Account account;]]>"
-
 #. Tag: para
-#: decorators.xml:92
 #, fuzzy, no-c-format
 msgid ""
 "The decorator may invoke the delegate object, which has much the same effect "
@@ -290,64 +173,12 @@
 "ら <literal>InvocationContext.proceed()</literal> を呼び出すのと同じ効果があ"
 "ります。"
 
-#. Tag: programlisting
-#: decorators.xml:98
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      account.withdraw(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedWithdrawl(amount) );\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      account.deposit(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedDeposit(amount) );\n"
-"      }\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator \n"
-"        implements Account {\n"
-"    \n"
-"    @Decorates Account account;\n"
-"    \n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    public void withdraw(BigDecimal amount) {\n"
-"        account.withdraw(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedWithdrawl(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"    public void deposit(BigDecimal amount);\n"
-"        account.deposit(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedDeposit(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: title
-#: decorators.xml:103
 #, no-c-format
 msgid "Enabling decorators"
 msgstr "デコレータの有効化"
 
 #. Tag: para
-#: decorators.xml:105
 #, no-c-format
 msgid ""
 "By default, all decorators are disabled. We need to <emphasis>enable</"
@@ -355,24 +186,7 @@
 "bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:111
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <decorators>\n"
-"         <class>org.mycompany.myapp.LargeTransactionDecorator</class>\n"
-"   </decorators>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:113
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
@@ -382,7 +196,6 @@
 "ンタセプタに対するものと同じ目的を持ちます。"
 
 #. Tag: para
-#: decorators.xml:120
 #, no-c-format
 msgid ""
 "it enables us to specify a total ordering for all decorators in our system, "
@@ -392,13 +205,138 @@
 "す。"
 
 #. Tag: para
-#: decorators.xml:126
 #, no-c-format
 msgid "it lets us enable or disable decorator classes at deployment time."
 msgstr ""
 "デプロイ時にデコレータクラスを有効にしたり無効にしたりできるようにします。"
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "   public BigDecimal getBalance();\n"
+#~ "   public User getOwner();\n"
+#~ "   public void withdraw(BigDecimal amount);\n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "    public BigDecimal getBalance();\n"
+#~ "    public User getOwner();\n"
+#~ "    public void withdraw(BigDecimal amount);\n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[<Decorators>\n"
+#~ "    <myapp:LargeTransactionDecorator/>\n"
+#~ "</Decorators>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator \n"
+#~ "        implements Account {\n"
+#~ "    \n"
+#~ "    @Decorates Account account;\n"
+#~ "    \n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    public void withdraw(BigDecimal amount) {\n"
+#~ "        account.withdraw(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "        account.deposit(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedDeposit(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
+#~ msgstr "<![CDATA[@Decorates Account account;]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
+#~ msgstr "<![CDATA[@Decorates @Foreign Account account;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      account.withdraw(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      account.deposit(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedDeposit(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator \n"
+#~ "        implements Account {\n"
+#~ "    \n"
+#~ "    @Decorates Account account;\n"
+#~ "    \n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    public void withdraw(BigDecimal amount) {\n"
+#~ "        account.withdraw(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "        account.deposit(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedDeposit(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "All decorators have a <emphasis>delegate attribute</emphasis>. The type "
 #~ "and binding types of the delegate attribute determine which Web Beans the "
 #~ "decorator is bound to. The delegate attribute type must implement or "

Modified: doc/trunk/reference/ja-JP/dependencies.po
===================================================================
--- doc/trunk/reference/ja-JP/dependencies.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/dependencies.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: dependencies.xml:5
 #, no-c-format
 msgid "Weld project dependencies"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:7
 #, no-c-format
 msgid ""
 "This section lists compile-time and runtime dependencies for Weld. This list "
@@ -30,105 +28,88 @@
 msgstr ""
 
 #. Tag: title
-#: dependencies.xml:13
 #, no-c-format
 msgid "Artifacts coming from Sun"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:21 dependencies.xml:110
 #, no-c-format
 msgid "Artifact"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:24 dependencies.xml:113
 #, no-c-format
 msgid "Scope"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:33
+#. Tag: para
 #, no-c-format
-msgid "javax.ejb:ejb-api:3.1"
+msgid "<literal>javax.ejb:ejb-api:3.1</literal>"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:36 dependencies.xml:44 dependencies.xml:52
-#: dependencies.xml:60 dependencies.xml:68 dependencies.xml:76
-#: dependencies.xml:128
 #, no-c-format
 msgid "compile"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:41
+#. Tag: para
 #, no-c-format
-msgid "javax.faces:jsf-api:2.0"
+msgid "<literal>javax.faces:jsf-api:2.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:49
+#. Tag: para
 #, no-c-format
-msgid "javax.el:el-api:2.1"
+msgid "<literal>javax.el:el-api:2.1</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:57
+#. Tag: para
 #, no-c-format
-msgid "javax.persistence:persistence-api:2.0"
+msgid "<literal>javax.persistence:persistence-api:2.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:65
+#. Tag: para
 #, no-c-format
-msgid "javax.servlet:servlet-api:3.0"
+msgid "<literal>javax.servlet:servlet-api:3.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:73
+#. Tag: para
 #, no-c-format
-msgid "javax.interceptor:interceptor-api:1.1"
+msgid "<literal>javax.interceptor:interceptor-api:1.1</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:81
+#. Tag: para
 #, no-c-format
-msgid "org.glasfish.web:el-impl:2.1.2"
+msgid "<literal>org.glasfish.web:el-impl:2.1.2</literal>"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:84 dependencies.xml:92
 #, no-c-format
 msgid "runtime"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:89
+#. Tag: para
 #, no-c-format
-msgid "javax.faces:jsf-impl:2.0.x"
+msgid "<literal>javax.faces:jsf-impl:2.0.x</literal>"
 msgstr ""
 
 #. Tag: title
-#: dependencies.xml:101
 #, no-c-format
 msgid "Artifacts coming from Hibernate"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:116
 #, no-c-format
 msgid "Notes"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:125
+#. Tag: para
 #, no-c-format
-msgid "javax.validation:validation-api"
+msgid "<literal>javax.validation:validation-api</literal>"
 msgstr ""
 
-#. Tag: ulink
-#: dependencies.xml:131
+#. Tag: para
 #, no-c-format
-msgid "BVAL-193"
+msgid ""
+"<ulink url=\"http://opensource.atlassian.com/projects/hibernate/browse/BVAL-"
+"193\">BVAL-193</ulink>"
 msgstr ""

Modified: doc/trunk/reference/ja-JP/ee.po
===================================================================
--- doc/trunk/reference/ja-JP/ee.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/ee.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-04-19 01:59+0900\n"
 "Last-Translator: wadahiro <wadahiro at gmail.com>\n"
 "Language-Team: none\n"
@@ -15,13 +15,11 @@
 "X-Poedit-Bookmarks: -1,7,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
 #. Tag: title
-#: ee.xml:4
 #, no-c-format
 msgid "Java EE integration"
 msgstr "Java EEへの統合"
 
 #. Tag: para
-#: ee.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "CDI is fully integrated into the Java EE environment. Beans have access to "
@@ -36,13 +34,11 @@
 "やメッセージ駆動型Beanなどのオブジェクトにインジェクトされるかもしれません。"
 
 #. Tag: title
-#: ee.xml:13
 #, no-c-format
 msgid "Built-in beans"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:15
 #, no-c-format
 msgid ""
 "In the Java EE environment, the container provides the following built-in "
@@ -50,20 +46,17 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:22
 #, no-c-format
 msgid "the current JTA <literal>UserTransaction</literal>,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:27
 #, no-c-format
 msgid ""
 "a <literal>Principal</literal> representing the current caller identity,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:32
 #, no-c-format
 msgid ""
 "the default <ulink url=\"http://jcp.org/en/jsr/detail?id=303\">Bean "
@@ -71,7 +64,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:38
 #, no-c-format
 msgid ""
 "a <literal>Validator</literal> for the default <literal>ValidationFactory</"
@@ -79,7 +71,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:45
 #, no-c-format
 msgid ""
 "The CDI specification does not require the servlet context objects, "
@@ -95,32 +86,18 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:57
 #, no-c-format
 msgid ""
 "Oh, you <emphasis>really</emphasis> want to inject the "
 "<literal>FacesContext</literal>? Alright then, try this producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[class FacesContextProducer {\n"
-"   @Produces @RequestScoped FacesContext getFacesContext() {\n"
-"      return FacesContext.getCurrentInstance();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: ee.xml:67
 #, fuzzy, no-c-format
 msgid "Injecting Java EE resources into a bean"
 msgstr "Java EEリソースをWeb Beansにインジェクトする"
 
 #. Tag: para
-#: ee.xml:69
 #, fuzzy, no-c-format
 msgid ""
 "All managed beans may take advantage of Java EE component environment "
@@ -134,51 +111,7 @@
 "literal>を使用することでJava EEの依存性注入を利用できます。ここまでは注意を払"
 "いませんでしたが、既にいくつかの例を見てきました。"
 
-#. Tag: programlisting
-#: ee.xml:76
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @Resource UserTransaction transaction;\n"
-"\n"
-"   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"throws Exception { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource Transaction transaction;\n"
-"\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"    \n"
-"}]]>"
-
-#. Tag: programlisting
-#: ee.xml:78
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Login implements Serializable {\n"
-"   @Inject Credentials credentials;\n"
-"   @PersistenceContext EntityManager userDatabase;\n"
-"    ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped\n"
-"public class Login {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @PersistenceContext EntityManager userDatabase;\n"
-"    \n"
-"    ...\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: ee.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "The Java EE <literal>@PostConstruct</literal> and <literal>@PreDestroy</"
@@ -192,7 +125,6 @@
 "<literal>@PostConstruct</literal>のメソッドは呼ばれます。"
 
 #. Tag: para
-#: ee.xml:86
 #, no-c-format
 msgid ""
 "Of course, we advise that component environment injection be used to define "
@@ -200,13 +132,11 @@
 msgstr ""
 
 #. Tag: title
-#: ee.xml:94
 #, fuzzy, no-c-format
 msgid "Calling a bean from a servlet"
 msgstr "サーブレットからWeb Beanを呼び出す"
 
 #. Tag: para
-#: ee.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
@@ -216,55 +146,7 @@
 "化メソッドによるインジェクションを使用して、Web Beansをインジェクトしてくださ"
 "い。"
 
-#. Tag: programlisting
-#: ee.xml:101
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Login extends HttpServlet {\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject Login login;\n"
-"\n"
-"   @Override\n"
-"   public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"      throws ServletException, IOException {\n"
-"      credentials.setUsername(request.getParameter(\"username\")):\n"
-"      credentials.setPassword(request.getParameter(\"password\")):\n"
-"      login.login();\n"
-"      if ( login.isLoggedIn() ) {\n"
-"         response.sendRedirect(\"/home.jsp\");\n"
-"      }\n"
-"      else {\n"
-"         response.sendRedirect(\"/loginError.jsp\");\n"
-"      }\n"
-"   }\n"
-"            \n"
-"}]]>"
-msgstr ""
-"public class Login extends HttpServlet {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @Current Login login;\n"
-"\n"
-"    @Override\n"
-"    public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"        throws ServletException, IOException {\n"
-"        credentials.setUsername( request.getAttribute(\"username\") ):\n"
-"        credentials.setPassword( request.getAttribute(\"password\") ):\n"
-"        login.login();\n"
-"        if ( login.isLoggedIn() ) {\n"
-"            response.sendRedirect(\"/home.jsp\");\n"
-"        }\n"
-"        else {\n"
-"            response.sendRedirect(\"/loginError.jsp\");\n"
-"        }\n"
-"    }\n"
-"            \n"
-"}"
-
 #. Tag: para
-#: ee.xml:103
 #, fuzzy, no-c-format
 msgid ""
 "Since instances of servlets are shared across all incoming threads, the bean "
@@ -277,13 +159,11 @@
 "ンスタンスへの呼び出しを引き受けます。"
 
 #. Tag: title
-#: ee.xml:112
 #, fuzzy, no-c-format
 msgid "Calling a bean from a message-driven bean"
 msgstr "Web Beanからメッセージ駆動型Beanを呼び出す"
 
 #. Tag: para
-#: ee.xml:114
 #, no-c-format
 msgid ""
 "CDI injection applies to all EJBs, even when they aren't managed beans. In "
@@ -292,40 +172,12 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:119
 #, fuzzy, no-c-format
 msgid "You can even use CDI interceptor bindings for message-driven Beans."
 msgstr ""
 "メッセージ駆動型BeanにWeb Beansのインタセプタを使用することさえできます。"
 
-#. Tag: programlisting
-#: ee.xml:121
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"   @Inject Inventory inventory;\n"
-"   @PersistenceContext EntityManager em;\n"
-"\n"
-"   public void onMessage(Message message) {\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"\n"
-"    @Current Inventory inventory;\n"
-"    @PersistenceContext EntityManager em;\n"
-"\n"
-"    public void onMessage(Message message) {\n"
-"        ...\n"
-"    }\n"
-"            \n"
-"}"
-
 #. Tag: para
-#: ee.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "Please note that there is no session or conversation context available when "
@@ -340,19 +192,16 @@
 "Web Beansだけが利用可能です。"
 
 #. Tag: para
-#: ee.xml:129
 #, no-c-format
 msgid "But how about beans which <emphasis>send</emphasis> JMS messages?"
 msgstr ""
 
 #. Tag: title
-#: ee.xml:136
 #, no-c-format
 msgid "JMS endpoints"
 msgstr "JMSエンドポイント"
 
 #. Tag: para
-#: ee.xml:138
 #, no-c-format
 msgid ""
 "Sending messages using JMS can be quite complex, because of the number of "
@@ -376,96 +225,20 @@
 "モデルがあり、私たちは気遣う必要があります。"
 
 #. Tag: para
-#: ee.xml:147
 #, no-c-format
 msgid ""
 "You can use producer fields and methods to prepare all of these resources "
 "for injection into a bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[public class OrderResources {\n"
-"   @Resource(name=\"jms/ConnectionFactory\")\n"
-"   private ConnectionFactory connectionFactory;\n"
-"  \n"
-"   @Resource(name=\"jms/OrderQueue\")\n"
-"   private Queue orderQueue;\n"
-"  \n"
-"   @Produces @OrderConnection\n"
-"   public Connection createOrderConnection() throws JMSException {\n"
-"    return connectionFactory.createConnection();\n"
-"   }\n"
-"  \n"
-"   public void closeOrderConnection(@Disposes @OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      connection.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderSession\n"
-"   public Session createOrderSession(@OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      return connection.createSession(true, Session.AUTO_ACKNOWLEDGE);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderSession(@Disposes @OrderSession Session session)\n"
-"         throws JMSException {\n"
-"      session.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderMessageProducer\n"
-"   public MessageProducer createOrderMessageProducer(@OrderSession Session "
-"session)\n"
-"         throws JMSException {\n"
-"      return session.createProducer(orderQueue);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderMessageProducer(@Disposes @OrderMessageProducer "
-"MessageProducer producer)\n"
-"         throws JMSException {\n"
-"      producer.close();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: ee.xml:153
 #, no-c-format
 msgid ""
 "In this example, we can just inject the prepared <literal>MessageProducer</"
 "literal>, <literal>Connection</literal> or <literal>QueueSession</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:158
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject Order order;\n"
-"@Inject @OrderMessageProducer MessageProducer producer;\n"
-"@Inject @OrderSession QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"   MapMessage msg = orderSession.createMapMessage();\n"
-"   msg.setLong(\"orderId\", order.getId());\n"
-"   ...\n"
-"   producer.send(msg);\n"
-"}]]>"
-msgstr ""
-"@OrderProcessor QueueSender orderSender;\n"
-"@OrderProcessor QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"    MapMessage msg = orderSession.createMapMessage();\n"
-"    ...\n"
-"    orderSender.send(msg);\n"
-"}"
-
 #. Tag: para
-#: ee.xml:164
 #, fuzzy, no-c-format
 msgid ""
 "The lifecycle of the injected JMS objects is completely controlled by the "
@@ -475,22 +248,20 @@
 "て完全に制御されます。"
 
 #. Tag: title
-#: ee.xml:171
 #, no-c-format
 msgid "Packaging and deployment"
 msgstr "パッケージとデプロイ"
 
 #. Tag: para
-#: ee.xml:173
 #, fuzzy, no-c-format
 msgid ""
 "CDI doesn't define any special deployment archive. You can package beans in "
-"JARs, EJB-JARs or WARs&#8212;any deployment location in the application "
-"classpath. However, the archive must be a \"bean archive\". That means each "
-"archive that contains beans <emphasis>must</emphasis> include a file named "
+"jars, ejb jars or wars—any deployment location in the application classpath. "
+"However, the archive must be a \"bean archive\". That means each archive "
+"that contains beans <emphasis>must</emphasis> include a file named "
 "<literal>beans.xml</literal> in the <literal>META-INF</literal> directory of "
 "the classpath or <literal>WEB-INF</literal> directory of the web root (for "
-"WAR archives). The file may be empty. Beans deployed in archives that do not "
+"war archives). The file may be empty. Beans deployed in archives that do not "
 "have a <literal>beans.xml</literal> file will not be available for use in "
 "the application."
 msgstr ""
@@ -503,7 +274,6 @@
 "カイブでデプロイされたWeb Beansは、アプリケーションで利用できないでしょう。"
 
 #. Tag: para
-#: ee.xml:182
 #, fuzzy, no-c-format
 msgid ""
 "In an embeddable EJB container, beans may be deployed in any location in "
@@ -515,7 +285,137 @@
 "しれません。繰り返しますが、デプロイ場所では<literal>web-beans.xml</literal>"
 "ファイルを含む必要があります。"
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "throws Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource Transaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login implements Serializable {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @PersistenceContext EntityManager userDatabase;\n"
+#~ "    ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @PersistenceContext EntityManager userDatabase;\n"
+#~ "    \n"
+#~ "    ...\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Login extends HttpServlet {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject Login login;\n"
+#~ "\n"
+#~ "   @Override\n"
+#~ "   public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "      throws ServletException, IOException {\n"
+#~ "      credentials.setUsername(request.getParameter(\"username\")):\n"
+#~ "      credentials.setPassword(request.getParameter(\"password\")):\n"
+#~ "      login.login();\n"
+#~ "      if ( login.isLoggedIn() ) {\n"
+#~ "         response.sendRedirect(\"/home.jsp\");\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "            \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "public class Login extends HttpServlet {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @Current Login login;\n"
+#~ "\n"
+#~ "    @Override\n"
+#~ "    public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "        throws ServletException, IOException {\n"
+#~ "        credentials.setUsername( request.getAttribute(\"username\") ):\n"
+#~ "        credentials.setPassword( request.getAttribute(\"password\") ):\n"
+#~ "        login.login();\n"
+#~ "        if ( login.isLoggedIn() ) {\n"
+#~ "            response.sendRedirect(\"/home.jsp\");\n"
+#~ "        }\n"
+#~ "        else {\n"
+#~ "            response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "            \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "   @Inject Inventory inventory;\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "   public void onMessage(Message message) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "\n"
+#~ "    @Current Inventory inventory;\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "    public void onMessage(Message message) {\n"
+#~ "        ...\n"
+#~ "    }\n"
+#~ "            \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Order order;\n"
+#~ "@Inject @OrderMessageProducer MessageProducer producer;\n"
+#~ "@Inject @OrderSession QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "   MapMessage msg = orderSession.createMapMessage();\n"
+#~ "   msg.setLong(\"orderId\", order.getId());\n"
+#~ "   ...\n"
+#~ "   producer.send(msg);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@OrderProcessor QueueSender orderSender;\n"
+#~ "@OrderProcessor QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "    MapMessage msg = orderSession.createMapMessage();\n"
+#~ "    ...\n"
+#~ "    orderSender.send(msg);\n"
+#~ "}"
+
+#~ msgid ""
 #~ "There is one restriction to be aware of here: <literal>@PersistenceContext"
 #~ "(type=EXTENDED)</literal> is not supported for simple Web Beans."
 #~ msgstr ""

Modified: doc/trunk/reference/ja-JP/environments.po
===================================================================
--- doc/trunk/reference/ja-JP/environments.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/environments.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-05-22 21:50+0900\n"
 "Last-Translator: TANABE Junnichi <jun at lmns.biz>\n"
 "Language-Team: none\n"
@@ -15,22 +15,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: environments.xml:4
 #, fuzzy, no-c-format
 msgid "Application servers and environments supported by Weld"
 msgstr "Web Beansによりサポートされるアプリケーションサーバーと環境"
 
 #. Tag: title
-#: environments.xml:7
 #, fuzzy, no-c-format
 msgid "Using Weld with JBoss AS"
 msgstr "Web BeansをJBoss ASと使用する"
 
 #. Tag: para
-#: environments.xml:9
 #, no-c-format
 msgid ""
-"If you are using JBoss AS 5.2, no additional configuration is required to "
+"If you are using JBoss AS 6.0, no additional configuration is required to "
 "use Weld (or CDI for that matter). All you need to do is make your "
 "application a bean bean archive by adding <literal>META-INF/beans.xml</"
 "literal> to the classpath or <literal>WEB-INF/beans.xml</literal> to the web "
@@ -38,52 +35,39 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:15
 #, no-c-format
 msgid ""
 "Unfortunately, you can't use Weld with earlier versions of JBoss AS since "
 "they are missing key libraries. If you want to learn how to upgrade the "
-"built-in support on JBoss AS 5.2, then read on."
+"built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:20
 #, no-c-format
 msgid ""
-"Upgrading the Weld add-on is easy. The Weld distribution has a build that "
-"can take care of this task for you in a single command. First, we need to "
-"tell Weld where JBoss AS is located. Create a new file named <literal>local."
-"build.properties</literal> in the examples directory of the Weld "
-"distribution and assign the path of your JBoss AS installation to the "
-"property key <literal>jboss.home</literal>, as follows:"
+"If there is a newer release of Weld than what is included in the latest "
+"JBoss AS 6 release, upgrading the Weld add-on is easy. The Weld distribution "
+"includes a build script that can take care of this task for you in a single "
+"command."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:27
-#, fuzzy, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"
-msgstr "jboss.home=/Applications/jboss-5.0.1.GA"
+#. Tag: para
+#, no-c-format
+msgid ""
+"First, we need to tell Weld where JBoss AS is located. This information is "
+"communicated by assigning the <literal>JBOSS_HOME</literal> environment "
+"variable. In a bash shell, you can assign the environment variable as "
+"follows:"
+msgstr ""
 
 #. Tag: para
-#: environments.xml:29
 #, no-c-format
 msgid ""
 "Now we can install the Weld deployer from the <literal>jboss-as</literal> "
 "directory of the Weld distribution:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:33
-#, fuzzy, no-c-format
-msgid ""
-"$> cd jboss-as\n"
-"$> ant update"
-msgstr ""
-"$ cd webbeans-$VERSION/jboss-as\n"
-"$ ant update"
-
 #. Tag: para
-#: environments.xml:36
 #, fuzzy, no-c-format
 msgid ""
 "A new deployer, <literal>weld.deployer</literal> is added to JBoss AS. This "
@@ -98,13 +82,11 @@
 "ンのどこにインストールされてるかを探せるようになります。"
 
 #. Tag: title
-#: environments.xml:46
 #, fuzzy, no-c-format
 msgid "GlassFish"
 msgstr "Glassfish"
 
 #. Tag: para
-#: environments.xml:48
 #, no-c-format
 msgid ""
 "Weld is also built into GlassFish from V3 onwards. Since GlassFish V3 is the "
@@ -115,13 +97,11 @@
 msgstr ""
 
 #. Tag: title
-#: environments.xml:56
 #, fuzzy, no-c-format
 msgid "Servlet containers (such as Tomcat or Jetty)"
 msgstr "(TomcatやJettyのような)サーブレットコンテナ"
 
 #. Tag: para
-#: environments.xml:58
 #, fuzzy, no-c-format
 msgid ""
 "While JSR-299 does not require support for servlet environments, Weld can be "
@@ -131,7 +111,6 @@
 "ができます。"
 
 #. Tag: para
-#: environments.xml:64
 #, fuzzy, no-c-format
 msgid ""
 "There is a major limitation to using a servlet container. Weld doesn't "
@@ -146,7 +125,6 @@
 "トしません。"
 
 #. Tag: para
-#: environments.xml:72
 #, fuzzy, no-c-format
 msgid ""
 "Weld should be used as a web application library in a servlet container. You "
@@ -163,62 +141,52 @@
 "パーjar\"です。代わりに、あなたは以下のコンポーネントjarを使うことも出来ま"
 "す。"
 
-#. Tag: literal
-#: environments.xml:84
+#. Tag: para
 #, no-c-format
-msgid "jsr299-api.jar"
-msgstr "jsr299-api.jar"
+msgid "<literal>jsr299-api.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:89
-#, fuzzy, no-c-format
-msgid "weld-api.jar"
-msgstr "webbeans-api.jar"
+#. Tag: para
+#, no-c-format
+msgid "<literal>weld-api.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:94
-#, fuzzy, no-c-format
-msgid "weld-spi.jar"
-msgstr "webbeans-spi.jar"
+#. Tag: para
+#, no-c-format
+msgid "<literal>weld-spi.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:99
-#, fuzzy, no-c-format
-msgid "weld-core.jar"
-msgstr "webbeans-core.jar"
+#. Tag: para
+#, no-c-format
+msgid "<literal>weld-core.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:104
+#. Tag: para
 #, fuzzy, no-c-format
-msgid "weld-logging.jar"
+msgid "<literal>weld-logging.jar</literal>"
 msgstr "webbeans-logging.jar"
 
-#. Tag: literal
-#: environments.xml:109
+#. Tag: para
 #, fuzzy, no-c-format
-msgid "weld-servlet-int.jar"
+msgid "<literal>weld-servlet-int.jar</literal>"
 msgstr "webbeans-servlet-int.jar"
 
-#. Tag: literal
-#: environments.xml:114
+#. Tag: para
 #, no-c-format
-msgid "javassist.jar"
-msgstr "javassist.jar"
+msgid "<literal>javassist.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:119
+#. Tag: para
 #, no-c-format
-msgid "dom4j.jar"
-msgstr "dom4j.jar"
+msgid "<literal>dom4j.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:124
+#. Tag: para
 #, no-c-format
-msgid "google-collections.jar"
+msgid "<literal>google-collections.jar</literal>"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:129
 #, fuzzy, no-c-format
 msgid ""
 "You also need to explicitly specify the servlet listener (used to boot Weld, "
@@ -229,28 +197,12 @@
 "互作用の制御をするために使われる)サーブレットリスナを明示的に指定する必要もあ"
 "ります。"
 
-#. Tag: programlisting
-#: environments.xml:134
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-
 #. Tag: title
-#: environments.xml:137
 #, no-c-format
 msgid "Tomcat"
 msgstr "Tomcat"
 
 #. Tag: para
-#: environments.xml:139
 #, fuzzy, no-c-format
 msgid ""
 "Tomcat has a read-only JNDI, so Weld can't automatically bind the "
@@ -262,25 +214,7 @@
 "をバインドすることができません。マネージャをJNDIにバインドするために、あなた"
 "は <literal>META-INF/context.xml</literal> に以下を追加すべきです。"
 
-#. Tag: programlisting
-#: environments.xml:145
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<Context>\n"
-"   <Resource name=\"BeanManager\" \n"
-"      auth=\"Container\"\n"
-"      type=\"javax.enterprise.inject.spi.BeanManager\"\n"
-"      factory=\"org.jboss.weld.resources.ManagerObjectFactory\"/>\n"
-"</Context>]]>"
-msgstr ""
-"<![CDATA[<Resource name=\"app/Manager\" \n"
-"          auth=\"Container\"\n"
-"          type=\"javax.inject.manager.Manager\"\n"
-"          factory=\"org.jboss.webbeans.resources.ManagerObjectFactory\"/>\n"
-"]]>"
-
 #. Tag: para
-#: environments.xml:147
 #, fuzzy, no-c-format
 msgid ""
 "and make it available to your deployment by adding this to the bottom of "
@@ -289,28 +223,7 @@
 "そして、 <literal>web.xml</literal> に以下を追加することにより、あなたのデプ"
 "ロイメントは利用可能にします。"
 
-#. Tag: programlisting
-#: environments.xml:151
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<resource-env-ref>\n"
-"   <resource-env-ref-name>BeanManager</resource-env-ref-name>\n"
-"   <resource-env-ref-type>\n"
-"      javax.enterprise.inject.spi.BeanManager\n"
-"   </resource-env-ref-type>\n"
-"</resource-env-ref>]]>"
-msgstr ""
-"<![CDATA[<resource-env-ref>\n"
-"  <resource-env-ref-name>\n"
-"    app/Manager\n"
-"  </resource-env-ref-name>\n"
-"  <resource-env-ref-type>\n"
-"    javax.inject.manager.Manager\n"
-"  </resource-env-ref-type>\n"
-"</resource-env-ref>]]>"
-
 #. Tag: para
-#: environments.xml:153
 #, fuzzy, no-c-format
 msgid ""
 "Tomcat only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -322,7 +235,6 @@
 "literal> で利用できるでしょう。"
 
 #. Tag: para
-#: environments.xml:158
 #, fuzzy, no-c-format
 msgid ""
 "Weld also supports Servlet injection in Tomcat. To enable this, place the "
@@ -334,24 +246,12 @@
 "tomcat-support.jar</literal> を置いて、 <literal>META-INF/context.xml</"
 "literal> に下記を追加します。"
 
-#. Tag: programlisting
-#: environments.xml:164
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<Listener className=\"org.jboss.weld.environment.tomcat."
-"WeldLifecycleListener\"/>]]>"
-msgstr ""
-"<![CDATA[<Listener className=\"org.jboss.webbeans.environment.tomcat."
-"WebBeansLifecycleListener\" />]]>"
-
 #. Tag: title
-#: environments.xml:169
 #, no-c-format
 msgid "Jetty"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:171
 #, fuzzy, no-c-format
 msgid ""
 "Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind "
@@ -362,32 +262,7 @@
 "をバインドすることができません。マネージャをJNDIにバインドするために、あなた"
 "は <literal>META-INF/context.xml</literal> に以下を追加すべきです。"
 
-#. Tag: programlisting
-#: environments.xml:176
-#, no-c-format
-msgid ""
-"<![CDATA[<!DOCTYPE Configure PUBLIC \"-//Mort Bay Consulting//DTD Configure//"
-"EN\"\n"
-"   \"http://jetty.mortbay.org/configure.dtd\">\n"
-"<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext"
-"\">\n"
-"   <New id=\"BeanManager\" class=\"org.mortbay.jetty.plus.naming.Resource"
-"\">\n"
-"      <Arg><Ref id=\"webAppCtx\"/></Arg> \n"
-"      <Arg>BeanManager</Arg>\n"
-"      <Arg>\n"
-"         <New class=\"javax.naming.Reference\">\n"
-"            <Arg>javax.enterprise.inject.spi.BeanManager</Arg> \n"
-"            <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>\n"
-"            <Arg/>\n"
-"         </New>\n"
-"      </Arg>\n"
-"   </New>\n"
-"</Configure>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:178
 #, no-c-format
 msgid ""
 "Notice that Jetty doesn't not have built-in support for an <literal>javax."
@@ -397,7 +272,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:184
 #, fuzzy, no-c-format
 msgid ""
 "Jetty only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -409,19 +283,16 @@
 "literal> で利用できるでしょう。"
 
 #. Tag: para
-#: environments.xml:189
 #, no-c-format
 msgid "Weld does not currently support Servlet injection in Jetty."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:198
 #, no-c-format
 msgid "Java SE"
 msgstr "Java SE"
 
 #. Tag: para
-#: environments.xml:200
 #, fuzzy, no-c-format
 msgid ""
 "In addition to improved integration of the Enterprise Java stack, the "
@@ -439,7 +310,6 @@
 "Standard Edition環境でも独立して実行するためのシンプルな手段を提供します。"
 
 #. Tag: para
-#: environments.xml:208
 #, fuzzy, no-c-format
 msgid ""
 "When executing in the SE environment the following features of Weld are "
@@ -447,7 +317,6 @@
 msgstr "SE環境で実行する場合、Web Beansの下記の機能が利用できます。"
 
 #. Tag: para
-#: environments.xml:214
 #, no-c-format
 msgid ""
 "Managed beans with <literal>@PostConstruct</literal> and "
@@ -455,13 +324,11 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:220
 #, no-c-format
 msgid "Dependency injection with qualifiers and alternatives"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:225
 #, no-c-format
 msgid ""
 "<literal>@Application</literal>, <literal>@Dependent</literal> and "
@@ -469,43 +336,36 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:231
 #, no-c-format
 msgid "Interceptors and decorators"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:236
 #, no-c-format
 msgid "Stereotypes"
 msgstr "ステレオタイプ"
 
 #. Tag: para
-#: environments.xml:241
 #, no-c-format
 msgid "Events"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:246
 #, no-c-format
 msgid "Portable extension support"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:252
 #, no-c-format
 msgid "EJB beans are not supported."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:257
 #, fuzzy, no-c-format
 msgid "CDI SE Module"
 msgstr "Web BeansのSEモジュール"
 
 #. Tag: para
-#: environments.xml:259
 #, fuzzy, no-c-format
 msgid ""
 "Weld provides an extension which will boot a CDI bean manager in Java SE, "
@@ -520,26 +380,12 @@
 "視するシンプルなWeb Beanです。そのコマンドラインパラメータは以下のいずれかを"
 "使用することでインジェクトすることができます。"
 
-#. Tag: programlisting
-#: environments.xml:264
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters List<String> params;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: environments.xml:266
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters String[] paramsArray;]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:268
 #, no-c-format
 msgid "The second form is useful for compatibility with existing classes."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:273
 #, fuzzy, no-c-format
 msgid ""
 "The command line parameters do not become available for injection until the "
@@ -555,43 +401,16 @@
 "を通してそれをすることができます。"
 
 #. Tag: para
-#: environments.xml:282
 #, fuzzy, no-c-format
 msgid "Here's an example of a simple CDI SE application:"
 msgstr "ここに簡単なWeb Beans SEアプリケーションのサンプルがあります。"
 
-#. Tag: programlisting
-#: environments.xml:286
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Singleton\n"
-"public class HelloWorld\n"
-"{\n"
-"   public void printHello(@Observes ContainerInitialized event, @Parameters "
-"List<String> parameters) {\n"
-"       System.out.println(\"Hello \" + parameters.get(0));\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped\n"
-"public class HelloWorld\n"
-"{\n"
-"    @Parameters List<String> parameters;\n"
-"\n"
-"    public void printHello( @Observes @Deployed Manager manager )\n"
-"    {\n"
-"        System.out.println( \"Hello \" + parameters.get(0) );\n"
-"    }\n"
-"}]]>"
-
 #. Tag: title
-#: environments.xml:292
 #, no-c-format
 msgid "Bootstrapping CDI SE"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:294
 #, fuzzy, no-c-format
 msgid "CDI SE applications can be bootstrapped in the following ways."
 msgstr ""
@@ -599,13 +418,11 @@
 "す。"
 
 #. Tag: title
-#: environments.xml:300
 #, no-c-format
 msgid "The ContainerInitialized Event"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:302
 #, no-c-format
 msgid ""
 "Thanks to the power of CDI's typesafe event model, application developers "
@@ -617,7 +434,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:310
 #, fuzzy, no-c-format
 msgid ""
 "In this case your application can be started by calling the provided main "
@@ -626,20 +442,12 @@
 "Web Beans SEアプリケーションは以下のメインメソッドを走らせることで開始されま"
 "す。"
 
-#. Tag: programlisting
-#: environments.xml:313
-#, fuzzy, no-c-format
-msgid "<![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]>"
-msgstr "<![CDATA[java org.jboss.webbeans.environments.se.StartMain <args>]]>"
-
 #. Tag: title
-#: environments.xml:319
 #, no-c-format
 msgid "Programatic Bootstrap API"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:321
 #, no-c-format
 msgid ""
 "For added flexibility, CDI SE also comes with a bootstrap API which can be "
@@ -648,90 +456,65 @@
 "classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:327
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class Weld\n"
-"{\n"
-"\n"
-"   /** Boots Weld and creates and returns a WeldContainer instance, through "
-"which\n"
-"    * beans and events can be accesed. */\n"
-"   public WeldContainer initialize() {...}\n"
-"\n"
-"   /** Convenience method for shutting down the container. */\n"
-"   public void shutdown() {...}\n"
-"\n"
-"}]]>"
+"Here's an example application main method which uses this API to initialize "
+"a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:329
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class WeldContainer\n"
-"{\n"
-"\n"
-"   /** Provides access to all beans within the application. */\n"
-"   public Instance<Object> instance() {...}\n"
-"\n"
-"   /** Provides access to all events within the application. */\n"
-"   public Event<Object> event() {...}\n"
-"\n"
-"   /** Provides direct access to the BeanManager. */\n"
-"   public BeanManager getBeanManager() {...}\n"
-"\n"
-"}]]>"
+"Alternatively the application could be started by firing a custom event "
+"which would then be observed by another simple bean. The following example "
+"fires <literal>MyEvent</literal> on startup."
 msgstr ""
 
-#. Tag: para
-#: environments.xml:331
+#. Tag: title
 #, no-c-format
-msgid ""
-"Here's an example application main method which uses this API to initialize "
-"a bean of type <literal>MyApplicationBean</literal>."
+msgid "Thread Context"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:334
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.instance().select(MyApplicationBean.class).get();\n"
-"   weld.shutdown();\n"
-"}]]>"
+"In contrast to Java EE applications, Java SE applications place no "
+"restrictions on developers regarding the creation and usage of threads. "
+"Therefore Weld SE provides a custom scope annotation, "
+"<literal>@ThreadScoped</literal>, and corresponding context implementation "
+"which can be used to bind bean instances to the current thread. It is "
+"intended to be used in scenarios where you might otherwise use "
+"<literal>ThreadLocal</literal>, and does in fact use <literal>ThreadLocal</"
+"literal> under the hood."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:336
 #, no-c-format
 msgid ""
-"Alternatively the application could be started by firing a custom event "
-"which would then be observed by another simple bean. The following example "
-"fires <literal>MyEvent</literal> on startup."
+"To use the @ThreadScoped annotation you need to enable the "
+"<literal>RunnableDecorator</literal> which 'listens' for all executions of "
+"<literal>Runnable.run()</literal> and decorates them by setting up the "
+"thread context beforehand, bound to the current thread, and destroying the "
+"context afterwards."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:340
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.event().select(MyEvent.class).fire( new MyEvent() );\n"
-"   weld.shutdown();\n"
-"}]]>"
+"It is not necessary to use @ThreadScoped in all multithreaded applications. "
+"The thread context is not intended as a replacement for defining your own "
+"application-specific contexts. It is generally only useful in situtations "
+"where you would otherwise have used ThreadLocal directly, which are "
+"typically rare."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:348
 #, no-c-format
 msgid "Setting the Classpath"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:350
 #, no-c-format
 msgid ""
 "Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld "
@@ -740,6 +523,120 @@
 "classes and dependant jars, is the Weld SE jar."
 msgstr ""
 
+#, fuzzy
+#~ msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.1.GA"
+
+#, fuzzy
+#~ msgid ""
+#~ "$> cd jboss-as\n"
+#~ "$> ant update"
+#~ msgstr ""
+#~ "$ cd webbeans-$VERSION/jboss-as\n"
+#~ "$ ant update"
+
+#~ msgid "jsr299-api.jar"
+#~ msgstr "jsr299-api.jar"
+
+#, fuzzy
+#~ msgid "weld-api.jar"
+#~ msgstr "webbeans-api.jar"
+
+#, fuzzy
+#~ msgid "weld-spi.jar"
+#~ msgstr "webbeans-spi.jar"
+
+#, fuzzy
+#~ msgid "weld-core.jar"
+#~ msgstr "webbeans-core.jar"
+
+#~ msgid "javassist.jar"
+#~ msgstr "javassist.jar"
+
+#~ msgid "dom4j.jar"
+#~ msgstr "dom4j.jar"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<listener>\n"
+#~ "   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
+#~ "class>\n"
+#~ "</listener>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<listener>\n"
+#~ "   <listener-class>org.jboss.webbeans.environment.servlet.Listener</"
+#~ "listener-class>\n"
+#~ "</listener>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<Context>\n"
+#~ "   <Resource name=\"BeanManager\" \n"
+#~ "      auth=\"Container\"\n"
+#~ "      type=\"javax.enterprise.inject.spi.BeanManager\"\n"
+#~ "      factory=\"org.jboss.weld.resources.ManagerObjectFactory\"/>\n"
+#~ "</Context>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<Resource name=\"app/Manager\" \n"
+#~ "          auth=\"Container\"\n"
+#~ "          type=\"javax.inject.manager.Manager\"\n"
+#~ "          factory=\"org.jboss.webbeans.resources.ManagerObjectFactory\"/"
+#~ ">\n"
+#~ "]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<resource-env-ref>\n"
+#~ "   <resource-env-ref-name>BeanManager</resource-env-ref-name>\n"
+#~ "   <resource-env-ref-type>\n"
+#~ "      javax.enterprise.inject.spi.BeanManager\n"
+#~ "   </resource-env-ref-type>\n"
+#~ "</resource-env-ref>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<resource-env-ref>\n"
+#~ "  <resource-env-ref-name>\n"
+#~ "    app/Manager\n"
+#~ "  </resource-env-ref-name>\n"
+#~ "  <resource-env-ref-type>\n"
+#~ "    javax.inject.manager.Manager\n"
+#~ "  </resource-env-ref-type>\n"
+#~ "</resource-env-ref>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<Listener className=\"org.jboss.weld.environment.tomcat."
+#~ "WeldLifecycleListener\"/>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<Listener className=\"org.jboss.webbeans.environment.tomcat."
+#~ "WebBeansLifecycleListener\" />]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Singleton\n"
+#~ "public class HelloWorld\n"
+#~ "{\n"
+#~ "   public void printHello(@Observes ContainerInitialized event, "
+#~ "@Parameters List<String> parameters) {\n"
+#~ "       System.out.println(\"Hello \" + parameters.get(0));\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped\n"
+#~ "public class HelloWorld\n"
+#~ "{\n"
+#~ "    @Parameters List<String> parameters;\n"
+#~ "\n"
+#~ "    public void printHello( @Observes @Deployed Manager manager )\n"
+#~ "    {\n"
+#~ "        System.out.println( \"Hello \" + parameters.get(0) );\n"
+#~ "    }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]>"
+#~ msgstr ""
+#~ "<![CDATA[java org.jboss.webbeans.environments.se.StartMain <args>]]>"
+
 #~ msgid "Typesafe Dependency Injection"
 #~ msgstr "タイプセーフな依存性注入"
 

Modified: doc/trunk/reference/ja-JP/events.po
===================================================================
--- doc/trunk/reference/ja-JP/events.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/events.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-04-30 23:50+0900\n"
 "Last-Translator: Fusayuki Minamoto <miki.htmnet at nifty.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: events.xml:4
 #, no-c-format
 msgid "Events"
 msgstr "イベント"
 
 #. Tag: para
-#: events.xml:6
 #, no-c-format
 msgid ""
 "Dependency injection enables loose-coupling by allowing the implementation "
@@ -31,7 +29,6 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:13
 #, no-c-format
 msgid ""
 "This basic schema might sound like the familiar observer/observable pattern, "
@@ -39,7 +36,6 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:18
 #, no-c-format
 msgid ""
 "not only are event producers decoupled from observers; observers are "
@@ -49,7 +45,6 @@
 "プロデューサから完全に分離されています。"
 
 #. Tag: para
-#: events.xml:22
 #, no-c-format
 msgid ""
 "observers can specify a combination of \"selectors\" to narrow the set of "
@@ -59,7 +54,6 @@
 "集まりを狭めることが可能です"
 
 #. Tag: para
-#: events.xml:28
 #, fuzzy, no-c-format
 msgid ""
 "observers can be notified immediately, or can specify that delivery of the "
@@ -69,7 +63,6 @@
 "待ってイベント配送を遅延させるように指定することが可能です"
 
 #. Tag: para
-#: events.xml:35
 #, no-c-format
 msgid ""
 "The CDI event notification facility uses more or less the same typesafe "
@@ -77,13 +70,11 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:39
 #, fuzzy, no-c-format
 msgid "Event payload"
 msgstr "イベントプロデューサ"
 
 #. Tag: para
-#: events.xml:41
 #, no-c-format
 msgid ""
 "The event object carries state from producer to consumer. The event object "
@@ -95,35 +86,18 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:48
 #, no-c-format
 msgid ""
 "An event qualifier is just a normal qualifier, defined using "
 "<literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({FIELD, PARAMETER})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated {}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated { ... }]]>"
-
 #. Tag: title
-#: events.xml:57
 #, no-c-format
 msgid "Event observers"
 msgstr "イベントオブザーバ"
 
 #. Tag: para
-#: events.xml:59
 #, fuzzy, no-c-format
 msgid ""
 "An <emphasis>observer method</emphasis> is a method of a bean with a "
@@ -132,18 +106,7 @@
 "<emphasis>オブザーバメソッド</emphasis> は、 <literal>@Observes</literal> と"
 "いうアノテーションの付いたパラメータを持つWeb Beanのメソッドです。"
 
-#. Tag: programlisting
-#: events.xml:64
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }]]>"
-
 #. Tag: para
-#: events.xml:66
 #, fuzzy, no-c-format
 msgid ""
 "The annotated parameter is called the <emphasis>event parameter</emphasis>. "
@@ -158,23 +121,12 @@
 "イプがイベントセレクタとして使用されると、それは <emphasis>イベントバインディ"
 "ングタイプ</emphasis> と呼ばれます。"
 
-#. Tag: programlisting
-#: events.xml:72 events.xml:240
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:74
 #, fuzzy, no-c-format
 msgid ""
-"An observer method need not specify any event qualifiers&#8212;in this case "
-"it is interested in <emphasis>all</emphasis> events of a particular type. If "
-"it does specify qualifiers, it's only interested in events which have those "
+"An observer method need not specify any event qualifiers—in this case it is "
+"interested in <emphasis>all</emphasis> events of a particular type. If it "
+"does specify qualifiers, it's only interested in events which have those "
 "qualifiers."
 msgstr ""
 "オブザーバメソッドはイベントバインディングを指定する必要はありません&#151; こ"
@@ -183,7 +135,6 @@
 "を持つイベントだけに関心があります。"
 
 #. Tag: para
-#: events.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "The observer method may have additional parameters, which are injection "
@@ -193,24 +144,12 @@
 "Beansメソッドパラメータインジェクションのセマンティクスに従って依存性の注入が"
 "行われます。"
 
-#. Tag: programlisting
-#: events.xml:84
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document, User user) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document, User user) { ... }]]>"
-
 #. Tag: title
-#: events.xml:89
 #, no-c-format
 msgid "Event producers"
 msgstr "イベントプロデューサ"
 
 #. Tag: para
-#: events.xml:91
 #, no-c-format
 msgid ""
 "Event producers fire events using an instance of the parameterized "
@@ -218,14 +157,7 @@
 "obtained by injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:96
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
-msgstr "<![CDATA[@Observable Event<Document> documentEvent]]>"
-
 #. Tag: para
-#: events.xml:98
 #, fuzzy, no-c-format
 msgid ""
 "A producer raises events by calling the <literal>fire()</literal> method of "
@@ -235,20 +167,12 @@
 "literal> メソッドを呼び出し、<emphasis>イベントオブジェクト</emphasis> を渡す"
 "ことでイベントを発生させます。"
 
-#. Tag: programlisting
-#: events.xml:103
-#, no-c-format
-msgid "<![CDATA[documentEvent.fire(document);]]>"
-msgstr "<![CDATA[documentEvent.fire(document);]]>"
-
 #. Tag: para
-#: events.xml:105
 #, fuzzy, no-c-format
 msgid "This particular event will be delivered to every observer method that:"
 msgstr "イベントは次のような特徴を持つ各オブザーバメソッドへ配送されます。"
 
 #. Tag: para
-#: events.xml:111
 #, fuzzy, no-c-format
 msgid ""
 "has an event parameter to which the event object (the <literal>Document</"
@@ -256,13 +180,11 @@
 msgstr "イベントオブジェクトが代入可能なイベントパラメータ、かつ"
 
 #. Tag: para
-#: events.xml:115
 #, fuzzy, no-c-format
 msgid "specifies no qualifiers."
 msgstr "イベントバインディングを指定しない"
 
 #. Tag: para
-#: events.xml:119
 #, fuzzy, no-c-format
 msgid ""
 "The container simply calls all the observer methods, passing the event "
@@ -276,19 +198,16 @@
 "その例外は <literal>fire()</literal> メソッドによって再スローされます。"
 
 #. Tag: para
-#: events.xml:125
 #, no-c-format
 msgid "Qualifiers can be applied to an event in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: events.xml:131
 #, no-c-format
 msgid "by annotating the <literal>Event</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: events.xml:134
 #, no-c-format
 msgid ""
 "by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
@@ -296,19 +215,11 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:138
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is far simpler:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:142
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
-msgstr "<![CDATA[@Observable @Updated Event<Document> documentUpdatedEvent]]>"
-
 #. Tag: para
-#: events.xml:144
 #, fuzzy, no-c-format
 msgid ""
 "Then, every event fired via this instance of <literal>Event</literal> has "
@@ -320,13 +231,11 @@
 "持つ各オブザーバメソッドに配送されます。"
 
 #. Tag: para
-#: events.xml:151
 #, no-c-format
 msgid "has an event parameter to which the event object is assignable, and"
 msgstr "イベントオブジェクトが代入可能なイベントパラメータ、かつ"
 
 #. Tag: para
-#: events.xml:154
 #, fuzzy, no-c-format
 msgid ""
 "does not have any event qualifier <emphasis>except</emphasis> for the event "
@@ -337,7 +246,6 @@
 "</emphasis> イベントバインディングを指定しない "
 
 #. Tag: para
-#: events.xml:161
 #, no-c-format
 msgid ""
 "The downside of annotating the injection point is that we can't specify the "
@@ -347,18 +255,7 @@
 "<literal>Event</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:167
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
-"(document);]]>"
-msgstr ""
-"<![CDATA[documentEvent.fire( document, new AnnotationLiteral<Updated>()"
-"{} );]]>"
-
 #. Tag: para
-#: events.xml:169
 #, no-c-format
 msgid ""
 "Events can have multiple event qualifiers, assembled using any combination "
@@ -367,13 +264,11 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:178
 #, fuzzy, no-c-format
 msgid "Conditional observer methods"
 msgstr "トランザクション型オブザーバ"
 
 #. Tag: para
-#: events.xml:180
 #, no-c-format
 msgid ""
 "By default, if there is no instance of an observer in the current context, "
@@ -383,25 +278,13 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:186
 #, no-c-format
 msgid ""
 "A conditional observer is specified by adding <literal>receive = IF_EXISTS</"
 "literal> to the <literal>@Observes</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = IF_EXISTS) "
-"@Updated Document d) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:193
 #, no-c-format
 msgid ""
 "A bean with scope <literal>@Dependent</literal> cannot be a conditional "
@@ -409,39 +292,18 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:200
 #, fuzzy, no-c-format
 msgid "Event qualifiers with members"
 msgstr "メンバを持ったイベントバインディング"
 
 #. Tag: para
-#: events.xml:202
 #, fuzzy, no-c-format
 msgid "An event qualifier type may have annotation members:"
 msgstr ""
 "イベントバインディングは次のようにアノテーションメンバーを持つことができま"
 "す。"
 
-#. Tag: programlisting
-#: events.xml:204
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"   RoleType value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"    RoleType value();\n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:206
 #, no-c-format
 msgid ""
 "The member value is used to narrow the messages delivered to the observer:"
@@ -449,18 +311,7 @@
 "メンバー値は次のようにオブザーバへ配送されるメッセージを狭めるのに使用されま"
 "す。"
 
-#. Tag: programlisting
-#: events.xml:208
-#, no-c-format
-msgid ""
-"<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
-"{ ... }]]>"
-
 #. Tag: para
-#: events.xml:210
 #, fuzzy, no-c-format
 msgid ""
 "Event qualifier type members may be specified statically by the event "
@@ -470,14 +321,7 @@
 "す。次の例は、イベント通知インジェクションポイントでのアノテーションを通じて"
 "指定しています。"
 
-#. Tag: programlisting
-#: events.xml:215
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
-msgstr "<![CDATA[@Observable @Role(ADMIN) Event<LoggedIn> LoggedInEvent;}}]]>"
-
 #. Tag: para
-#: events.xml:217
 #, fuzzy, no-c-format
 msgid ""
 "Alternatively, the value of the event qualifier type member may be "
@@ -488,20 +332,7 @@
 "によって動的に決定することもできます。まず、次のように "
 "<literal>AnnotationLiteral</literal> の抽象サブクラスを書くことで始めます。"
 
-#. Tag: programlisting
-#: events.xml:222
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[abstract class RoleBinding \n"
-"   extends AnnotationLiteral<Role> \n"
-"   implements Role {}]]>"
-msgstr ""
-"<![CDATA[abstract class RoleBinding \n"
-"    extends AnnotationLiteral<Role> \n"
-"    implements Role {}]]>"
-
 #. Tag: para
-#: events.xml:224
 #, fuzzy, no-c-format
 msgid ""
 "The event producer passes an instance of this class to <literal>select()</"
@@ -510,47 +341,19 @@
 "イベントプロデューサはこのクラスのインスタンスを <literal>fire()</literal> へ"
 "渡します。"
 
-#. Tag: programlisting
-#: events.xml:226
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[documentEvent.select(new RoleBinding() {\n"
-"   public void value() { return user.getRole(); }\n"
-"}).fire(document);]]>"
-msgstr ""
-"<![CDATA[documentEvent.fire( document, new RoleBinding() { public void value"
-"() { return user.getRole(); } } );]]>"
-
 #. Tag: title
-#: events.xml:231
 #, fuzzy, no-c-format
 msgid "Multiple event qualifiers"
 msgstr "複数のイベントバインディング"
 
 #. Tag: para
-#: events.xml:233
 #, fuzzy, no-c-format
 msgid "Event qualifier types may be combined, for example:"
 msgstr ""
 "イベントバインディングタイプは、たとえば次のように組み合わせることが可能で"
 "す。"
 
-#. Tag: programlisting
-#: events.xml:235
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>(){})."
-"fire(document);]]>"
-msgstr ""
-"<![CDATA[@Observable @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.fire(document, new "
-"AnnotationLiteral<Updated>(){});]]>"
-
 #. Tag: para
-#: events.xml:237
 #, no-c-format
 msgid ""
 "When this event occurs, all of the following observer methods will be "
@@ -558,44 +361,12 @@
 msgstr ""
 "このイベントが発生すると、次のすべてのオブザーバメソッドは通知されます。"
 
-#. Tag: programlisting
-#: events.xml:239
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
-"document) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
-"document) { ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:241
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
-"{ ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:242
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }}}]]>"
-msgstr ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }}}]]>"
-
 #. Tag: title
-#: events.xml:247
 #, no-c-format
 msgid "Transactional observers"
 msgstr "トランザクション型オブザーバ"
 
 #. Tag: para
-#: events.xml:249
 #, no-c-format
 msgid ""
 "Transactional observers receive their event notifications during the before "
@@ -610,31 +381,18 @@
 "をリフレッシュする必要がありますが、 <literal>Category</literal> ツリーの更新"
 "をしたトランザクションが成功したときだけ必要です。"
 
-#. Tag: programlisting
-#: events.xml:256
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public void refreshCategoryTree(@Observes(during = AFTER_SUCCESS) "
-"CategoryUpdateEvent event) { ... }]]>"
-msgstr ""
-"<![CDATA[public void refreshCategoryTree(@AfterTransactionSuccess @Observes "
-"CategoryUpdateEvent event) { ... }]]>"
-
 #. Tag: para
-#: events.xml:258
 #, fuzzy, no-c-format
 msgid "There are five kinds of transactional observers:"
 msgstr "次の3種類のトランザクション型オブザーバが存在します。"
 
 #. Tag: para
-#: events.xml:262
 #, no-c-format
 msgid ""
 "<literal>IN_PROGESS</literal> observers are called immediately (default)"
 msgstr ""
 
 #. Tag: para
-#: events.xml:265
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_SUCCESS</literal> observers are called during the after "
@@ -645,7 +403,6 @@
 "了後のフェーズ中にそのトランザクションの完了に成功したときだけ呼び出される"
 
 #. Tag: para
-#: events.xml:271
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_FAILURE</literal> observers are called during the after "
@@ -656,7 +413,6 @@
 "了後のフェーズ中にそのトランザクションの完了に失敗したときだけ呼び出される"
 
 #. Tag: para
-#: events.xml:277
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_COMPLETION</literal> observers are called during the after "
@@ -666,7 +422,6 @@
 "完了後のフェーズ中に呼び出される"
 
 #. Tag: para
-#: events.xml:283
 #, fuzzy, no-c-format
 msgid ""
 "<literal>BEFORE_COMPLETION</literal> observers are called during the before "
@@ -676,7 +431,6 @@
 "ン完了前のフェーズ中に呼び出される"
 
 #. Tag: para
-#: events.xml:290
 #, fuzzy, no-c-format
 msgid ""
 "Transactional observers are very important in a stateful object model "
@@ -687,7 +441,6 @@
 "ンよりも長く保持されることが多いからです。"
 
 #. Tag: para
-#: events.xml:295
 #, no-c-format
 msgid ""
 "Imagine that we have cached a JPA query result set in the application scope:"
@@ -695,50 +448,7 @@
 "アプリケーションスコープにおいてJPAクエリーの結果をキャッシュしたと想像してみ"
 "てください。"
 
-#. Tag: programlisting
-#: events.xml:297
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   List<Product> products;\n"
-"\n"
-"   @Produces @Catalog \n"
-"   List<Product> getCatalog() {\n"
-"      if (products==null) {\n"
-"         products = em.createQuery(\"select p from Product p where p.deleted "
-"= false\")\n"
-"            .getResultList();\n"
-"      }\n"
-"      return products;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    List<Product> products;\n"
-"\n"
-"    @Produces @Catalog \n"
-"    List<Product> getCatalog() {\n"
-"        if (products==null) {\n"
-"            products = em.createQuery(\"select p from Product p where p."
-"deleted = false\")\n"
-"                .getResultList();\n"
-"        }\n"
-"        return products;\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:299
 #, no-c-format
 msgid ""
 "From time to time, a <literal>Product</literal> is created or deleted. When "
@@ -752,7 +462,6 @@
 "功する <emphasis>後</emphasis> まで待つべきなのです。"
 
 #. Tag: para
-#: events.xml:305
 #, fuzzy, no-c-format
 msgid ""
 "The bean that creates and deletes <literal>Product</literal>s could raise "
@@ -761,51 +470,7 @@
 " <literal>Product</literal> を生成、削除するWeb Beansは次のようにイベントを発"
 "生させます。"
 
-#. Tag: programlisting
-#: events.xml:309
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"   @PersistenceContext EntityManager em;\n"
-"   @Inject @Any Event<Product> productEvent;\n"
-"\n"
-"   public void delete(Product product) {\n"
-"      em.delete(product);\n"
-"      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
-"(product);\n"
-"   }\n"
-"    \n"
-"   public void persist(Product product) {\n"
-"      em.persist(product);\n"
-"      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
-"(product);\n"
-"   }\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"\n"
-"    @PersistenceContext EntityManager em;\n"
-"    @Observable Event<Product> productEvent;\n"
-"\n"
-"    public void delete(Product product) {\n"
-"        em.delete(product);\n"
-"        productEvent.fire(product, new AnnotationLiteral<Deleted>(){});\n"
-"    }\n"
-"    \n"
-"    public void persist(Product product) {\n"
-"        em.persist(product);\n"
-"        productEvent.fire(product, new AnnotationLiteral<Created>(){});\n"
-"    }\n"
-"    \n"
-"    ...\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:311
 #, no-c-format
 msgid ""
 "And now <literal>Catalog</literal> can observe the events after successful "
@@ -814,42 +479,270 @@
 "そして、 <literal>Catalog</literal> は次のようにトランザクションの完了が成功"
 "した後にイベントを観察できるようになります。"
 
-#. Tag: programlisting
-#: events.xml:315
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"   ...\n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
-"product) {\n"
-"      products.add(product);\n"
-"   }\n"
-"    \n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
-"product) {\n"
-"      products.remove(product);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"    ...\n"
-"    \n"
-"    void addProduct(@AfterTransactionSuccess @Observes @Created Product "
-"product) {\n"
-"        products.add(product);\n"
-"    }\n"
-"    \n"
-"    void addProduct(@AfterTransactionSuccess @Observes @Deleted Product "
-"product) {\n"
-"        products.remove(product);\n"
-"    }\n"
-"    \n"
-"}]]>"
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({FIELD, PARAMETER})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated { ... }]]>"
 
 #~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
+#~ msgstr "<![CDATA[@Observable Event<Document> documentEvent]]>"
+
+#~ msgid "<![CDATA[documentEvent.fire(document);]]>"
+#~ msgstr "<![CDATA[documentEvent.fire(document);]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Updated Event<Document> documentUpdatedEvent]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
+#~ "(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.fire( document, new AnnotationLiteral<Updated>()"
+#~ "{} );]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = "
+#~ "IF_EXISTS) @Updated Document d) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "   RoleType value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "    RoleType value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Role(ADMIN) Event<LoggedIn> LoggedInEvent;}}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "   extends AnnotationLiteral<Role> \n"
+#~ "   implements Role {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "    extends AnnotationLiteral<Role> \n"
+#~ "    implements Role {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new RoleBinding() {\n"
+#~ "   public void value() { return user.getRole(); }\n"
+#~ "}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.fire( document, new RoleBinding() { public void "
+#~ "value() { return user.getRole(); } } );]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>()"
+#~ "{}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.fire(document, new "
+#~ "AnnotationLiteral<Updated>(){});]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public void refreshCategoryTree(@Observes(during = "
+#~ "AFTER_SUCCESS) CategoryUpdateEvent event) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void refreshCategoryTree(@AfterTransactionSuccess "
+#~ "@Observes CategoryUpdateEvent event) { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   List<Product> products;\n"
+#~ "\n"
+#~ "   @Produces @Catalog \n"
+#~ "   List<Product> getCatalog() {\n"
+#~ "      if (products==null) {\n"
+#~ "         products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "            .getResultList();\n"
+#~ "      }\n"
+#~ "      return products;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    List<Product> products;\n"
+#~ "\n"
+#~ "    @Produces @Catalog \n"
+#~ "    List<Product> getCatalog() {\n"
+#~ "        if (products==null) {\n"
+#~ "            products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "                .getResultList();\n"
+#~ "        }\n"
+#~ "        return products;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "   @Inject @Any Event<Product> productEvent;\n"
+#~ "\n"
+#~ "   public void delete(Product product) {\n"
+#~ "      em.delete(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void persist(Product product) {\n"
+#~ "      em.persist(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    @Observable Event<Product> productEvent;\n"
+#~ "\n"
+#~ "    public void delete(Product product) {\n"
+#~ "        em.delete(product);\n"
+#~ "        productEvent.fire(product, new AnnotationLiteral<Deleted>(){});\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void persist(Product product) {\n"
+#~ "        em.persist(product);\n"
+#~ "        productEvent.fire(product, new AnnotationLiteral<Created>(){});\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    ...\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "   ...\n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
+#~ "product) {\n"
+#~ "      products.add(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
+#~ "product) {\n"
+#~ "      products.remove(product);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "    ...\n"
+#~ "    \n"
+#~ "    void addProduct(@AfterTransactionSuccess @Observes @Created Product "
+#~ "product) {\n"
+#~ "        products.add(product);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    void addProduct(@AfterTransactionSuccess @Observes @Deleted Product "
+#~ "product) {\n"
+#~ "        products.remove(product);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "The Web Beans event notification facility allows Web Beans to interact in "
 #~ "a totally decoupled manner. Event <emphasis>producers</emphasis> raise "
 #~ "events that are then delivered to event <emphasis>observers</emphasis> by "

Modified: doc/trunk/reference/ja-JP/example.po
===================================================================
--- doc/trunk/reference/ja-JP/example.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/example.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-06-09 03:51+0900\n"
 "Last-Translator: Shinobu NOGAMI <s-nogami at sourceforge.jp>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: example.xml:4
 #, no-c-format
 msgid "JSF web application example"
 msgstr "JSF Web アプリケーションサンプル"
 
 #. Tag: para
-#: example.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "Let's illustrate these ideas with a full example. We're going to implement "
@@ -33,113 +31,18 @@
 "ザのログイン / ログアウトを実装します。まず最初に、ログインしている間にユーザ"
 "名とパスワードを保持しておくための Web Bean を定義するでしょう:"
 
-#. Tag: programlisting
-#: example.xml:12
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    @NotNull @Length(min=3, max=25)\n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    @NotNull @Length(min=6, max=20)\n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named\n"
-"public class Credentials {\n"
-"        \n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:14
 #, fuzzy, no-c-format
 msgid "This bean is bound to the login prompt in the following JSF form:"
 msgstr ""
 "この Web Bean は、以下の JSF フォームのログインプロンプトにバインドされます:"
 
-#. Tag: programlisting
-#: example.xml:16
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<h:form>\n"
-"   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"      <f:validateBean>\n"
-"         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"         <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"         <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"      </f:validateBean>\n"
-"   </h:panelGrid>\n"
-"   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-msgstr ""
-"<![CDATA[<f:form>\n"
-"    <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"        <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"        <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"        <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"        <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"    </h:panelGrid>\n"
-"    <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"    <h:commandButton value=\"Logout\" acion=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</f:form]]>"
-
 #. Tag: para
-#: example.xml:18
 #, no-c-format
 msgid "Users are represented by a JPA entity:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:22
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Entity\n"
-"public class User {\n"
-"   private @NotNull @Length(min=3, max=25) @Id String username;\n"
-"   private @NotNull @Length(min=6, max=20) String password;\n"
-"   \n"
-"   public String getUsername() { return username; }\n"
-"   public void setUsername(String username) { this.username = username; }\n"
-"   public String setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named\n"
-"public class Credentials {\n"
-"        \n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:24
 #, no-c-format
 msgid ""
 "(Note that we're also going to need a <literal>persistence.xml</literal> "
@@ -148,7 +51,6 @@
 msgstr ""
 
 #. Tag: para
-#: example.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "The actual work is done by a session-scoped bean that maintains information "
@@ -159,141 +61,21 @@
 "Bean によって行われ、他の Web Bean に対して <literal>User</literal> エンティ"
 "ティを公開します:"
 
-#. Tag: programlisting
-#: example.xml:34
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login implements Serializable {\n"
-"\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject @UserDatabase EntityManager userDatabase;\n"
-"\n"
-"   private User user;\n"
-"    \n"
-"   public void login() {\n"
-"      List<User> results = userDatabase.createQuery(\n"
-"         \"select u from User u where u.username = :username and u.password "
-"= :password\")\n"
-"         .setParameter(\"username\", credentials.getUsername())\n"
-"         .setParameter(\"password\", credentials.getPassword())\n"
-"         .getResultList();\n"
-"        \n"
-"      if (!results.isEmpty()) {\n"
-"         user = results.get(0);\n"
-"      }\n"
-"      else {\n"
-"         // perhaps add code here to report a failed login\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void logout() {\n"
-"      user = null;\n"
-"   }\n"
-"    \n"
-"   public boolean isLoggedIn() {\n"
-"      return user != null;\n"
-"   }\n"
-"    \n"
-"   @Produces @LoggedIn User getCurrentUser() {\n"
-"      return user;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @PersistenceContext EntityManager userDatabase;\n"
-"\n"
-"    private User user;\n"
-"    \n"
-"    public void login() {\n"
-"            \n"
-"        List<User> results = userDatabase.createQuery(\n"
-"           \"select u from User u where u.username=:username and u.password=:"
-"password\")\n"
-"           .setParameter(\"username\", credentials.getUsername())\n"
-"           .setParameter(\"password\", credentials.getPassword())\n"
-"           .getResultList();\n"
-"        \n"
-"        if ( !results.isEmpty() ) {\n"
-"           user = results.get(0);\n"
-"        }\n"
-"        \n"
-"    }\n"
-"    \n"
-"    public void logout() {\n"
-"        user = null;\n"
-"    }\n"
-"    \n"
-"    public boolean isLoggedIn() {\n"
-"       return user!=null;\n"
-"    }\n"
-"    \n"
-"    @Produces @LoggedIn User getCurrentUser() {\n"
-"        return user;\n"
-"    }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:36
 #, no-c-format
 msgid ""
 "<literal>@LoggedIn</literal> and <literal>@UserDatabase</literal> are custom "
 "qualifier annotations:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:38
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"public @interface LoggedIn {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD})\n"
-"@BindingType\n"
-"public @interface LoggedIn {}]]>"
-
-#. Tag: programlisting
-#: example.xml:40
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, PARAMETER, FIELD})\n"
-"public @interface UserDatabase {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD})\n"
-"@BindingType\n"
-"public @interface LoggedIn {}]]>"
-
 #. Tag: para
-#: example.xml:42
 #, no-c-format
 msgid ""
 "We need an adaptor bean to expose our typesafe <literal>EntityManager</"
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:46
-#, no-c-format
-msgid ""
-"<![CDATA[class UserDatabaseProducer {\n"
-"   @Produces @UserDatabase @PersistenceContext \n"
-"   static EntityManager userDatabase;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "Now <literal>DocumentEditor</literal>, or any other bean, can easily inject "
@@ -301,51 +83,12 @@
 msgstr ""
 "これで他の Web Bean に、現在のユーザを簡単にインジェクトすることができます:"
 
-#. Tag: programlisting
-#: example.xml:50
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DocumentEditor {\n"
-"   @Inject Document document;\n"
-"   @Inject @LoggedIn User currentUser;\n"
-"   @Inject @DocumentDatabase EntityManager docDatabase;\n"
-"    \n"
-"   public void save() {\n"
-"      document.setCreatedBy(currentUser);\n"
-"      docDatabase.persist(document);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class DocumentEditor {\n"
-"\n"
-"    @Current Document document;\n"
-"    @LoggedIn User currentUser;\n"
-"    @PersistenceContext EntityManager docDatabase;\n"
-"    \n"
-"    public void save() {\n"
-"        document.setCreatedBy(currentUser);\n"
-"        docDatabase.persist(document);\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:52
 #, no-c-format
 msgid "Or we can reference the current user in a JSF view:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:54
-#, no-c-format
-msgid ""
-"<![CDATA[<h:panelGroup rendered=\"#{login.loggedIn}\">\n"
-"   signed in as #{currentUser.username}\n"
-"</h:panelGroup>]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:56
 #, fuzzy, no-c-format
 msgid ""
 "Hopefully, this example gave you a taste of the CDI programming model. In "
@@ -355,6 +98,229 @@
 "とができます。次の章では、 Web Beans の依存性注入 (dependency injection) をよ"
 "り深く説明します。"
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=3, max=25)\n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=6, max=20)\n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named\n"
+#~ "public class Credentials {\n"
+#~ "        \n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<h:form>\n"
+#~ "   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "      <f:validateBean>\n"
+#~ "         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"username\" value=\"#{credentials.username}\"/"
+#~ ">\n"
+#~ "         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"password\" value=\"#{credentials.password}\"/"
+#~ ">\n"
+#~ "      </f:validateBean>\n"
+#~ "   </h:panelGrid>\n"
+#~ "   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#"
+#~ "{!login.loggedIn}\"/>\n"
+#~ "   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</h:form>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<f:form>\n"
+#~ "    <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "        <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "        <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
+#~ "        <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "        <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
+#~ "    </h:panelGrid>\n"
+#~ "    <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered="
+#~ "\"#{!login.loggedIn}\"/>\n"
+#~ "    <h:commandButton value=\"Logout\" acion=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</f:form]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Entity\n"
+#~ "public class User {\n"
+#~ "   private @NotNull @Length(min=3, max=25) @Id String username;\n"
+#~ "   private @NotNull @Length(min=6, max=20) String password;\n"
+#~ "   \n"
+#~ "   public String getUsername() { return username; }\n"
+#~ "   public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "   public String setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named\n"
+#~ "public class Credentials {\n"
+#~ "        \n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login implements Serializable {\n"
+#~ "\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject @UserDatabase EntityManager userDatabase;\n"
+#~ "\n"
+#~ "   private User user;\n"
+#~ "    \n"
+#~ "   public void login() {\n"
+#~ "      List<User> results = userDatabase.createQuery(\n"
+#~ "         \"select u from User u where u.username = :username and u."
+#~ "password = :password\")\n"
+#~ "         .setParameter(\"username\", credentials.getUsername())\n"
+#~ "         .setParameter(\"password\", credentials.getPassword())\n"
+#~ "         .getResultList();\n"
+#~ "        \n"
+#~ "      if (!results.isEmpty()) {\n"
+#~ "         user = results.get(0);\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         // perhaps add code here to report a failed login\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void logout() {\n"
+#~ "      user = null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public boolean isLoggedIn() {\n"
+#~ "      return user != null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "      return user;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @PersistenceContext EntityManager userDatabase;\n"
+#~ "\n"
+#~ "    private User user;\n"
+#~ "    \n"
+#~ "    public void login() {\n"
+#~ "            \n"
+#~ "        List<User> results = userDatabase.createQuery(\n"
+#~ "           \"select u from User u where u.username=:username and u."
+#~ "password=:password\")\n"
+#~ "           .setParameter(\"username\", credentials.getUsername())\n"
+#~ "           .setParameter(\"password\", credentials.getPassword())\n"
+#~ "           .getResultList();\n"
+#~ "        \n"
+#~ "        if ( !results.isEmpty() ) {\n"
+#~ "           user = results.get(0);\n"
+#~ "        }\n"
+#~ "        \n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void logout() {\n"
+#~ "        user = null;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public boolean isLoggedIn() {\n"
+#~ "       return user!=null;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "        return user;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface LoggedIn {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD})\n"
+#~ "@BindingType\n"
+#~ "public @interface LoggedIn {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface UserDatabase {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD})\n"
+#~ "@BindingType\n"
+#~ "public @interface LoggedIn {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "   @Inject Document document;\n"
+#~ "   @Inject @LoggedIn User currentUser;\n"
+#~ "   @Inject @DocumentDatabase EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "   public void save() {\n"
+#~ "      document.setCreatedBy(currentUser);\n"
+#~ "      docDatabase.persist(document);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "\n"
+#~ "    @Current Document document;\n"
+#~ "    @LoggedIn User currentUser;\n"
+#~ "    @PersistenceContext EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "    public void save() {\n"
+#~ "        document.setCreatedBy(currentUser);\n"
+#~ "        docDatabase.persist(document);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
 #~ msgid "Of course, <literal>@LoggedIn</literal> is a binding annotation:"
 #~ msgstr ""
 #~ "もちろん <literal>@LoggedIn</literal> は、バインディングアノテーションで"

Modified: doc/trunk/reference/ja-JP/extend.po
===================================================================
--- doc/trunk/reference/ja-JP/extend.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/extend.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-04-27 12:26+0900\n"
 "Last-Translator: wadahiro <wadahiro at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: extend.xml:5
 #, no-c-format
 msgid "Portable extensions"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "CDI is intended to be a foundation for frameworks, extensions and "
@@ -34,13 +32,11 @@
 "者によって構想されました。"
 
 #. Tag: para
-#: extend.xml:15
 #, no-c-format
 msgid "integration with Business Process Management engines,"
 msgstr "ビジネスプロセス管理エンジンとの統合、"
 
 #. Tag: para
-#: extend.xml:18
 #, no-c-format
 msgid ""
 "integration with third-party frameworks such as Spring, Seam, GWT or Wicket, "
@@ -50,31 +46,26 @@
 "して"
 
 #. Tag: para
-#: extend.xml:23
 #, fuzzy, no-c-format
 msgid "new technology based upon the CDI programming model."
 msgstr "Web Beansのプログラミングモデルに基づく新技術です。"
 
 #. Tag: para
-#: extend.xml:27
 #, no-c-format
 msgid "More formally, according to the spec:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:32
 #, no-c-format
 msgid "A portable extension may integrate with the container by:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:35
 #, no-c-format
 msgid "Providing its own beans, interceptors and decorators to the container"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:40
 #, no-c-format
 msgid ""
 "Injecting dependencies into its own objects using the dependency injection "
@@ -82,13 +73,11 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:45
 #, no-c-format
 msgid "Providing a context implementation for a custom scope"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:50
 #, no-c-format
 msgid ""
 "Augmenting or overriding the annotation-based metadata with metadata from "
@@ -96,13 +85,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:58
 #, fuzzy, no-c-format
 msgid "Creating an <literal>Extension</literal>"
 msgstr "<literal>Bean</literal>クラス"
 
 #. Tag: para
-#: extend.xml:60
 #, no-c-format
 msgid ""
 "The first step in creating a portable extension is to write a class that "
@@ -111,14 +98,7 @@
 "service provider architecture."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:66
-#, no-c-format
-msgid "class MyExtension implements Extension { ... }"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:68
 #, no-c-format
 msgid ""
 "Next, we need to register our extension as a service provider by creating a "
@@ -126,14 +106,7 @@
 "literal>, which contains the name of our extension class:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:74
-#, no-c-format
-msgid "org.mydomain.extension.MyExtension"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:76
 #, no-c-format
 msgid ""
 "An extension is not a bean, exactly, since it is instantiated by the "
@@ -142,18 +115,7 @@
 "process is complete."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:82
-#, no-c-format
-msgid ""
-"@Inject \n"
-"MyBean(MyExtension myExtension) {\n"
-"   myExtension.doSomething();\n"
-"}"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:84
 #, no-c-format
 msgid ""
 "And, like beans, extensions can have observer methods. Usually, the observer "
@@ -161,33 +123,28 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:92
 #, no-c-format
 msgid "Container lifecycle events"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:94
 #, no-c-format
 msgid ""
 "During the initialization process, the container fires a series of events, "
 "including:"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:101
-#, no-c-format
-msgid "BeforeBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>BeforeBeanDiscovery</literal>"
+msgstr "<literal>Manager</literal>オブジェクト"
 
-#. Tag: literal
-#: extend.xml:106
-#, no-c-format
-msgid "ProcessAnnotatedType"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>ProcessAnnotatedType</literal>"
+msgstr "<literal>Manager</literal>オブジェクト"
 
 #. Tag: para
-#: extend.xml:110
 #, no-c-format
 msgid ""
 "<literal>ProcessInjectionTarget</literal> and <literal>ProcessProducer</"
@@ -195,54 +152,27 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:115
 #, no-c-format
 msgid ""
 "<literal>ProcessBean</literal> and <literal>ProcessObserverMethod</literal>"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:121
-#, no-c-format
-msgid "AfterBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>AfterBeanDiscovery</literal>"
+msgstr "<literal>Manager</literal>オブジェクト"
 
-#. Tag: literal
-#: extend.xml:126
+#. Tag: para
 #, no-c-format
-msgid "AfterDeploymentValidation"
+msgid "<literal>AfterDeploymentValidation</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:131
 #, no-c-format
 msgid "Extensions may observe these events:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:135
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"   \n"
-"   void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bbd) {\n"
-"      Logger.global.debug(\"beginning the scanning process\");\n"
-"   }\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      Logger.global.debug(\"scanning type: \" + pat.getAnnotatedType()."
-"getJavaClass().getName());\n"
-"   } \n"
-"\n"
-"   void afterBeanDiscovery(@Observes AfterBeanDiscovery abd) {\n"
-"      Logger.global.debug(\"finished the scanning process\");\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:137
 #, no-c-format
 msgid ""
 "In fact, the extension can do a lot more than just observe. The extension is "
@@ -250,44 +180,18 @@
 "example:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:142
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      //tell the container to ignore the type if it is annotated @Ignore\n"
-"      if ( pat.getAnnotatedType().isAnnotionPresent(Ignore.class) ) pat.veto"
-"();   \n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:144
 #, fuzzy, no-c-format
 msgid "The observer method may inject a <literal>BeanManager</literal>"
 msgstr ""
 "Web Beansを拡張するための中枢部は<literal>Manager</literal>オブジェクトです。"
 
-#. Tag: programlisting
-#: extend.xml:148
-#, no-c-format
-msgid ""
-"<![CDATA[<T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> "
-"pat, BeanManager beanManager) { ... }]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:153
 #, fuzzy, no-c-format
 msgid "The <literal>BeanManager</literal> object"
 msgstr "<literal>Manager</literal>オブジェクト"
 
 #. Tag: para
-#: extend.xml:155
 #, fuzzy, no-c-format
 msgid ""
 "The nerve center for extending CDI is the <literal>BeanManager</literal> "
@@ -297,54 +201,7 @@
 "<literal>Manager</literal>インタフェースで、プログラミングによりWeb Beans、イ"
 "ンタセプタ、デコレータ、オブザーバ、およびコンテキストを登録、取得できます。"
 
-#. Tag: programlisting
-#: extend.xml:161
-#, no-c-format
-msgid ""
-"<![CDATA[public interface BeanManager {\n"
-"   public Object getReference(Bean<?> bean, Type beanType, "
-"CreationalContext<?> ctx);\n"
-"   public Object getInjectableReference(InjectionPoint ij, "
-"CreationalContext<?> ctx);\n"
-"   public <T> CreationalContext<T> createCreationalContext(Contextual<T> "
-"contextual);\n"
-"   public Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers);\n"
-"   public Set<Bean<?>> getBeans(String name);\n"
-"   public Bean<?> getPassivationCapableBean(String id);\n"
-"   public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);\n"
-"   public void validate(InjectionPoint injectionPoint);\n"
-"   public void fireEvent(Object event, Annotation... qualifiers);\n"
-"   public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, "
-"Annotation... qualifiers);\n"
-"   public List<Decorator<?>> resolveDecorators(Set<Type> types, "
-"Annotation... qualifiers);\n"
-"   public List<Interceptor<?>> resolveInterceptors(InterceptionType type, "
-"Annotation... interceptorBindings);\n"
-"   public boolean isScope(Class<? extends Annotation> annotationType);\n"
-"   public boolean isNormalScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isPassivatingScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isQualifier(Class<? extends Annotation> annotationType);\n"
-"   public boolean isInterceptorBinding(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isStereotype(Class<? extends Annotation> annotationType);\n"
-"   public Set<Annotation> getInterceptorBindingDefinition(Class<? extends "
-"Annotation> bindingType);\n"
-"   public Set<Annotation> getStereotypeDefinition(Class<? extends "
-"Annotation> stereotype);\n"
-"   public Context getContext(Class<? extends Annotation> scopeType);\n"
-"   public ELResolver getELResolver();\n"
-"   public ExpressionFactory wrapExpressionFactory(ExpressionFactory "
-"expressionFactory);\n"
-"   public <T> AnnotatedType<T> createAnnotatedType(Class<T> type);\n"
-"   public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> "
-"type);\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:163
 #, fuzzy, no-c-format
 msgid ""
 "Any bean or other Java EE component which supports injection can obtain an "
@@ -353,14 +210,7 @@
 "<literal>Manager</literal>インスタンスをインジェクションで取得することができ"
 "ます。"
 
-#. Tag: programlisting
-#: extend.xml:166
-#, fuzzy, no-c-format
-msgid "@Inject BeanManager beanManager;"
-msgstr "@Current Manager manager"
-
 #. Tag: para
-#: extend.xml:168
 #, no-c-format
 msgid ""
 "Java EE components may obtain an instance of <literal>BeanManager</literal> "
@@ -370,7 +220,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:174
 #, fuzzy, no-c-format
 msgid ""
 "Let's study some of the interfaces exposed by the <literal>BeanManager</"
@@ -379,13 +228,11 @@
 "Web Beansを拡張するための中枢部は<literal>Manager</literal>オブジェクトです。"
 
 #. Tag: title
-#: extend.xml:179
 #, fuzzy, no-c-format
 msgid "The <literal>InjectionTarget</literal> interface"
 msgstr "<literal>Context</literal>インタフェース"
 
 #. Tag: para
-#: extend.xml:181
 #, no-c-format
 msgid ""
 "The first thing that a framework developer is going to look for in the "
@@ -395,7 +242,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:188
 #, no-c-format
 msgid ""
 "We recommend that frameworks let CDI take over the job of actually "
@@ -406,50 +252,12 @@
 "field injection will be supported."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:196
-#, no-c-format
-msgid ""
-"<![CDATA[//get the BeanManager from JNDI\n"
-"BeanManager beanManager = (BeanManager) new InitialContext().lookup(\"java:"
-"comp/BeanManager\");\n"
-"\n"
-"//CDI uses an AnnotatedType object to read the annotations of a class\n"
-"AnnotatedType<SomeFrameworkComponent> type = beanManager.createAnnotatedType"
-"(SomeFrameworkComponent.class);\n"
-"\n"
-"//The extension uses an InjectionTarget to delegate instantiation, "
-"dependency injection \n"
-"//and lifecycle callbacks to the CDI container\n"
-"InjectionTarget<SomeFrameworkComponent> it = beanManager."
-"createInjectionTarget(type);\n"
-"\n"
-"//each instance needs its own CDI CreationalContext\n"
-"CreationalContext ctx = beanManager.createCreationalContext(null);\n"
-"\n"
-"//instantiate the framework component and inject its dependencies\n"
-"SomeFrameworkComponent instance = it.produce(ctx);  //call the constructor\n"
-"it.inject(instance, ctx);  //call initializer methods and perform field "
-"injection\n"
-"it.postConstruct(instance);  //call the @PostConstruct method\n"
-"\n"
-"...\n"
-"\n"
-"//destroy the framework component instance and clean up dependent objects\n"
-"it.preDestroy(instance);  //call the @PreDestroy method\n"
-"it.dispose(instance);  //it is now safe to discard the instance\n"
-"ctx.release();  //clean up dependent objects\n"
-"]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:201
 #, fuzzy, no-c-format
 msgid "The <literal>Bean</literal> interface"
 msgstr "<literal>Context</literal>インタフェース"
 
 #. Tag: para
-#: extend.xml:203
 #, fuzzy, no-c-format
 msgid ""
 "Instances of the interface <literal>Bean</literal> represent beans. There is "
@@ -463,46 +271,18 @@
 "ジェクトに登録された<literal>Bean</literal>のインスタンスがあります。"
 
 #. Tag: para
-#: extend.xml:210
 #, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface exposes all the interesting things we "
-"dicussed in <xref linkend=\"bean-anatomy\"/>."
+"dicussed in <xref linkend=\"bean-anatomy\" />."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:215
-#, no-c-format
-msgid ""
-"<![CDATA[public interface Bean<T> extends Contextual<T> {\n"
-"   public Set<Type> getTypes();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public String getName();\n"
-"   public Set<Class<? extends Annotation>> getStereotypes();\n"
-"   public Class<?> getBeanClass();\n"
-"   public boolean isAlternative();\n"
-"   public boolean isNullable();\n"
-"   public Set<InjectionPoint> getInjectionPoints();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:217
 #, no-c-format
 msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:221
-#, no-c-format
-msgid ""
-"<![CDATA[Set<Bean<?>> allBeans = beanManager.getBeans(Obect.class, new "
-"AnnotationLiteral<Any>() {});]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:223
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface makes it possible for a portable "
@@ -519,13 +299,11 @@
 "ト可能にするために、<literal>Bean</literal>クラスを使用できます。"
 
 #. Tag: title
-#: extend.xml:233
 #, fuzzy, no-c-format
 msgid "Registering a <literal>Bean</literal>"
 msgstr "<literal>Bean</literal>クラス"
 
 #. Tag: para
-#: extend.xml:235
 #, no-c-format
 msgid ""
 "The most common kind of CDI portable extension registers a bean (or beans) "
@@ -533,7 +311,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:239
 #, no-c-format
 msgid ""
 "In this example, we make a framework class, <literal>SecurityManager</"
@@ -543,101 +320,7 @@
 "<literal>SecurityManager</literal> instance."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[public class SecurityManagerExtension implements Extension {\n"
-"    \n"
-"    void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager "
-"bm) {\n"
-"            \n"
-"        //use this to read annotations of the class\n"
-"        AnnotatedType<SecurityManager> at = bm.createAnnotatedType"
-"(SecurityManager.class); \n"
-"\n"
-"        //use this to instantiate the class and inject dependencies\n"
-"        final InjectionTarget<SecurityManager> it = bm.createInjectionTarget"
-"(at); \n"
-"\n"
-"        abd.addBean( new Bean<SecurityManager>() {\n"
-"\n"
-"            @Override\n"
-"            public Class<?> getBeanClass() {\n"
-"                return SecurityManager.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public String getName() {\n"
-"                return \"securityManager\";\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getQualifiers() {\n"
-"                Set<Annotation> qualifiers = new HashSet<Annotation>();\n"
-"                qualifiers.add( new AnnotationLiteral<Default>() {} );\n"
-"                qualifiers.add( new AnnotationLiteral<Any>() {} );\n"
-"                return qualifiers;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<? extends Annotation> getScope() {\n"
-"                return SessionScoped.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Class<? extends Annotation>> getStereotypes() {\n"
-"                return Collections.emptySet();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypes() {\n"
-"                Set<Type> types = new HashSet<Type>();\n"
-"                types.add(SecurityManager.class);\n"
-"                types.add(Object.class);\n"
-"                return types;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAlternative() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isNullable() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public SecurityManager create(CreationalContext<SecurityManager> "
-"ctx) {\n"
-"                SecurityManager instance = it.produce(ctx);\n"
-"                it.inject(instance, ctx);\n"
-"                it.postConstruct(instance);\n"
-"                return instance;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void destroy(SecurityManager instance, \n"
-"                                CreationalContext<SecurityManager> ctx) {\n"
-"                it.preDestroy(instance);\n"
-"                it.dispose(instance);\n"
-"                ctx.release();\n"
-"            }\n"
-"            \n"
-"        } );\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:248
 #, no-c-format
 msgid ""
 "But a portable extension can also mess with beans that are discovered "
@@ -645,13 +328,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:255
 #, no-c-format
 msgid "Wrapping an <literal>AnnotatedType</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:257
 #, no-c-format
 msgid ""
 "One of the most interesting things that an extension class can do is process "
@@ -660,7 +341,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:262
 #, no-c-format
 msgid ""
 "Let's start with an example of an extension that provides support for the "
@@ -671,101 +351,7 @@
 "<literal>value()</literal> of the <literal>@Named</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:270
-#, no-c-format
-msgid ""
-"<![CDATA[public class QualifiedNameExtension implements Extension {\n"
-"\n"
-"    <X> void processAnnotatedType(@Observes ProcessAnnotatedType<X> pat) {\n"
-"\n"
-"        //wrap this to override the annotations of the class\n"
-"        final AnnotatedType<X> at = pat.getAnnotatedType();\n"
-"        \n"
-"        AnnotatedType<X> wrapped = new AnnotatedType<X>() {\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedConstructor<X>> getConstructors() {\n"
-"                return at.getConstructors();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedField<? super X>> getFields() {\n"
-"                return at.getFields();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<X> getJavaClass() {\n"
-"                return at.getJavaClass();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedMethod<? super X>> getMethods() {\n"
-"                return at.getMethods();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public <T extends Annotation> T getAnnotation(final Class<T> "
-"annType) {\n"
-"                if ( Named.class.equals(annType) ) {\n"
-"                    class NamedLiteral \n"
-"                            extends AnnotationLiteral<Named> \n"
-"                            implements Named {\n"
-"                        @Override\n"
-"                        public String value() {\n"
-"                            Package pkg = at.getClass().getPackage();\n"
-"                            String unqualifiedName = at.getAnnotation(Named."
-"class).value();\n"
-"                            final String qualifiedName;\n"
-"                            if ( pkg.isAnnotationPresent(Named.class) ) {\n"
-"                                qualifiedName = pkg.getAnnotation(Named."
-"class).value() \n"
-"                                      + '.' + unqualifiedName;\n"
-"                            }\n"
-"                            else {\n"
-"                                qualifiedName = unqualifiedName;\n"
-"                            }\n"
-"                            return qualifiedName;\n"
-"                        }\n"
-"                    }\n"
-"                    return (T) new NamedLiteral();\n"
-"                }\n"
-"                else {\n"
-"                    return at.getAnnotation(annType);\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getAnnotations() {\n"
-"                return at.getAnnotations();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Type getBaseType() {\n"
-"                return at.getBaseType();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypeClosure() {\n"
-"                return at.getTypeClosure();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annType) {\n"
-"                return at.isAnnotationPresent(annType);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pat.setAnnotatedType(wrapped);\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:272
 #, no-c-format
 msgid ""
 "Here's a second example, which adds the <literal>@Alternative</literal> "
@@ -773,41 +359,7 @@
 "literal> interface."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:277
-#, no-c-format
-msgid ""
-"<![CDATA[class ServiceAlternativeExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"   \n"
-"      final AnnotatedType<T> type = pat.getAnnotatedType();\n"
-"      \n"
-"      if ( Service.class.isAssignableFrom( type.getJavaClass() ) ) {\n"
-"      \n"
-"         //if the class implements Service, make it an @Alternative\n"
-"         AnnotatedType<T> wrapped = new AnnotatedType<T>() {\n"
-"         \n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annotationType) {\n"
-"               return annotationType.equals(Alternative.class) ? \n"
-"                  true : type.isAnnotationPresent(annotationType);\n"
-"            }\n"
-"            \n"
-"            //remaining methods of AnnotatedType\n"
-"            ...\n"
-"         }\n"
-"         \n"
-"         pat.setAnnotatedType(wrapped);\n"
-"      }\n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:283
 #, no-c-format
 msgid ""
 "The <literal>AnnotatedType</literal> is not the only thing that can be "
@@ -815,13 +367,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:288
 #, no-c-format
 msgid "Wrapping an <literal>InjectionTarget</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:290
 #, no-c-format
 msgid ""
 "The <literal>InjectionTarget</literal> interface exposes operations for "
@@ -833,7 +383,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:297
 #, no-c-format
 msgid ""
 "Here's a CDI portable extension that reads values from properties files and "
@@ -845,16 +394,7 @@
 "<literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:305
-#, no-c-format
-msgid ""
-"firstName=Gavin\n"
-"lastName=King"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:307
 #, no-c-format
 msgid ""
 "The portable extension works by wrapping the containers "
@@ -862,121 +402,7 @@
 "<literal>inject()</literal> method."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:310
-#, no-c-format
-msgid ""
-"<![CDATA[public class ConfigExtension implements Extension {\n"
-"\n"
-"        <X> void processInjectionTarget(@Observes ProcessInjectionTarget<X> "
-"pit) {\n"
-"                \n"
-"                //wrap this to intercept the component lifecycle\n"
-"            final InjectionTarget<X> it = pit.getInjectionTarget();\n"
-"            \n"
-"        final Map<Field, Object> configuredValues = new HashMap<Field, "
-"Object>();\n"
-"        \n"
-"        //use this to read annotations of the class and its members\n"
-"        AnnotatedType<X> at = pit.getAnnotatedType();\n"
-"        \n"
-"        //read the properties file\n"
-"        String propsFileName = at.getClass().getSimpleName() + \".properties"
-"\";\n"
-"        InputStream stream = at.getJavaClass().getResourceAsStream"
-"(propsFileName);\n"
-"        if (stream!=null) {\n"
-"            \n"
-"            try {\n"
-"                Properties props = new Properties();\n"
-"                props.load(stream);\n"
-"                for (Map.Entry<Object, Object> property : props.entrySet()) "
-"{\n"
-"                    String fieldName = property.getKey().toString();\n"
-"                    Object value = property.getValue();\n"
-"                    try {\n"
-"                        Field field = at.getJavaClass().getField"
-"(fieldName);\n"
-"                        field.setAccessible(true);\n"
-"                        if ( field.getType().isAssignableFrom( value.getClass"
-"() ) ) {\n"
-"                            configuredValues.put(field, value);\n"
-"                        }\n"
-"                        else {\n"
-"                            //TODO: do type conversion automatically\n"
-"                            pit.addDefinitionError( new InjectionException(\n"
-"                                   \"field is not of type String: \" + "
-"field ) );\n"
-"                        }\n"
-"                    }\n"
-"                    catch (NoSuchFieldException nsfe) {\n"
-"                        pit.addDefinitionError(nsfe);\n"
-"                    }\n"
-"                    finally {\n"
-"                        stream.close();\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"            catch (IOException ioe) {\n"
-"                pit.addDefinitionError(ioe);\n"
-"            }\n"
-"        }\n"
-"        \n"
-"        InjectionTarget<X> wrapped = new InjectionTarget<X>() {\n"
-"\n"
-"            @Override\n"
-"            public void inject(X instance, CreationalContext<X> ctx) {\n"
-"                it.inject(instance, ctx);\n"
-"                \n"
-"                //set the values onto the new instance of the component\n"
-"                for (Map.Entry<Field, Object> configuredValue: "
-"configuredValues.entrySet()) {\n"
-"                    try {\n"
-"                        configuredValue.getKey().set(instance, "
-"configuredValue.getValue());\n"
-"                    }\n"
-"                    catch (Exception e) {\n"
-"                        throw new InjectionException(e);\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void postConstruct(X instance) {\n"
-"                it.postConstruct(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void preDestroy(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void dispose(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public X produce(CreationalContext<X> ctx) {\n"
-"                return it.produce(ctx);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pit.setInjectionTarget(wrapped);\n"
-"        \n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:312
 #, no-c-format
 msgid ""
 "There's a lot more to the portable extension SPI than what we've discussed "
@@ -985,13 +411,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:320
 #, no-c-format
 msgid "The <literal>Context</literal> interface"
 msgstr "<literal>Context</literal>インタフェース"
 
 #. Tag: para
-#: extend.xml:322
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Context</literal> interface supports addition of new scopes to "
@@ -1000,30 +424,7 @@
 "<literal>Context</literal>インタフェースはWeb Beansへの新しいスコープの追加、"
 "または新しい環境での組み込みスコープの拡張をサポートします。"
 
-#. Tag: programlisting
-#: extend.xml:327
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface Context {\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
-"creationalContext);\n"
-"   public <T> T get(Contextual<T> contextual);\n"
-"   boolean isActive();\n"
-"}]]>"
-msgstr ""
-"public interface Context {\n"
-"    \n"
-"    public Class&lt;? extends Annotation&gt; getScopeType();\n"
-"    \n"
-"    public &lt;T&gt; T get(Bean&lt;T&gt; bean, boolean create);\n"
-"    \n"
-"    boolean isActive();\n"
-"    \n"
-"}"
-
 #. Tag: para
-#: extend.xml:329
 #, fuzzy, no-c-format
 msgid ""
 "For example, we might implement <literal>Context</literal> to add a business "
@@ -1035,7 +436,31 @@
 "<literal>Context</literal>を実装するかもしれません。"
 
 #, fuzzy
+#~ msgid "@Inject BeanManager beanManager;"
+#~ msgstr "@Current Manager manager"
+
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public interface Context {\n"
+#~ "   public Class<? extends Annotation> getScope();\n"
+#~ "   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
+#~ "creationalContext);\n"
+#~ "   public <T> T get(Contextual<T> contextual);\n"
+#~ "   boolean isActive();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "public interface Context {\n"
+#~ "    \n"
+#~ "    public Class&lt;? extends Annotation&gt; getScopeType();\n"
+#~ "    \n"
+#~ "    public &lt;T&gt; T get(Bean&lt;T&gt; bean, boolean create);\n"
+#~ "    \n"
+#~ "    boolean isActive();\n"
+#~ "    \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
 #~ "There are two subinterfaces of <literal>Bean</literal> defined by the CDI "
 #~ "specification: <literal>Interceptor</literal> and <literal>Decorator</"
 #~ "literal>."

Modified: doc/trunk/reference/ja-JP/extensions.po
===================================================================
--- doc/trunk/reference/ja-JP/extensions.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/extensions.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-05-22 22:46+0900\n"
 "Last-Translator: TANABE Junnichi <jun at lmns.biz>\n"
 "Language-Team: none\n"
@@ -15,13 +15,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: extensions.xml:8
 #, fuzzy, no-c-format
 msgid "CDI extensions available as part of Weld"
 msgstr "Web Beansの一部として利用可能なJSR-299拡張機能"
 
 #. Tag: para
-#: extensions.xml:11
 #, fuzzy, no-c-format
 msgid "These modules are usable on any JSR-299 implementation, not just Weld!"
 msgstr ""
@@ -29,13 +27,11 @@
 "できます!"
 
 #. Tag: title
-#: extensions.xml:17
 #, fuzzy, no-c-format
 msgid "Weld Logger"
 msgstr "Web Beansロガー"
 
 #. Tag: para
-#: extensions.xml:19
 #, fuzzy, no-c-format
 msgid ""
 "Adding logging to your application is now even easier with simple injection "
@@ -49,40 +45,7 @@
 "ンを付けることで適切なロガーオブジェクトがそのbeanのインスタンスにインジェク"
 "トされるでしょう。"
 
-#. Tag: programlisting
-#: extensions.xml:25
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[import org.slf4j.Logger;\n"
-"import javax.inject.Inject;\n"
-"\n"
-"public class Checkout {\n"
-"   private @Inject Logger log;\n"
-"\n"
-"   public void invoiceItems() {\n"
-"      ShoppingCart cart;\n"
-"      ...\n"
-"      log.debug(\"Items invoiced for {}\", cart);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"    import org.jboss.webbeans.annotation.Logger;\n"
-"    import org.jboss.webbeans.log.Log;\n"
-"    \n"
-"    @Logger\n"
-"    private Log log;\n"
-"\n"
-"    void invoiceItems() {\n"
-"        ShoppingCart cart;\n"
-"        . . .\n"
-"        log.debug(\"Items invoiced for {0}\", cart);\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: extensions.xml:27
 #, no-c-format
 msgid ""
 "The example shows how objects can be interpolated into a message. If you use "
@@ -92,7 +55,6 @@
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:34
 #, fuzzy, no-c-format
 msgid ""
 "You can add Weld logging to your project by including weld-logger.jar, sl4j-"
@@ -106,7 +68,6 @@
 "しても良いです。"
 
 #. Tag: para
-#: extensions.xml:39
 #, fuzzy, no-c-format
 msgid ""
 "If you are using Weld as your JSR-299 implementation, there's no need to "
@@ -118,6 +79,36 @@
 
 #, fuzzy
 #~ msgid ""
+#~ "<![CDATA[import org.slf4j.Logger;\n"
+#~ "import javax.inject.Inject;\n"
+#~ "\n"
+#~ "public class Checkout {\n"
+#~ "   private @Inject Logger log;\n"
+#~ "\n"
+#~ "   public void invoiceItems() {\n"
+#~ "      ShoppingCart cart;\n"
+#~ "      ...\n"
+#~ "      log.debug(\"Items invoiced for {}\", cart);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "    import org.jboss.webbeans.annotation.Logger;\n"
+#~ "    import org.jboss.webbeans.log.Log;\n"
+#~ "    \n"
+#~ "    @Logger\n"
+#~ "    private Log log;\n"
+#~ "\n"
+#~ "    void invoiceItems() {\n"
+#~ "        ShoppingCart cart;\n"
+#~ "        . . .\n"
+#~ "        log.debug(\"Items invoiced for {0}\", cart);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
 #~ "The example shows how objects can be interpolated into a message. This "
 #~ "interpolation is done using <emphasis>java.text.MessageFormat</emphasis>, "
 #~ "so see the JavaDoc for that class for more details. In this case, the "

Modified: doc/trunk/reference/ja-JP/gettingstarted.po
===================================================================
--- doc/trunk/reference/ja-JP/gettingstarted.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/gettingstarted.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,27 +14,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: gettingstarted.xml:5
 #, no-c-format
 msgid "Getting started with Weld"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:7
 #, no-c-format
 msgid ""
 "Weld comes with two starter example applications, in addition to more "
 "specialized examples. The first, <literal>weld-numberguess</literal>, is a "
-"web (WAR) example containing only non-transactional managed beans. This "
+"web (war) example containing only non-transactional managed beans. This "
 "example can be run on a wide range of servers, including JBoss AS, "
 "GlassFish, Apache Tomcat, Jetty, Google App Engine, and any compliant Java "
 "EE 6 container. The second example, <literal>weld-translator</literal>, is "
-"an enterprise (EAR) example that contains session beans. This example must "
-"be run on JBoss AS 5.2, Glassfish 3.0 or any compliant Java EE 6 container."
+"an enterprise (ear) example that contains session beans. This example must "
+"be run on JBoss AS 6.0, Glassfish 3.0 or any compliant Java EE 6 container."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:16
 #, fuzzy, no-c-format
 msgid ""
 "Both examples use JSF 2.0 as the web framework and, as such, can be found in "
@@ -44,13 +41,11 @@
 "numberguess</literal> フォルダ に見つけることができます。"
 
 #. Tag: title
-#: gettingstarted.xml:22
 #, no-c-format
 msgid "Prerequisites"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:24
 #, no-c-format
 msgid ""
 "To run the examples with the provided build scripts, you'll need the "
@@ -58,58 +53,47 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:30
 #, fuzzy, no-c-format
 msgid "the latest release of Weld, which contains the examples"
 msgstr "Web Beans の最新リリース"
 
 #. Tag: para
-#: gettingstarted.xml:33
 #, no-c-format
 msgid "Ant 1.7.0, to build and deploy the examples"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:36
 #, no-c-format
 msgid "a supported runtime environment (minimum versions shown)"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:39
-#, no-c-format
-msgid ""
-"JBoss AS 5.2.0 (currently only nightly builds of JBoss AS 5.2.0.Beta1 are "
-"available),"
-msgstr ""
+#, fuzzy, no-c-format
+msgid "JBoss AS 6.0.0,"
+msgstr "JBoss AS 5.0.1.GA あるいは"
 
 #. Tag: para
-#: gettingstarted.xml:42
 #, fuzzy, no-c-format
 msgid "GlassFish 3.0,"
 msgstr "GlassFish の使用"
 
 #. Tag: para
-#: gettingstarted.xml:45
 #, fuzzy, no-c-format
-msgid "Apache Tomcat 6.0.x (WAR example only), or"
+msgid "Apache Tomcat 6.0.x (war example only), or"
 msgstr "Apache Tomcat 6.0.x"
 
 #. Tag: para
-#: gettingstarted.xml:48
-#, no-c-format
-msgid "Jetty 6.1.x (WAR example only)"
-msgstr ""
+#, fuzzy, no-c-format
+msgid "Jetty 6.1.x (war example only)"
+msgstr "Apache Tomcat 6.0.x"
 
 #. Tag: para
-#: gettingstarted.xml:53
 #, no-c-format
 msgid ""
 "(optionally) Maven 2.x, to run the examples in an embedded servlet container"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:58
 #, no-c-format
 msgid ""
 "You'll need a full install of Ant 1.7.0. Some linux distributions only "
@@ -118,27 +102,24 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:64
 #, no-c-format
 msgid ""
 "In the next few sections, you'll be using the Ant command (<literal>ant</"
 "literal>) to invoke the Ant build script in each example to compile, "
-"assemble and deploy the example to JBoss AS and, for the WAR example, Apache "
-"Tomcat. You can also deploy the generated artifact (WAR or EAR) to any other "
+"assemble and deploy the example to JBoss AS and, for the war example, Apache "
+"Tomcat. You can also deploy the generated artifact (war or ear) to any other "
 "container that supports Java EE 6, such as GlassFish 3."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:71
 #, no-c-format
 msgid ""
 "If you have Maven installed, you can use the Maven command (<literal>mvn</"
-"literal>) to compile and assemble the standalone artifact (WAR or EAR) and, "
-"for the WAR example, run it in an embedded container."
+"literal>) to compile and assemble the standalone artifact (war or ear) and, "
+"for the war example, run it in an embedded container."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:76
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
@@ -146,28 +127,25 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:81
 #, fuzzy, no-c-format
 msgid "Deploying to JBoss AS"
 msgstr "JBoss AS 5 の使用"
 
 #. Tag: para
-#: gettingstarted.xml:83
 #, no-c-format
 msgid ""
 "To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss."
-"org/jbossas/\">JBoss AS 5.2.0.Beta1</ulink> or above. If a release of the "
-"JBoss AS 5.2 line isn't yet available, you can download a <ulink url="
-"\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-5.x-sun16/"
-"\">nightly snapshot</ulink>. The reason JBoss AS 5.2.0.Beta1 or above is "
-"required is because it's the first release that has both CDI and Bean "
-"Validation support built-in, making it close enough to Java EE 6 to run the "
-"examples. The good news is that there are no additional modifications you "
-"have to make to the server. It's ready to go!"
+"org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS "
+"6.0 line isn't yet available, you can download a <ulink url=\"http://hudson."
+"jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</"
+"ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the "
+"first release that has both CDI and Bean Validation support built-in, making "
+"it close enough to Java EE 6 to run the examples. The good news is that "
+"there are no additional modifications you have to make to the server. It's "
+"ready to go!"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:92
 #, no-c-format
 msgid ""
 "After you have downloaded JBoss AS, extract it. (We recommended renaming the "
@@ -177,16 +155,7 @@
 "installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[$> unzip jboss-5.2.*.zip\n"
-"$> mv jboss-5.2.*/ jboss-as-5.2]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:101
 #, no-c-format
 msgid ""
 "In order for the build scripts to know where to deploy the example, you have "
@@ -197,74 +166,36 @@
 "<literal>jboss.home</literal>, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:108
-#, fuzzy, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
-msgstr "jboss.home=/Applications/jboss-5.0.1.GA"
-
 #. Tag: para
-#: gettingstarted.xml:110
 #, fuzzy, no-c-format
 msgid "You're now ready to deploy your first example!"
 msgstr "これで、最初のサンプルをデプロイする用意ができました。"
 
 #. Tag: para
-#: gettingstarted.xml:114
 #, no-c-format
 msgid ""
 "Switch to the <literal>examples/jsf/numberguess</literal> directory and "
 "execute the Ant <literal>deploy</literal> target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:119
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant deploy]]>"
-msgstr ""
-"$ cd examples/numberguess\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:121
 #, no-c-format
 msgid ""
 "If you haven't already, start JBoss AS. You can either start JBoss AS from a "
 "Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:125
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/jboss-as-5.2\n"
-"$> ./bin/run.sh]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:127 gettingstarted.xml:369
 #, no-c-format
 msgid "a Windows command window:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:131
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\jboss-as-5.2\\bin\n"
-"$> run]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:133 gettingstarted.xml:375
 #, no-c-format
 msgid "or you can start the server using an IDE, like Eclipse."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:138
 #, no-c-format
 msgid ""
 "If you are using Eclipse, you should seriously consider installing the "
@@ -274,7 +205,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:145
 #, fuzzy, no-c-format
 msgid ""
 "Wait a few seconds for the application to deploy (or the application server "
@@ -288,7 +218,6 @@
 "定します。"
 
 #. Tag: para
-#: gettingstarted.xml:152
 #, no-c-format
 msgid ""
 "The Ant build script includes additional targets for JBoss AS to deploy and "
@@ -297,7 +226,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:158
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant restart</literal> - deploy the example in exploded format to "
@@ -307,7 +235,6 @@
 "す"
 
 #. Tag: para
-#: gettingstarted.xml:163
 #, no-c-format
 msgid ""
 "<literal>ant explode</literal> - update an exploded example, without "
@@ -317,7 +244,6 @@
 "プロイされたサンプルを必要な部分のみを更新します"
 
 #. Tag: para
-#: gettingstarted.xml:168
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant deploy</literal> - deploy the example in compressed jar format "
@@ -327,19 +253,16 @@
 "す"
 
 #. Tag: para
-#: gettingstarted.xml:173
 #, fuzzy, no-c-format
 msgid "<literal>ant undeploy</literal> - remove the example from JBoss AS"
 msgstr "<literal>ant undeploy</literal> - サーバからサンプルを削除します"
 
 #. Tag: para
-#: gettingstarted.xml:178
 #, no-c-format
 msgid "<literal>ant clean</literal> - clean the example"
 msgstr "<literal>ant clean</literal> - サンプルをクリーンします"
 
 #. Tag: para
-#: gettingstarted.xml:185
 #, no-c-format
 msgid ""
 "The second starter example, <literal>weld-translator</literal>, will "
@@ -348,27 +271,15 @@
 "translator example directory and execute the deploy target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/translator\n"
-"$> ant deploy]]>"
-msgstr ""
-"$ cd examples/translator\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:194
 #, no-c-format
 msgid ""
 "The translator uses session beans, which are packaged in an EJB module "
-"within an EAR. Java EE 6 will allow session beans to be deployed in WAR "
+"within an ear. Java EE 6 will allow session beans to be deployed in war "
 "modules, but that's a topic for a later chapter."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:200
 #, fuzzy, no-c-format
 msgid ""
 "Again, wait a few seconds for the application to deploy (if you're really "
@@ -380,55 +291,32 @@
 "webbeans-translator\">http://localhost:8080/webbeans-translator</ulink>) に設"
 "定します。"
 
-#. Tag: para
-#: gettingstarted.xml:206
-#, no-c-format
-msgid ""
-"TODO Insert note about upgrading the Weld deployer that directs reader to "
-"section on the JBoss AS environment"
-msgstr ""
-
 #. Tag: title
-#: gettingstarted.xml:213
 #, fuzzy, no-c-format
 msgid "Deploying to GlassFish"
 msgstr "GlassFish の使用"
 
 #. Tag: para
-#: gettingstarted.xml:215
 #, no-c-format
 msgid ""
-"Deploying to GlassFish should be easy, right? After all, it's the Java EE 6 "
-"reference implementation. Since it's the Java EE 6 reference implementation, "
-"that means it also bundles the JSR-299 reference implementation, Weld! So "
-"yes, it's very easy."
+"Deploying to GlassFish should be easy and familiar, right? After all, it's "
+"the Java EE 6 reference implementation and Weld is the JSR-299 reference "
+"implementation, meaning Weld gets bundled with GlassFish. So yes, it's all "
+"quite easy and familiar."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:221
 #, no-c-format
 msgid ""
 "To deploy the examples to GlassFish, you'll need the final <ulink url="
-"\"https://glassfish.dev.java.net/\">GlassFish V3</ulink> release (the "
-"preview release won't do). If the final release isn't yet available, you can "
-"download a <ulink url=\"http://download.java.net/glassfish/v3/promoted/"
-"\">promoted build</ulink> in the meantime. Select the b69 preview release or "
-"above that ends in either <literal>-unix.sh</literal> or <literal>-windows."
-"exe</literal> depending on your platform. After the download is complete, "
-"execute the installer. On Linux/Unix, you'll need to first make the script "
-"executable."
+"\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</"
+"ulink> release. Select the release that ends in either <literal>-unix.sh</"
+"literal> or <literal>-windows.exe</literal> depending on your platform. "
+"After the download is complete, execute the installer. On Linux/Unix, you'll "
+"need to first make the script executable."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:231
-#, no-c-format
-msgid ""
-"<![CDATA[$> chmod 755 glassfish-v3-b69-unix.sh\n"
-"$> ./glassfish-v3-b69-unix.sh]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:233
 #, no-c-format
 msgid ""
 "On Windows you can just click on the executable. Follow the instructions in "
@@ -439,7 +327,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:240
 #, no-c-format
 msgid ""
 "If you've deployed either of the starter examples, <literal>weld-"
@@ -448,16 +335,7 @@
 "either of the two directories and build it."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess (or examples/jsf/translator)\n"
-"$> ant package]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:248
 #, no-c-format
 msgid ""
 "The deployable archive for the <literal>weld-numberguess</literal>, named "
@@ -469,24 +347,17 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:255
 #, no-c-format
 msgid ""
-"You deploy applications to GlassFish using the <ulink url=\"http://"
-"localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin Console "
-"running, you need to start a GlassFish domain, in our case <literal>domain1</"
-"literal>. Switch to the <literal>bin</literal> folder in the directory where "
-"you installed GlassFish and execute the following command:"
+"One way to deploy applications to GlassFish is by using the <ulink url="
+"\"http://localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin "
+"Console running, you need to start a GlassFish domain, in our case "
+"<literal>domain1</literal>. Switch to the <literal>bin</literal> folder in "
+"the directory where you installed GlassFish and execute the following "
+"command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:262
-#, no-c-format
-msgid "<![CDATA[$> asadmin start-domain domain1]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:264
 #, no-c-format
 msgid ""
 "After a few seconds you can visit the Admin Console in the browser at the "
@@ -503,22 +374,26 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:276
 #, no-c-format
 msgid ""
+"Alternatively, you can deploy the application to GlassFish using the asadmin "
+"command:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The reason the same artifact can be deployed to both JBoss AS and GlassFish, "
 "without any modifications, is because all of the features being used are "
 "part of the standard platform. And what a capable platform it has become!"
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:285
 #, fuzzy, no-c-format
 msgid "Deploying to Apache Tomcat"
 msgstr "Apache Tomcat 6.0 の使用"
 
 #. Tag: para
-#: gettingstarted.xml:287
 #, no-c-format
 msgid ""
 "Servlet containers are not required to support Java EE services like CDI. "
@@ -527,7 +402,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:291
 #, no-c-format
 msgid ""
 "Weld comes with a servlet listener which bootstraps the CDI environment, "
@@ -538,7 +412,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:297
 #, fuzzy, no-c-format
 msgid ""
 "Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll "
@@ -548,16 +421,7 @@
 "Tomcat 6.0.18 以降を <ulink url=\"http://tomcat.apache.org/download-60.cgi"
 "\">tomcat.apache.org</ulink> からダウンロードして展開する必要があります。例:"
 
-#. Tag: programlisting
-#: gettingstarted.xml:302
-#, fuzzy, no-c-format
-msgid "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
-msgstr ""
-"<![CDATA[$ cd /Applications\n"
-"$ unzip ~/apache-tomcat-6.0.18.zip]]>"
-
 #. Tag: para
-#: gettingstarted.xml:304
 #, no-c-format
 msgid ""
 "You have two choices for how you can deploy the application to Tomcat. You "
@@ -568,13 +432,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:312
 #, no-c-format
 msgid "Deploying with Ant"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:314
 #, no-c-format
 msgid ""
 "In order for Ant to push the artifact to the Tomcat hot deploy directory, it "
@@ -585,38 +447,19 @@
 "property key <literal>tomcat.home</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:321
-#, fuzzy, no-c-format
-msgid "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
-msgstr "tomcat.home=/Applications/apache-tomcat-6.0.18"
-
 #. Tag: para
-#: gettingstarted.xml:323
 #, fuzzy, no-c-format
 msgid "Now you're ready to deploy the numberguess example to Tomcat!"
 msgstr "Tomcat への numberguess サンプルのデプロイ:"
 
 #. Tag: para
-#: gettingstarted.xml:327
 #, no-c-format
 msgid ""
 "Change to the <literal>examples/jsf/numberguess</literal> directory again "
 "and run the Ant <literal>deploy</literal> target for Tomcat:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:332
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant tomcat.deploy]]>"
-msgstr ""
-"$ cd examples/numberguess\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:335
 #, no-c-format
 msgid ""
 "The Ant build script includes additional targets for Tomcat to deploy and "
@@ -625,7 +468,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:341
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.restart</literal> - deploy the example in exploded "
@@ -635,7 +477,6 @@
 "ロイします"
 
 #. Tag: para
-#: gettingstarted.xml:346
 #, no-c-format
 msgid ""
 "<literal>ant tomcat.explode</literal> - update an exploded example, without "
@@ -645,7 +486,6 @@
 "形式でデプロイされたサンプルを必要な部分のみを更新します"
 
 #. Tag: para
-#: gettingstarted.xml:351
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.deploy</literal> - deploy the example in compressed jar "
@@ -655,39 +495,18 @@
 "ロイします"
 
 #. Tag: para
-#: gettingstarted.xml:356
 #, fuzzy, no-c-format
 msgid "<literal>ant tomcat.undeploy</literal> - remove the example from Tomcat"
 msgstr "<literal>ant undeploy</literal> - サーバからサンプルを削除します"
 
 #. Tag: para
-#: gettingstarted.xml:363
 #, no-c-format
 msgid ""
 "If you haven't already, start Tomcat. You can either start Tomcat from a "
 "Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:367
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/apache-tomcat-6\n"
-"$> ./bin/start.sh]]>"
-msgstr "$ /Applications/apache-tomcat-6.0.18/bin/startup.sh"
-
-#. Tag: programlisting
-#: gettingstarted.xml:373
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
-"$> start]]>"
-msgstr ""
-"<![CDATA[$ cd /Applications\n"
-"$ unzip ~/apache-tomcat-6.0.18.zip]]>"
-
 #. Tag: para
-#: gettingstarted.xml:379
 #, no-c-format
 msgid ""
 "Wait a few seconds for the application to deploy (or the application server "
@@ -698,13 +517,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:388
 #, no-c-format
 msgid "Deploying with Maven"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:390
 #, no-c-format
 msgid ""
 "You can also deploy the application to Tomcat using Maven. This section is a "
@@ -714,7 +531,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:396
 #, no-c-format
 msgid ""
 "The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
@@ -726,7 +542,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:403
 #, no-c-format
 msgid ""
 "To allow Maven to communicate with Tomcat over HTTP, edit the <literal>conf/"
@@ -734,41 +549,20 @@
 "following line:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:408
-#, no-c-format
-msgid "<![CDATA[<user username=\"admin\" password=\"\" roles=\"manager\"/>]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:410
 #, no-c-format
 msgid ""
 "Restart Tomcat. You can now deploy the application to Tomcat with Maven "
 "using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:414
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:exploded tomcat:exploded -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:416
 #, no-c-format
 msgid ""
 "Once the application is deployed, you can redeploy it using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:420
-#, no-c-format
-msgid "<![CDATA[$> mvn tomcat:redeploy -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:422
 #, no-c-format
 msgid ""
 "The <literal>-Ptomcat</literal> argument activates the <literal>tomcat</"
@@ -777,21 +571,13 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:427
 #, no-c-format
 msgid ""
 "Rather than shipping the container off to a standalone Tomcat installation, "
 "you can also execute the application in an embedded Tomcat 6 container:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:432
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace tomcat:run -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:434
 #, no-c-format
 msgid ""
 "The advantage of using the embedded server is that changes to assets in "
@@ -801,14 +587,7 @@
 "classpath resource, you need to execute a build:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:441
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:443
 #, no-c-format
 msgid ""
 "There are several other Maven goals that you can use if you are hacking on "
@@ -817,13 +596,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:453
 #, no-c-format
 msgid "Deploying to Jetty"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:457
 #, no-c-format
 msgid ""
 "Support for Jetty in the examples is a more recent addition. Since Jetty is "
@@ -834,7 +611,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:464
 #, no-c-format
 msgid ""
 "If you've read through the entire Tomcat section, then you're all ready to "
@@ -844,7 +620,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:470
 #, no-c-format
 msgid ""
 "The Maven POM (<literal>pom.xml</literal>) includes a profile named "
@@ -856,27 +631,15 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:479
 #, no-c-format
 msgid ""
 "To run the <literal>weld-numberguess</literal> example on Jetty, switch to "
 "the example directory and execute the <literal>inplace</literal> goal of the "
-"Maven WAR plugin followed by the <literal>run</literal> goal of the Maven "
+"Maven war plugin followed by the <literal>run</literal> goal of the Maven "
 "Jetty plugin with the <literal>jetty</literal> profile enabled, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:485
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> mvn war:inplace jetty:run -Pjetty]]>"
-msgstr ""
-"<![CDATA[cd examples/wicket/numberguess\n"
-"mvn eclipse:eclipse]]>"
-
 #. Tag: para
-#: gettingstarted.xml:487
 #, no-c-format
 msgid ""
 "The log output of Jetty will be shown in the console. Once Jetty reports "
@@ -887,7 +650,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:494
 #, no-c-format
 msgid ""
 "Any changes to assets in <literal>src/main/webapp</literal> take effect "
@@ -895,30 +657,22 @@
 "application may automatically redeploy. The redeploy behavior can be fined-"
 "tuned in the plugin configuration. If you make a change to a classpath "
 "resource, you need to execute a build and the <literal>inplace</literal> "
-"goal of the Maven WAR plugin, again with the <literal>jetty</literal> "
+"goal of the Maven war plugin, again with the <literal>jetty</literal> "
 "profile enabled."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:501
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:503
 #, no-c-format
 msgid ""
-"The <literal>war:inplace</literal> goal copies the compiled classes and JARs "
+"The <literal>war:inplace</literal> goal copies the compiled classes and jars "
 "inside <literal>src/main/webapp</literal>, under <literal>WEB-INF/classes</"
 "literal> and <literal>WEB-INF/lib</literal>, respectively, mixing source and "
 "compiled files. However, the build does work around these temporary files by "
-"excluding them from the packaged WAR and cleaning them during the Maven "
+"excluding them from the packaged war and cleaning them during the Maven "
 "clean phase."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:510
 #, no-c-format
 msgid ""
 "You have two options if you want to run the example on Jetty from the IDE. "
@@ -928,33 +682,18 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:516
 #, fuzzy, no-c-format
 msgid "First, initialize the Eclipse project:"
 msgstr "Eclipse プロジェクトの作成"
 
-#. Tag: programlisting
-#: gettingstarted.xml:520
-#, no-c-format
-msgid "<![CDATA[$> mvn clean eclipse:clean eclipse:eclipse -Pjetty-ide]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:522
 #, no-c-format
 msgid ""
 "Next, assemble all the necessary resources under <literal>src/main/webapp</"
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:526
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace -Pjetty-ide]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:528
 #, no-c-format
 msgid ""
 "Now, you are ready to run the server in Eclipse. Import the project into "
@@ -967,7 +706,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:536
 #, no-c-format
 msgid ""
 "Now that you have gotten the starter applications deployed on the server of "
@@ -975,7 +713,67 @@
 "work."
 msgstr ""
 
+#, fuzzy
+#~ msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.1.GA"
+
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> ant deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/numberguess\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/translator\n"
+#~ "$> ant deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/translator\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
+#~ msgstr ""
+#~ "<![CDATA[$ cd /Applications\n"
+#~ "$ unzip ~/apache-tomcat-6.0.18.zip]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
+#~ msgstr "tomcat.home=/Applications/apache-tomcat-6.0.18"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> ant tomcat.deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/numberguess\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd /path/to/apache-tomcat-6\n"
+#~ "$> ./bin/start.sh]]>"
+#~ msgstr "$ /Applications/apache-tomcat-6.0.18/bin/startup.sh"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
+#~ "$> start]]>"
+#~ msgstr ""
+#~ "<![CDATA[$ cd /Applications\n"
+#~ "$ unzip ~/apache-tomcat-6.0.18.zip]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> mvn war:inplace jetty:run -Pjetty]]>"
+#~ msgstr ""
+#~ "<![CDATA[cd examples/wicket/numberguess\n"
+#~ "mvn eclipse:eclipse]]>"
+
+#~ msgid ""
 #~ "Getting started with Web Beans, the Reference Implementation of JSR-299"
 #~ msgstr "JSR-299 参照実装 Web Beans を始めよう"
 
@@ -1007,9 +805,6 @@
 #~ "せる場合に使用できる JSF2 サンプルです。サンプルを実行するためには、以下の"
 #~ "ものが必要です:"
 
-#~ msgid "JBoss AS 5.0.1.GA, or"
-#~ msgstr "JBoss AS 5.0.1.GA あるいは"
-
 #~ msgid "Ant 1.7.0."
 #~ msgstr "Ant 1.7.0"
 

Modified: doc/trunk/reference/ja-JP/injection.po
===================================================================
--- doc/trunk/reference/ja-JP/injection.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/injection.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-06-02 01:32+0900\n"
 "Last-Translator: Daisuke Sano <d-sano at nri.co.jp>\n"
 "Language-Team: none\n"
@@ -14,28 +14,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: injection.xml:4
 #, fuzzy, no-c-format
 msgid "Dependency injection and programmatic lookup"
 msgstr "依存性注入"
 
 #. Tag: para
-#: injection.xml:6
 #, no-c-format
 msgid ""
-"One of the most significant features of CDI&#8212;certainly the most "
-"recognized&#8212;is dependency injection; excuse me, <emphasis>typesafe</"
-"emphasis> dependency injection."
+"One of the most significant features of CDI—certainly the most recognized—is "
+"dependency injection; excuse me, <emphasis>typesafe</emphasis> dependency "
+"injection."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:12
 #, no-c-format
 msgid "Injection points"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:14
 #, no-c-format
 msgid ""
 "The <literal>@Inject</literal> annotation lets us define an injection point "
@@ -44,77 +40,21 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:19
 #, fuzzy, no-c-format
 msgid "<emphasis>Bean constructor</emphasis> parameter injection:"
 msgstr "<emphasis>初期化</emphasis>メソッドの引数による注入、"
 
-#. Tag: programlisting
-#: injection.xml:23
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private final ShoppingCart cart;\n"
-"    \n"
-"   @Inject\n"
-"   public Checkout(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"    private final ShoppingCart cart;\n"
-"    \n"
-"    @Initializer\n"
-"    public Checkout(ShoppingCart cart) {\n"
-"        this.cart = cart;\n"
-"    }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:26
 #, no-c-format
 msgid "A bean can only have one injectable constructor."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:31
 #, fuzzy, no-c-format
 msgid "<emphasis>Initializer method</emphasis> parameter injection:"
 msgstr "<emphasis>初期化</emphasis>メソッドの引数による注入、"
 
-#. Tag: programlisting
-#: injection.xml:35
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private ShoppingCart cart;\n"
-"\n"
-"   @Inject\n"
-"   void setShoppingCart(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"    private ShoppingCart cart;\n"
-"\n"
-"    @Initializer \n"
-"    void setShoppingCart(ShoppingCart cart) {\n"
-"        this.cart = cart;\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:38
 #, no-c-format
 msgid ""
 "A bean can have multiple initializer methods. If the bean is a session bean, "
@@ -123,29 +63,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:44
 #, no-c-format
 msgid "And direct field injection:"
 msgstr "そして、フィールドへの直接的な注入です。"
 
-#. Tag: programlisting
-#: injection.xml:48
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"   private @Inject ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"    private @Current ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:51
 #, no-c-format
 msgid ""
 "Getter and setter methods are not required for field injection to work "
@@ -153,7 +75,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:56
 #, fuzzy, no-c-format
 msgid ""
 "Dependency injection always occurs when the bean instance is first "
@@ -163,7 +84,6 @@
 "依存性注入は、Web Beanインスタンスが最初に生成される際に必ず行われます。"
 
 #. Tag: para
-#: injection.xml:63
 #, fuzzy, no-c-format
 msgid ""
 "First, the container calls the bean constructor (the default constructor or "
@@ -174,7 +94,6 @@
 "のコンストラクタを実行する"
 
 #. Tag: para
-#: injection.xml:69
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container initializes the values of all injected fields of the "
@@ -184,7 +103,6 @@
 "化する"
 
 #. Tag: para
-#: injection.xml:74
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container calls all initializer methods of bean (the call order is "
@@ -193,7 +111,6 @@
 "次に、Web Beanマネージャは、Web Beanの、すべての初期化メソッドを実行する"
 
 #. Tag: para
-#: injection.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "Finally, the <literal>@PostConstruct</literal> method, if any, is called."
@@ -202,7 +119,6 @@
 "れます。"
 
 #. Tag: para
-#: injection.xml:86
 #, no-c-format
 msgid ""
 "(The only complication is that the container might call initializer methods "
@@ -211,7 +127,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:90
 #, no-c-format
 msgid ""
 "One major advantage of constructor injection is that it allows the bean to "
@@ -219,7 +134,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:95
 #, no-c-format
 msgid ""
 "CDI also supports parameter injection for some other methods that are "
@@ -227,36 +141,21 @@
 "producer methods:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:100
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:102
 #, no-c-format
 msgid ""
 "This is a case where the <literal>@Inject</literal> annotation <emphasis>is "
 "not</emphasis> required at the injection point. The same is true for "
-"observer methods (which we'll meet in <xref linkend=\"events\"/>) and "
+"observer methods (which we'll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:110
 #, no-c-format
 msgid "What gets injected"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:112
 #, fuzzy, no-c-format
 msgid ""
 "The CDI specification defines a procedure, called <emphasis>typesafe "
@@ -277,7 +176,6 @@
 "座にそれをユーザに通知することを意味します。"
 
 #. Tag: para
-#: injection.xml:120
 #, fuzzy, no-c-format
 msgid ""
 "The purpose of this algorithm is to allow multiple beans to implement the "
@@ -287,7 +185,6 @@
 "あり、"
 
 #. Tag: para
-#: injection.xml:126
 #, fuzzy, no-c-format
 msgid ""
 "allow the client to select which implementation it requires using a "
@@ -297,7 +194,6 @@
 "イアントが必要とする実装を選択できるようにする"
 
 #. Tag: para
-#: injection.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "allow the application deployer to select which implementation is appropriate "
@@ -309,13 +205,11 @@
 "定の環境に対して適切な実装を選択できるようにする"
 
 #. Tag: para
-#: injection.xml:137
 #, no-c-format
 msgid "allow the beans to be isolated into separate modules."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:143
 #, no-c-format
 msgid ""
 "Obviously, if you have exactly one bean of a given type, and an injection "
@@ -325,7 +219,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:149
 #, no-c-format
 msgid ""
 "But then, things start to get complicated. Let's explore how the container "
@@ -334,13 +227,11 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:157
 #, fuzzy, no-c-format
 msgid "Qualifier annotations"
 msgstr "バインディングアノテーション"
 
 #. Tag: para
-#: injection.xml:159
 #, fuzzy, no-c-format
 msgid ""
 "If we have more than one bean that implements a particular bean type, the "
@@ -353,36 +244,7 @@
 "ということが正確に指定されます。例えば、ここに<literal>PaymentProcessor</"
 "literal>に対する二つの実装が存在するとします。"
 
-#. Tag: programlisting
-#: injection.xml:165
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Synchronous\n"
-"public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: injection.xml:167
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Asynchronous\n"
-"public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:169
 #, fuzzy, no-c-format
 msgid ""
 "Where <literal>@Synchronous</literal> and <literal>@Asynchronous</literal> "
@@ -391,36 +253,7 @@
 "ここで、<literal>@PayByCheque</literal>と<literal>@PayByCreditCard</literal>"
 "はバインディングアノテーションです。"
 
-#. Tag: programlisting
-#: injection.xml:173
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Synchronous {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayByCheque {}]]>"
-
-#. Tag: programlisting
-#: injection.xml:175
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Asynchronous {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayByCheque {}]]>"
-
 #. Tag: para
-#: injection.xml:177
 #, fuzzy, no-c-format
 msgid ""
 "A client bean developer uses the qualifier annotation to specify exactly "
@@ -431,76 +264,21 @@
 "ます。"
 
 #. Tag: para
-#: injection.xml:181
 #, no-c-format
 msgid "Using field injection:"
 msgstr "フィールドに注入することができます。"
 
-#. Tag: programlisting
-#: injection.xml:183
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
-"@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@PayByCheque PaymentProcessor chequePaymentProcessor;\n"
-"@PayByCreditCard PaymentProcessor creditCardPaymentProcessor;]]>"
-
 #. Tag: para
-#: injection.xml:185
 #, no-c-format
 msgid "Using initializer method injection:"
 msgstr "初期化メソッドを使用して注入することもできます。"
 
-#. Tag: programlisting
-#: injection.xml:187
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public void setPaymentProcessors(@Synchronous PaymentProcessor "
-"syncPaymentProcessor, \n"
-"                                 @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public void setPaymentProcessors(@PayByCheque PaymentProcessor "
-"chequePaymentProcessor, \n"
-"                                 @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:189
 #, fuzzy, no-c-format
 msgid "Using constructor injection:"
 msgstr "そして、コンストラクタを使用して注入することもできます。"
 
-#. Tag: programlisting
-#: injection.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
-"                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public Checkout(@PayByCheque PaymentProcessor chequePaymentProcessor, \n"
-"                @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:193
 #, no-c-format
 msgid ""
 "Qualifier annotations can also qualify method arguments of producer, "
@@ -509,29 +287,7 @@
 "runtime based on the state of the system:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:199
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces\n"
-"PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
-"syncPaymentProcessor,\n"
-"                                     @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   return isSynchronous() ? syncPaymentProcessor : asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public void setPaymentProcessors(@PayByCheque PaymentProcessor "
-"chequePaymentProcessor, \n"
-"                                 @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:201
 #, no-c-format
 msgid ""
 "If an injected field or a parameter of a bean constructor or initializer "
@@ -540,7 +296,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:206
 #, no-c-format
 msgid ""
 "Now, you may be thinking, <emphasis>\"What's the different between using a "
@@ -552,7 +307,6 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:216
 #, fuzzy, no-c-format
 msgid ""
 "The built-in qualifiers <literal>@Default</literal> and <literal>@Any</"
@@ -562,7 +316,6 @@
 "literal>のみをコールバックとしてサポートします。"
 
 #. Tag: para
-#: injection.xml:218
 #, no-c-format
 msgid ""
 "Whenever a bean or injection point does not explicitly declare a qualifier, "
@@ -575,33 +328,18 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:225
 #, no-c-format
 msgid ""
 "This is especially useful if you want to iterate over all beans with a "
 "certain bean type. For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:226
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject \n"
-"void initServices(@Any Instance<Service> services) { \n"
-"   for (Service service: services) {\n"
-"      service.init();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:232
 #, no-c-format
 msgid "Qualifiers with members"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:234
 #, no-c-format
 msgid ""
 "Java annotations can have members. We can use annotation members to further "
@@ -611,41 +349,13 @@
 "single annotation with a member:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:240
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayBy {\n"
-"    PaymentType value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:242
 #, no-c-format
 msgid ""
 "Then we select one of the possible member values when appling the qualifier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:246
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:248
 #, fuzzy, no-c-format
 msgid ""
 "We can force the container to ignore a member of a qualifier type by "
@@ -655,49 +365,18 @@
 "ることによって、Web Beanマネージャがメンバを無視するように指定することもでき"
 "ます。"
 
-#. Tag: programlisting
-#: injection.xml:253
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"   @Nonbinding String comment() default \"\";\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @NonBinding public String value();\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:258
 #, no-c-format
 msgid "Multiple qualifiers"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:260
 #, fuzzy, no-c-format
 msgid "An injection point may specify multiple qualifiers:"
 msgstr ""
 "注入箇所に、複数のバインディングアノテーションを指定することもできます。"
 
-#. Tag: programlisting
-#: injection.xml:264
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
-"syncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:266
 #, fuzzy, no-c-format
 msgid ""
 "Then only a bean which has <emphasis>both</emphasis> qualifier annotations "
@@ -706,29 +385,12 @@
 "このような場合、<emphasis>両方の</emphasis>バインディングアノテーションを持つ"
 "Web Beanのみが、注入する対象として適格となります。"
 
-#. Tag: programlisting
-#: injection.xml:271
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Synchronous @Reliable\n"
-"public class SynchronousReliablePaymentProcessor implements PaymentProcessor "
-"{\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:276
 #, no-c-format
 msgid "Alternatives"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:278
 #, no-c-format
 msgid ""
 "Alternatives are beans whose implementation is specific to a particular "
@@ -737,22 +399,7 @@
 "<literal>@Asynchronous PaymentProcessor</literal>, all in one:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:282
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Synchronous @Asynchronous\n"
-"public class MockPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:284
 #, no-c-format
 msgid ""
 "By default, <literal>@Alternative</literal> beans are disabled. We need to "
@@ -761,24 +408,7 @@
 "and injection. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:290
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <class>org.mycompany.mock.MockPaymentProcessor</class>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:292
 #, no-c-format
 msgid ""
 "When an ambiguous dependency exists at an injection point, the container "
@@ -788,13 +418,11 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:301
 #, fuzzy, no-c-format
 msgid "Fixing unsatisfied and ambiguous dependencies"
 msgstr "依存性を充たすように修正する"
 
 #. Tag: para
-#: injection.xml:303
 #, fuzzy, no-c-format
 msgid ""
 "The typesafe resolution algorithm fails when, after considering the "
@@ -809,7 +437,6 @@
 "一つに絞りきれない場合、タイプセーフな解決アルゴリズムは失敗します。"
 
 #. Tag: para
-#: injection.xml:310
 #, no-c-format
 msgid ""
 "During the course of your development, you're going to encounter this "
@@ -817,13 +444,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:314
 #, no-c-format
 msgid "To fix an <emphasis>unsatisfied dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:320
 #, no-c-format
 msgid ""
 "create a bean which implements the bean type and has all the qualifier types "
@@ -831,7 +456,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:325
 #, no-c-format
 msgid ""
 "make sure that the bean you already have is in the classpath of the module "
@@ -839,7 +463,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:330
 #, no-c-format
 msgid ""
 "explicitly enable an <literal>@Alternative</literal> bean that implements "
@@ -848,13 +471,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:337
 #, no-c-format
 msgid "To fix an <emphasis>ambiguous dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:343
 #, no-c-format
 msgid ""
 "introduce a qualifier to distinguish between the two implementations of the "
@@ -862,14 +483,12 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:348
 #, no-c-format
 msgid ""
 "disable one of the beans by annotating it <literal>@Alternative</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:353
 #, no-c-format
 msgid ""
 "move one of the implementations to a module that is not in the classpath of "
@@ -877,7 +496,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:359
 #, no-c-format
 msgid ""
 "disable one of two <literal>@Alternative</literal> beans that are trying to "
@@ -885,7 +503,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:366
 #, no-c-format
 msgid ""
 "See <ulink url=\"http://sfwk.org/Documentation/"
@@ -896,22 +513,19 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:374
 #, no-c-format
 msgid "Just remember: \"There can be only one.\""
 msgstr ""
 
 #. Tag: para
-#: injection.xml:377
 #, no-c-format
 msgid ""
 "On the other hand, if you really do have an optional or multivalued "
 "injection point, you should change the type of your injection point to "
-"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\"/>."
+"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:382
 #, fuzzy, no-c-format
 msgid ""
 "Now there's one more issue you need to be aware of when using the dependency "
@@ -920,13 +534,11 @@
 "Web Beansにおける依存性注入を行う際に気をつけるべきことが、もう少しあります。"
 
 #. Tag: title
-#: injection.xml:389
 #, no-c-format
 msgid "Client proxies"
 msgstr "クライアントプロキシ"
 
 #. Tag: para
-#: injection.xml:391
 #, fuzzy, no-c-format
 msgid ""
 "Clients of an injected bean do not usually hold a direct reference to a bean "
@@ -937,13 +549,12 @@
 "な参照を持ちません。"
 
 #. Tag: para
-#: injection.xml:396
 #, fuzzy, no-c-format
 msgid ""
 "Imagine that a bean bound to the application scope held a direct reference "
 "to a bean bound to the request scope. The application-scoped bean is shared "
 "between many different requests. However, each request should see a "
-"different instance of the request scoped bean&#8212;the current one!"
+"different instance of the request scoped bean—the current one!"
 msgstr ""
 "アプリケーションスコープに結び付けられたWeb Beanが、リクエストスコープに結び"
 "付けられたWeb Beanに対する直接的な参照を持っている場合を想像してみてくださ"
@@ -952,7 +563,6 @@
 "コープのWeb Beanインスタンスを参照するべきなのです。"
 
 #. Tag: para
-#: injection.xml:402
 #, fuzzy, no-c-format
 msgid ""
 "Now imagine that a bean bound to the session scope holds a direct reference "
@@ -970,7 +580,6 @@
 "るべきではないのです。"
 
 #. Tag: para
-#: injection.xml:409
 #, fuzzy, no-c-format
 msgid ""
 "Therefore, unless a bean has the default scope <literal>@Dependent</"
@@ -992,7 +601,6 @@
 "リアライズすることなく、シリアライズすることを可能とします。"
 
 #. Tag: para
-#: injection.xml:417
 #, fuzzy, no-c-format
 msgid ""
 "Unfortunately, due to limitations of the Java language, some Java types "
@@ -1007,20 +615,17 @@
 "literal>をスローします。"
 
 #. Tag: para
-#: injection.xml:423
 #, fuzzy, no-c-format
 msgid "The following Java types cannot be proxied by the container:"
 msgstr "次に挙げるJava型はWeb Beanマネージャがプロキシ化することができません。"
 
 #. Tag: para
-#: injection.xml:427
 #, fuzzy, no-c-format
 msgid ""
 "classes which don't have a non-private constructor with no parameters, and"
 msgstr "プライベートでなく、引数を持たないコンストラクタを持たないクラス"
 
 #. Tag: para
-#: injection.xml:430
 #, no-c-format
 msgid ""
 "classes which are declared <literal>final</literal> or have a "
@@ -1030,13 +635,11 @@
 "を持つクラス"
 
 #. Tag: para
-#: injection.xml:435
 #, no-c-format
 msgid "arrays and primitive types."
 msgstr "配列とプリミティブ型"
 
 #. Tag: para
-#: injection.xml:439
 #, no-c-format
 msgid ""
 "It's usually very easy to fix an unproxyable dependency problem. If an "
@@ -1045,13 +648,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:446
 #, no-c-format
 msgid "add a constructor with no parameters to <literal>X</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:451
 #, no-c-format
 msgid ""
 "change the type of the injection point to <literal>Instance&lt;X&gt;</"
@@ -1059,7 +660,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:456
 #, no-c-format
 msgid ""
 "introduce an interface <literal>Y</literal>, implemented by the injected "
@@ -1067,7 +667,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:462
 #, no-c-format
 msgid ""
 "if all else fails, change the scope of the injected bean to "
@@ -1075,7 +674,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:469
 #, no-c-format
 msgid ""
 "A future release of Weld will likely support a non-standard workaround for "
@@ -1083,7 +681,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:476
 #, no-c-format
 msgid ""
 "Sun, IcedTea, Mac: <literal>Unsafe.allocateInstance()</literal> (The most "
@@ -1091,7 +688,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:481
 #, no-c-format
 msgid ""
 "IBM, JRockit: <literal>ReflectionFactory.newConstructorForSerialization()</"
@@ -1099,19 +695,16 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:487
 #, no-c-format
 msgid "But we didn't get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:496
 #, fuzzy, no-c-format
 msgid "Obtaining a contextual instance by programmatic lookup"
 msgstr "ルックアップ処理によるWeb Beanの取得"
 
 #. Tag: para
-#: injection.xml:498
 #, no-c-format
 msgid ""
 "In certain situations, injection is not the most convenient way to obtain a "
@@ -1119,13 +712,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:505
 #, no-c-format
 msgid "the bean type or qualifiers vary dynamically at runtime, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:510
 #, no-c-format
 msgid ""
 "depending upon the deployment, there may be no bean which satisfies the type "
@@ -1133,13 +724,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:515
 #, no-c-format
 msgid "we would like to iterate over all beans of a certain type."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:521
 #, fuzzy, no-c-format
 msgid ""
 "In these situations, the application may obtain an instance of the interface "
@@ -1148,14 +737,7 @@
 "アプリケーションは注入によって、<literal>Manager</literal>インタフェースを持"
 "つインスタンスを取得することができます。"
 
-#. Tag: programlisting
-#: injection.xml:526
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:528
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>get()</literal> method of <literal>Instance</literal> produces "
@@ -1163,26 +745,17 @@
 msgstr ""
 "テスト作業における<literal>@Mock</literal>や<literal>@Staging</literal>の使用"
 
-#. Tag: programlisting
-#: injection.xml:532
-#, fuzzy, no-c-format
-msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:534
 #, no-c-format
 msgid "Qualifiers can be specified in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:540
 #, no-c-format
 msgid "by annotating the <literal>Instance</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:543
 #, fuzzy, no-c-format
 msgid ""
 "by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
@@ -1192,22 +765,11 @@
 "literal>のみをコールバックとしてサポートします。"
 
 #. Tag: para
-#: injection.xml:547
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is much, much easier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:551
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
-"paymentProcessorSource;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:553
 #, no-c-format
 msgid ""
 "Now, the <literal>PaymentProcessor</literal> returned by <literal>get()</"
@@ -1215,7 +777,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:558
 #, no-c-format
 msgid ""
 "Alternatively, we can specify the qualifier dynamically. First, we add the "
@@ -1223,15 +784,7 @@
 "default qualifier. (All beans have the qualifier <literal>@Any</literal>.)"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:563
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:565
 #, no-c-format
 msgid ""
 "Next, we need to obtain an instance of our qualifier type. Since annotatons "
@@ -1241,68 +794,30 @@
 "subclassing the helper class <literal>AnnotationLiteral</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:572
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[abstract class AsynchronousQualifier\n"
-"extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
-msgstr ""
-"<![CDATA[abstract class CreditCardBinding \n"
-"    extends AnnotationLiteral<CreditCard> \n"
-"    implements CreditCard {}]]>"
-
 #. Tag: para
-#: injection.xml:574
 #, no-c-format
 msgid "In some cases, we can use an anonymous class:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:578
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
-"   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
-msgstr ""
-"<![CDATA[PaymentProcessor p = manager.getInstanceByType(PaymentProcessor."
-"class, \n"
-"                                               new "
-"AnnotationLiteral<CreditCard>(){});]]>"
-
 #. Tag: para
-#: injection.xml:581
 #, no-c-format
 msgid ""
 "We can't use an anonymous class to implement a qualifier type with members."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:586
 #, no-c-format
 msgid ""
 "Now, finally, we can pass the qualifier to the <literal>select()</literal> "
 "method of <literal>Instance</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:590
-#, no-c-format
-msgid ""
-"<![CDATA[Annotation qualifier = synchronously ?\n"
-"      new SynchronousQualifier() : new AsynchronousQualifier();\n"
-"PaymentProcessor p = anyPaymentProcessor.select(qualifier).get().process"
-"(payment);]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:595
 #, no-c-format
 msgid "The <literal>InjectionPoint</literal> object"
 msgstr "<literal>InjectionPoint</literal>オブジェクト"
 
 #. Tag: para
-#: injection.xml:597
 #, fuzzy, no-c-format
 msgid ""
 "There are certain kinds of dependent objects (beans with scope "
@@ -1315,7 +830,6 @@
 "いての情報が必要になります。例えば、"
 
 #. Tag: para
-#: injection.xml:603
 #, no-c-format
 msgid ""
 "The log category for a <literal>Logger</literal> depends upon the class of "
@@ -1325,7 +839,6 @@
 "が何であるかに依存します。"
 
 #. Tag: para
-#: injection.xml:607
 #, no-c-format
 msgid ""
 "Injection of a HTTP parameter or header value depends upon what parameter or "
@@ -1335,7 +848,6 @@
 "が指定されているかに依存します。"
 
 #. Tag: para
-#: injection.xml:611
 #, no-c-format
 msgid ""
 "Injection of the result of an EL expression evaluation depends upon the "
@@ -1345,7 +857,6 @@
 "します。"
 
 #. Tag: para
-#: injection.xml:616
 #, fuzzy, no-c-format
 msgid ""
 "A bean with scope <literal>@Dependent</literal> may inject an instance of "
@@ -1357,7 +868,6 @@
 "注入箇所に関するメタデータにアクセスする可能性があります。"
 
 #. Tag: para
-#: injection.xml:620
 #, no-c-format
 msgid ""
 "Let's look at an example. The following code is verbose, and vulnerable to "
@@ -1366,14 +876,7 @@
 "例を見てみましょう。次のコードは、煩雑なうえに、リファクタリングしにくいコー"
 "ドです。"
 
-#. Tag: programlisting
-#: injection.xml:623
-#, no-c-format
-msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-msgstr "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-
 #. Tag: para
-#: injection.xml:625
 #, no-c-format
 msgid ""
 "This clever little producer method lets you inject a JDK <literal>Logger</"
@@ -1382,42 +885,12 @@
 "次の賢く小さなプロデューサメソッドは、明示的にログカテゴリを指定することなく"
 "JDKの<literal>Logger</literal>を注入します。"
 
-#. Tag: programlisting
-#: injection.xml:628
-#, no-c-format
-msgid ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:630
 #, no-c-format
 msgid "We can now write:"
 msgstr "これによって、次のような記述が可能になります。"
 
-#. Tag: programlisting
-#: injection.xml:632
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject Logger log;]]>"
-msgstr "<![CDATA[@Current Logger log;]]>"
-
 #. Tag: para
-#: injection.xml:634
 #, fuzzy, no-c-format
 msgid ""
 "Not convinced? Then here's a second example. To inject HTTP parameters, we "
@@ -1426,73 +899,18 @@
 "納得できませんか?もう一つの例を見てみましょう。HTTPパラメタを注入するために"
 "は、バインディングタイプを定義する必要があります。"
 
-#. Tag: programlisting
-#: injection.xml:637
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @Nonbinding public String value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @NonBinding public String value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:639
 #, fuzzy, no-c-format
 msgid "We would use this qualifier type at injection points as follows:"
 msgstr ""
 "このバインディングタイプを注入箇所において、次のように使うことができます。"
 
-#. Tag: programlisting
-#: injection.xml:641
-#, no-c-format
-msgid ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-msgstr ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-
 #. Tag: para
-#: injection.xml:643
 #, no-c-format
 msgid "The following producer method does the work:"
 msgstr "次のプロデューサメソッドが動作します。"
 
-#. Tag: programlisting
-#: injection.xml:645
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotated().getAnnotation(HttpParam."
-"class).value());\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotation(HttpParam.class).value"
-"());\n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:647
 #, fuzzy, no-c-format
 msgid ""
 "(Note that the <literal>value()</literal> member of the <literal>HttpParam</"
@@ -1504,7 +922,6 @@
 "Beanマネージャには無視されることに注意して下さい。)"
 
 #. Tag: para
-#: injection.xml:650
 #, fuzzy, no-c-format
 msgid ""
 "The container provides a built-in bean that implements the "
@@ -1513,30 +930,395 @@
 "Web Beanマネージャは<literal>InjectionPoint</literal>インタフェースを実装した"
 "組み込みWeb Beanを提供します。"
 
-#. Tag: programlisting
-#: injection.xml:653
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Type getType();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Bean<?> getBean();\n"
-"   public Member getMember();\n"
-"   public Annotated getAnnotated();\n"
-"   public boolean isDelegate();\n"
-"   public boolean isTransient();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Object getInstance(); \n"
-"   public Bean<?> getBean(); \n"
-"   public Member getMember(): \n"
-"   public <T extends Annotation> T getAnnotation(Class<T> annotation); \n"
-"   public Set<T extends Annotation> getAnnotations(); \n"
-"}]]>"
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   public Checkout(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "    private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "    @Initializer\n"
+#~ "    public Checkout(ShoppingCart cart) {\n"
+#~ "        this.cart = cart;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "}]]>"
 
 #, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private ShoppingCart cart;\n"
+#~ "\n"
+#~ "   @Inject\n"
+#~ "   void setShoppingCart(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "    private ShoppingCart cart;\n"
+#~ "\n"
+#~ "    @Initializer \n"
+#~ "    void setShoppingCart(ShoppingCart cart) {\n"
+#~ "        this.cart = cart;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "   private @Inject ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "    private @Current ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Synchronous\n"
+#~ "public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Asynchronous\n"
+#~ "public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Synchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayByCheque {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Asynchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayByCheque {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
+#~ "@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque PaymentProcessor chequePaymentProcessor;\n"
+#~ "@PayByCreditCard PaymentProcessor creditCardPaymentProcessor;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public void setPaymentProcessors(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor, \n"
+#~ "                                 @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public void setPaymentProcessors(@PayByCheque PaymentProcessor "
+#~ "chequePaymentProcessor, \n"
+#~ "                                 @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
+#~ "                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public Checkout(@PayByCheque PaymentProcessor chequePaymentProcessor, \n"
+#~ "                @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces\n"
+#~ "PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor,\n"
+#~ "                                     @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   return isSynchronous() ? syncPaymentProcessor : "
+#~ "asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public void setPaymentProcessors(@PayByCheque PaymentProcessor "
+#~ "chequePaymentProcessor, \n"
+#~ "                                 @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayBy {\n"
+#~ "    PaymentType value();\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "   @Nonbinding String comment() default \"\";\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @NonBinding public String value();\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
+#~ "syncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Synchronous @Reliable\n"
+#~ "public class SynchronousReliablePaymentProcessor implements "
+#~ "PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative @Synchronous @Asynchronous\n"
+#~ "public class MockPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
+#~ "paymentProcessorSource;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]"
+#~ ">"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[abstract class AsynchronousQualifier\n"
+#~ "extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[abstract class CreditCardBinding \n"
+#~ "    extends AnnotationLiteral<CreditCard> \n"
+#~ "    implements CreditCard {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
+#~ "   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
+#~ msgstr ""
+#~ "<![CDATA[PaymentProcessor p = manager.getInstanceByType(PaymentProcessor."
+#~ "class, \n"
+#~ "                                               new "
+#~ "AnnotationLiteral<CreditCard>(){});]]>"
+
+#~ msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
+#~ msgstr "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
+
+#~ msgid ""
+#~ "<![CDATA[class LogFactory {\n"
+#~ "\n"
+#~ "   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
+#~ "      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass"
+#~ "().getName()); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[class LogFactory {\n"
+#~ "\n"
+#~ "   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
+#~ "      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass"
+#~ "().getName()); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject Logger log;]]>"
+#~ msgstr "<![CDATA[@Current Logger log;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @Nonbinding public String value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @NonBinding public String value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@HttpParam(\"username\") String username;\n"
+#~ "@HttpParam(\"password\") String password;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@HttpParam(\"username\") String username;\n"
+#~ "@HttpParam(\"password\") String password;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[class HttpParams\n"
+#~ "\n"
+#~ "   @Produces @HttpParam(\"\")\n"
+#~ "   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
+#~ "      return request.getParameter(ip.getAnnotated().getAnnotation"
+#~ "(HttpParam.class).value());\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[class HttpParams\n"
+#~ "\n"
+#~ "   @Produces @HttpParam(\"\")\n"
+#~ "   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
+#~ "      return request.getParameter(ip.getAnnotation(HttpParam.class).value"
+#~ "());\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public interface InjectionPoint { \n"
+#~ "   public Type getType();\n"
+#~ "   public Set<Annotation> getQualifiers();\n"
+#~ "   public Bean<?> getBean();\n"
+#~ "   public Member getMember();\n"
+#~ "   public Annotated getAnnotated();\n"
+#~ "   public boolean isDelegate();\n"
+#~ "   public boolean isTransient();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface InjectionPoint { \n"
+#~ "   public Object getInstance(); \n"
+#~ "   public Bean<?> getBean(); \n"
+#~ "   public Member getMember(): \n"
+#~ "   public <T extends Annotation> T getAnnotation(Class<T> annotation); \n"
+#~ "   public Set<T extends Annotation> getAnnotations(); \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
 #~ "It's usually very easy to fix an unproxyable dependency problem. Simply "
 #~ "add a constructor with no parameters to the injected class, introduce an "
 #~ "interface, or, if all else fails, change the scope of the injected bean "

Modified: doc/trunk/reference/ja-JP/interceptors.po
===================================================================
--- doc/trunk/reference/ja-JP/interceptors.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/interceptors.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-04-30 23:14+0900\n"
 "Last-Translator: Fusayuki Minamoto <miki.htmnet at nifty.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: interceptors.xml:5
 #, no-c-format
 msgid "Interceptors"
 msgstr "インタセプタ"
 
 #. Tag: para
-#: interceptors.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Interceptor functionality is defined in the Java Interceptors specification. "
@@ -31,32 +29,27 @@
 "テーションベースのアプローチを取る"
 
 #. Tag: para
-#: interceptors.xml:12
 #, fuzzy, no-c-format
 msgid ""
 "The Interceptors specification defines two kinds of interception points:"
 msgstr "EJB仕様書は次の二つのインタセプションポイントを定義します。"
 
 #. Tag: para
-#: interceptors.xml:18
 #, no-c-format
 msgid "business method interception, and"
 msgstr "ビジネスメソッドインタセプションと"
 
 #. Tag: para
-#: interceptors.xml:21
 #, no-c-format
 msgid "lifecycle callback interception."
 msgstr "ライフサイクルコールバックインタセプション"
 
 #. Tag: para
-#: interceptors.xml:25
 #, fuzzy, no-c-format
 msgid "In addition, the EJB specification defines timeout method interception."
 msgstr "EJB仕様書は次の二つのインタセプションポイントを定義します。"
 
 #. Tag: para
-#: interceptors.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>business method interceptor</emphasis> applies to invocations of "
@@ -65,23 +58,7 @@
 "<emphasis>ビジネスメソッドインタセプタ</emphasis> は次のようにWeb Beansのクラ"
 "イアントによってWeb Beansのメソッド呼び出しへ適用されます。"
 
-#. Tag: programlisting
-#: interceptors.xml:34
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:36
 #, no-c-format
 msgid ""
 "A <emphasis>lifecycle callback interceptor</emphasis> applies to invocations "
@@ -90,22 +67,7 @@
 "<emphasis>ライフサイクルコールバックインタセプタ</emphasis> は次のようにコン"
 "テナによってライフサイクルコールバックの呼び出しに適用されます。"
 
-#. Tag: programlisting
-#: interceptors.xml:41
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"   @PostConstruct \n"
-"   public void injectDependencies(InvocationContext ctx) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"    @PostConstruct public void injectDependencies(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:43
 #, no-c-format
 msgid ""
 "An interceptor class may intercept both lifecycle callbacks and business "
@@ -115,7 +77,6 @@
 "て割り込むことができます。"
 
 #. Tag: para
-#: interceptors.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>timeout method interceptor</emphasis> applies to invocations of "
@@ -124,29 +85,12 @@
 "<emphasis>ライフサイクルコールバックインタセプタ</emphasis> は次のようにコン"
 "テナによってライフサイクルコールバックの呼び出しに適用されます。"
 
-#. Tag: programlisting
-#: interceptors.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TimeoutInterceptor {\n"
-"   @AroundTimeout \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:55
 #, no-c-format
 msgid "Interceptor bindings"
 msgstr "インタセプタバインディング"
 
 #. Tag: para
-#: interceptors.xml:57
 #, fuzzy, no-c-format
 msgid ""
 "Suppose we want to declare that some of our beans are transactional. The "
@@ -157,22 +101,7 @@
 "は、次のような、興味のあるWeb Beansを正確に指定するための <emphasis>インタセ"
 "プタバインディングアノテーション</emphasis> です。"
 
-#. Tag: programlisting
-#: interceptors.xml:62
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-
 #. Tag: para
-#: interceptors.xml:64
 #, no-c-format
 msgid ""
 "Now we can easily specify that our <literal>ShoppingCart</literal> is a "
@@ -181,44 +110,19 @@
 "こうして <literal>ShoppingCart</literal> がトランザクション型オブジェクトであ"
 "ることを簡単に指定することが可能になりました。"
 
-#. Tag: programlisting
-#: interceptors.xml:68
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:70
 #, no-c-format
 msgid "Or, if we prefer, we can specify that just one method is transactional:"
 msgstr ""
 "または、望みとあらば、だだ一つのメソッドだけをトランザクション型として指定で"
 "きます。"
 
-#. Tag: programlisting
-#: interceptors.xml:74
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class ShoppingCart {\n"
-"    @Transactional public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:79
 #, no-c-format
 msgid "Implementing interceptors"
 msgstr "インタセプタの実装"
 
 #. Tag: para
-#: interceptors.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "That's great, but somewhere along the line we're going to have to actually "
@@ -231,56 +135,12 @@
 "EJBインタセプタを作成し、それに <literal>@Interceptor</literal> と "
 "<literal>@Transactional</literal> のアノテーションを付加するだけです。"
 
-#. Tag: programlisting
-#: interceptors.xml:87
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:89
 #, no-c-format
 msgid "Interceptors can take advantage of dependency injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:93
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource UserTransaction transaction;\n"
-"\n"
-"    @AroundInvoke \n"
-"    public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource Transaction transaction;\n"
-"\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:95
 #, no-c-format
 msgid "Multiple interceptors may use the same interceptor binding type."
 msgstr ""
@@ -288,13 +148,11 @@
 "されます。"
 
 #. Tag: title
-#: interceptors.xml:102
 #, no-c-format
 msgid "Enabling interceptors"
 msgstr "インタセプタの有効化"
 
 #. Tag: para
-#: interceptors.xml:104
 #, no-c-format
 msgid ""
 "By default, all interceptors are disabled. We need to <emphasis>enable</"
@@ -302,30 +160,12 @@
 "a bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:110
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:112
 #, no-c-format
 msgid "Whoah! Why the angle bracket stew?"
 msgstr "なぜ、かぎ括弧が必要なのでしょうか。"
 
 #. Tag: para
-#: interceptors.xml:114
 #, fuzzy, no-c-format
 msgid ""
 "Well, having the XML declaration is actually a <emphasis>good thing</"
@@ -333,7 +173,6 @@
 msgstr "XML宣言は次の二つの問題を解決します。"
 
 #. Tag: para
-#: interceptors.xml:120
 #, no-c-format
 msgid ""
 "it enables us to specify a total ordering for all the interceptors in our "
@@ -343,13 +182,11 @@
 "一意に保証する"
 
 #. Tag: para
-#: interceptors.xml:126
 #, no-c-format
 msgid "it lets us enable or disable interceptor classes at deployment time."
 msgstr "デプロイ時にインタセプタクラスの有効、無効を指定できるようにする"
 
 #. Tag: para
-#: interceptors.xml:130
 #, fuzzy, no-c-format
 msgid ""
 "For example, we could specify that our security interceptor runs before our "
@@ -358,25 +195,7 @@
 "たとえば、セキュリティインタセプタが <literal>TransactionInterceptor</"
 "literal> より前に実行するように指定できます。"
 
-#. Tag: programlisting
-#: interceptors.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.SecurityInterceptor</class>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:136
 #, no-c-format
 msgid ""
 "Or we could turn them both off in our test environment by simply not "
@@ -384,13 +203,11 @@
 msgstr ""
 
 #. Tag: title
-#: interceptors.xml:142
 #, no-c-format
 msgid "Interceptor bindings with members"
 msgstr "メンバを持つインタセプタバインディング"
 
 #. Tag: para
-#: interceptors.xml:144
 #, no-c-format
 msgid ""
 "Suppose we want to add some extra information to our "
@@ -399,26 +216,7 @@
 " <literal>@Transactional</literal> アノテーションに付加情報を追加したいと仮定"
 "しましょう。"
 
-#. Tag: programlisting
-#: interceptors.xml:148
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"   boolean requiresNew() default false;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"    boolean requiresNew() default false;\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:150
 #, fuzzy, no-c-format
 msgid ""
 "CDI will use the value of <literal>requiresNew</literal> to choose between "
@@ -430,25 +228,7 @@
 "セプタの中から選択できるようにするため <literal>requiresNew</literal> の値を"
 "使用します。"
 
-#. Tag: programlisting
-#: interceptors.xml:155
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional(requiresNew=true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:157
 #, no-c-format
 msgid ""
 "Now we can use <literal>RequiresNewTransactionInterceptor</literal> like "
@@ -457,18 +237,7 @@
 "これで次のように <literal>RequiresNewTransactionInterceptor</literal> を使用"
 "できるようになりました。"
 
-#. Tag: programlisting
-#: interceptors.xml:161
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true)\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional(requiresNew=true)\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:163
 #, fuzzy, no-c-format
 msgid ""
 "But what if we only have one interceptor and we want the container to ignore "
@@ -481,32 +250,12 @@
 "らどうしたらよいでしょうか。そのようなときは <literal>@NonBinding</literal> "
 "アノテーションを使うことができます。"
 
-#. Tag: programlisting
-#: interceptors.xml:169
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"   @Nonbinding String[] rolesAllowed() default {};\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"    @NonBinding String[] rolesAllowed() default {};\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:174
 #, no-c-format
 msgid "Multiple interceptor binding annotations"
 msgstr "複数のインタセプタバインディングアノテーション"
 
 #. Tag: para
-#: interceptors.xml:176
 #, fuzzy, no-c-format
 msgid ""
 "Usually we use combinations of interceptor bindings types to bind multiple "
@@ -519,18 +268,7 @@
 "<literal>TransactionInterceptor</literal> と <literal>SecurityInterceptor</"
 "literal> を同じWeb Beanに結びつけます。"
 
-#. Tag: programlisting
-#: interceptors.xml:182
-#, no-c-format
-msgid ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:184
 #, no-c-format
 msgid ""
 "However, in very complex cases, an interceptor itself may specify some "
@@ -539,18 +277,7 @@
 "しかし、とても複雑なケースでは、インタセプタ自身がいくつかのインタセプタバイ"
 "ンディングタイプの組み合わせを指定することが許されます。"
 
-#. Tag: programlisting
-#: interceptors.xml:189
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:191
 #, no-c-format
 msgid ""
 "Then this interceptor could be bound to the <literal>checkout()</literal> "
@@ -559,68 +286,12 @@
 "次に、このインタセプタは次の組み合わせのどれかを使って <literal>checkout()</"
 "literal> メソッドに結びつきます。"
 
-#. Tag: programlisting
-#: interceptors.xml:196
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class ShoppingCart {\n"
-"    @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:198
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"    @Transactional public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:200
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart {\n"
-"   @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactionl\n"
-"public class ShoppingCart {\n"
-"    @Secure public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:202
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"    public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:207
 #, no-c-format
 msgid "Interceptor binding type inheritance"
 msgstr "インタセプタバインディングタイプの継承"
 
 #. Tag: para
-#: interceptors.xml:209
 #, no-c-format
 msgid ""
 "One limitation of the Java language support for annotations is the lack of "
@@ -631,23 +302,14 @@
 "できないことがあげられます。本当に、アノテーションは次のようなことが許される"
 "ように組み込みのものを再利用できるべきです。"
 
-#. Tag: programlisting
-#: interceptors.xml:214
-#, no-c-format
-msgid ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-msgstr ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:216
 #, fuzzy, no-c-format
 msgid ""
 "Well, fortunately, CDI works around this missing feature of Java. We may "
 "annotate one interceptor binding type with other interceptor binding types "
 "(termed a <emphasis>meta-annotation</emphasis>). The interceptor bindings "
-"are transitive &#8212; any bean with the first interceptor binding inherits "
-"the interceptor bindings declared as meta-annotations."
+"are transitive — any bean with the first interceptor binding inherits the "
+"interceptor bindings declared as meta-annotations."
 msgstr ""
 "幸い、Web BeansはJavaのこの不足機能を補います。あるインタセプタバインディング"
 "タイプを他の複数のバインディングタイプにアノテーションとして付加することが許"
@@ -655,24 +317,7 @@
 "プタバインディングを持つ任意のWeb Beanはメタアノテーションとして宣言されたイ"
 "ンタセプタバインディングを継承します。"
 
-#. Tag: programlisting
-#: interceptors.xml:223
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBinding\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBindingType\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:225
 #, fuzzy, no-c-format
 msgid ""
 "Now, any bean annotated <literal>@Action</literal> will be bound to both "
@@ -686,13 +331,11 @@
 "<literal>TransactionalSecureInterceptor</literal> が存在それば、それさえも)"
 
 #. Tag: title
-#: interceptors.xml:234
 #, no-c-format
 msgid "Use of <literal>@Interceptors</literal>"
 msgstr "<literal>@Interceptors</literal> の使用"
 
 #. Tag: para
-#: interceptors.xml:236
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>@Interceptors</literal> annotation defined by the interceptor "
@@ -703,58 +346,290 @@
 "タープライズとシンプルの両方のWeb Beansでサポートされます。たとえば、次のよう"
 "に。"
 
-#. Tag: programlisting
-#: interceptors.xml:239
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"    public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:241
 #, no-c-format
 msgid "However, this approach suffers the following drawbacks:"
 msgstr "しかし、このアプローチは次のような欠点があります。"
 
 #. Tag: para
-#: interceptors.xml:245
 #, no-c-format
 msgid "the interceptor implementation is hardcoded in business code,"
 msgstr "インタセプタ実装はビジネスコードにハードコードされる"
 
 #. Tag: para
-#: interceptors.xml:250
 #, no-c-format
 msgid "interceptors may not be easily disabled at deployment time, and"
 msgstr "インタセプタはデプロイ時に簡単に無効に設定できない"
 
 #. Tag: para
-#: interceptors.xml:255
 #, fuzzy, no-c-format
 msgid ""
-"the interceptor ordering is non-global &#8212; it is determined by the order "
-"in which interceptors are listed at the class level."
+"the interceptor ordering is non-global — it is determined by the order in "
+"which interceptors are listed at the class level."
 msgstr ""
 "インタセプタの順番はグローバルではない。つまり、クラスレベルでリストされたイ"
 "ンタセプタの順番によって決定される"
 
 #. Tag: para
-#: interceptors.xml:262
 #, fuzzy, no-c-format
 msgid "Therefore, we recommend the use of CDI-style interceptor bindings."
 msgstr ""
 "そのため、私たちはWeb Beansスタイルのインタセプタバインディングを推奨します。"
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DependencyInjectionInterceptor {\n"
+#~ "   @PostConstruct \n"
+#~ "   public void injectDependencies(InvocationContext ctx) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DependencyInjectionInterceptor {\n"
+#~ "    @PostConstruct public void injectDependencies(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class TimeoutInterceptor {\n"
+#~ "   @AroundTimeout \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "    @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke \n"
+#~ "    public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource Transaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {\n"
+#~ "   boolean requiresNew() default false;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {\n"
+#~ "    boolean requiresNew() default false;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
+#~ "public class RequiresNewTransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional(requiresNew=true) @Interceptor\n"
+#~ "public class RequiresNewTransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional(requiresNew = true)\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional(requiresNew=true)\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Secure {\n"
+#~ "   @Nonbinding String[] rolesAllowed() default {};\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Secure {\n"
+#~ "    @NonBinding String[] rolesAllowed() default {};\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure @Interceptor\n"
+#~ "public class TransactionalSecureInterceptor { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure @Interceptor\n"
+#~ "public class TransactionalSecureInterceptor { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "    @Transactional @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "    @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactionl\n"
+#~ "public class ShoppingCart {\n"
+#~ "    @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "    public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "@InterceptorBinding\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Action { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "@InterceptorBindingType\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Action { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
+#~ "class})\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
+#~ "class})\n"
+#~ "public class ShoppingCart {\n"
+#~ "    public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "Web Beans re-uses the basic interceptor architecture of EJB 3.0, "
 #~ "extending the functionality in two directions:"
 #~ msgstr ""

Modified: doc/trunk/reference/ja-JP/intro.po
===================================================================
--- doc/trunk/reference/ja-JP/intro.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/intro.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-06-09 03:50+0900\n"
 "Last-Translator: Shinobu NOGAMI <s-nogami at sourceforge.jp>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: intro.xml:4
 #, no-c-format
 msgid "Introduction"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "So you're keen to get started writing your first bean? Or perhaps you're "
@@ -37,13 +35,11 @@
 "ません。"
 
 #. Tag: title
-#: intro.xml:13
 #, fuzzy, no-c-format
 msgid "What is a bean?"
 msgstr "Web Bean とは何か?"
 
 #. Tag: para
-#: intro.xml:15
 #, no-c-format
 msgid ""
 "A bean is exactly what you think it is. Only now, it has a true identity in "
@@ -51,7 +47,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:19
 #, no-c-format
 msgid ""
 "Prior to Java EE 6, there was no clear definition of the term \"bean\" in "
@@ -64,7 +59,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:27
 #, no-c-format
 msgid ""
 "Java EE 6 finally lays down that common definition in the Managed Beans "
@@ -78,14 +72,13 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:36
 #, no-c-format
 msgid ""
 "With very few exceptions, almost every concrete Java class that has a "
 "constructor with no parameters (or a constructor designated with the "
 "annotation <literal>@Inject</literal>) is a bean. This includes every "
 "JavaBean and every EJB session bean. If you've already got some JavaBeans or "
-"session beans lying around, they're already beans&#8212;you won't need any "
+"session beans lying around, they're already beans—you won't need any "
 "additional special metadata. There's just little one thing you need to do "
 "before you can start injecting them into stuff: you need to put them in an "
 "archive (a jar, or a Java EE module such as a war or EJB jar) that contains "
@@ -93,33 +86,29 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:45
 #, no-c-format
 msgid ""
 "The JavaBeans and EJBs you've been writing every day, up until now, have not "
 "been able to take advantage of the new services defined by the CDI "
-"specification. But you'll be able to use every one of them with CDI&#8212;"
-"allowing the container to create and destroy instances of your beans and "
-"associate them with a designated context, injecting them into other beans, "
-"using them in EL expressions, specializing them with qualifier annotations, "
-"even adding interceptors and decorators to them&#8212;without modifying your "
-"existing code. At most, you'll need to add some annotations."
+"specification. But you'll be able to use every one of them with CDI—allowing "
+"the container to create and destroy instances of your beans and associate "
+"them with a designated context, injecting them into other beans, using them "
+"in EL expressions, specializing them with qualifier annotations, even adding "
+"interceptors and decorators to them—without modifying your existing code. At "
+"most, you'll need to add some annotations."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:54
 #, no-c-format
 msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
-#: intro.xml:61
 #, no-c-format
 msgid "Getting our feet wet"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:63
 #, fuzzy, no-c-format
 msgid ""
 "Suppose that we have two existing Java classes that we've been using for "
@@ -129,20 +118,7 @@
 "様々なアプリケーションで何年間も使っている2つの既存の Java クラスがあると仮"
 "定します。1つ目のクラスは、文のリストへ文字列に構文解析します:"
 
-#. Tag: programlisting
-#: intro.xml:68
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class SentenceParser {\n"
-"   public List<String> parse(String text) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class SentenceParser {\n"
-"    public List<String> parse(String text) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:70
 #, no-c-format
 msgid ""
 "The second existing class is a stateless session bean front-end for an "
@@ -152,42 +128,12 @@
 "2つ目の現存するクラスは、1つの言語からもう1つの言語への文を翻訳することが"
 "できる外部システムのフロントエンドとなるステートレスセッション Bean です:"
 
-#. Tag: programlisting
-#: intro.xml:75
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"   public String translate(String sentence) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"    public String translate(String sentence) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:77
 #, fuzzy, no-c-format
 msgid "Where <literal>Translator</literal> is the EJB local interface:"
 msgstr "ここで <literal>Translator</literal> はローカルインターフェースです:"
 
-#. Tag: programlisting
-#: intro.xml:79
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"   public String translate(String sentence);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"    public String translate(String sentence);\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "Unfortunately, we don't have a class that translates whole text documents. "
@@ -196,54 +142,7 @@
 "運悪く、すべてのテキストドキュメントを翻訳する既存のクラスはありません。そこ"
 "でこの仕事をする Web Bean を書きましょう:"
 
-#. Tag: programlisting
-#: intro.xml:85
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator {\n"
-"   private SentenceParser sentenceParser;\n"
-"   private Translator sentenceTranslator;\n"
-"    \n"
-"   @Inject\n"
-"   TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"      this.sentenceParser = sentenceParser;\n"
-"      this.sentenceTranslator = sentenceTranslator;\n"
-"   }\n"
-"    \n"
-"   public String translate(String text) {\n"
-"      StringBuilder sb = new StringBuilder();\n"
-"      for (String sentence: sentenceParser.parse(text)) {\n"
-"          sb.append(sentenceTranslator.translate(sentence));\n"
-"      }\n"
-"      return sb.toString();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TextTranslator {\n"
-"    \n"
-"    private SentenceParser sentenceParser;\n"
-"    private Translator sentenceTranslator;\n"
-"    \n"
-"    @Initializer\n"
-"    TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"        this.sentenceParser = sentenceParser;\n"
-"        this.sentenceTranslator = sentenceTranslator;\n"
-"    }\n"
-"    \n"
-"    public String translate(String text) {\n"
-"        StringBuilder sb = new StringBuilder();\n"
-"        for (String sentence: sentenceParser.parse(text)) {\n"
-"            sb.append(sentenceTranslator.translate(sentence));\n"
-"        }\n"
-"        return sb.toString();\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:87
 #, fuzzy, no-c-format
 msgid ""
 "But wait! <literal>TextTranslator</literal> does not have a constructor with "
@@ -258,7 +157,6 @@
 "ができます。"
 
 #. Tag: para
-#: intro.xml:93
 #, fuzzy, no-c-format
 msgid ""
 "As you've guessed, the <literal>@Inject</literal> annotation has something "
@@ -275,7 +173,6 @@
 "に他の Web Beans を注入します。"
 
 #. Tag: para
-#: intro.xml:100
 #, no-c-format
 msgid ""
 "We may obtain an instance of <literal>TextTranslator</literal> by injecting "
@@ -286,7 +183,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:107
 #, no-c-format
 msgid ""
 "Let's create a UI controller bean that uses field injection to obtain an "
@@ -294,44 +190,12 @@
 "entered by a user:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:116
-#, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class TranslateController {\n"
-"   @Inject TextTranslator textTranslator;\n"
-"\n"
-"   private String inputText;\n"
-"   private String translation;\n"
-"\n"
-"   // JSF action method, perhaps\n"
-"   public void translate() {\n"
-"      translation = textTranslator.translate(inputText); \n"
-"   }\n"
-"\n"
-"   public String getInputText() {\n"
-"      return inputText;\n"
-"   }\n"
-"\n"
-"   public void setInputText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"\n"
-"   public String getTranslation() {\n"
-"      return translation;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:119
 #, fuzzy, no-c-format
 msgid "Field injection of <literal>TextTranslator</literal> instance"
 msgstr "ここで <literal>Translator</literal> はローカルインターフェースです:"
 
 #. Tag: para
-#: intro.xml:127
 #, no-c-format
 msgid ""
 "Notice the controller bean is request-scoped and named. Since this "
@@ -342,7 +206,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:135
 #, fuzzy, no-c-format
 msgid ""
 "Alternatively, we may obtain an instance of <literal>TextTranslator</"
@@ -352,23 +215,7 @@
 "Web Bean、サーブレットあるいは EJB へ注入することによって "
 "<literal>TextTranslator</literal> のインスタンスを取得することができます:"
 
-#. Tag: programlisting
-#: intro.xml:140
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
-"...\n"
-"public void translate() {\n"
-"   textTranslatorInstance.get().translate(inputText);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public setTextTranslator(TextTranslator textTranslator) {\n"
-"    this.textTranslator = textTranslator;\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:142
 #, no-c-format
 msgid ""
 "Notice that it isn't necessary to create a getter or setter method to inject "
@@ -379,17 +226,15 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:148
 #, fuzzy, no-c-format
 msgid ""
 "At system initialization time, the container must validate that exactly one "
 "bean exists which satisfies each injection point. In our example, if no "
-"implementation of <literal>Translator</literal> is available&#8212;if the "
-"<literal>SentenceTranslator</literal> EJB was not deployed&#8212;the "
-"container would inform us of an <emphasis>unsatisfied dependency</emphasis>. "
-"If more than one implementation of <literal>Translator</literal> were "
-"available, the container would inform us of the <emphasis>ambiguous "
-"dependency</emphasis>."
+"implementation of <literal>Translator</literal> is available—if the "
+"<literal>SentenceTranslator</literal> EJB was not deployed—the container "
+"would inform us of an <emphasis>unsatisfied dependency</emphasis>. If more "
+"than one implementation of <literal>Translator</literal> were available, the "
+"container would inform us of the <emphasis>ambiguous dependency</emphasis>."
 msgstr ""
 "システムの初期化時に、Web Bean マネージャはそれぞれのインジェクションポイント"
 "の条件を満たすまさに1つの Web Bean が存在することを検証しなければなりませ"
@@ -401,7 +246,6 @@
 "ジャは、<literal>AmbiguousDependencyException</literal> をスローします。"
 
 #. Tag: para
-#: intro.xml:156
 #, no-c-format
 msgid ""
 "Before we get too deep in the details, let's pause and examine a bean's "
@@ -410,6 +254,97 @@
 "what <emphasis>makes</emphasis> something a bean."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class SentenceParser {\n"
+#~ "   public List<String> parse(String text) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class SentenceParser {\n"
+#~ "    public List<String> parse(String text) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator {\n"
+#~ "   public String translate(String sentence) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator {\n"
+#~ "    public String translate(String sentence) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Local\n"
+#~ "public interface Translator {\n"
+#~ "   public String translate(String sentence);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Local\n"
+#~ "public interface Translator {\n"
+#~ "    public String translate(String sentence);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class TextTranslator {\n"
+#~ "   private SentenceParser sentenceParser;\n"
+#~ "   private Translator sentenceTranslator;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) {\n"
+#~ "      this.sentenceParser = sentenceParser;\n"
+#~ "      this.sentenceTranslator = sentenceTranslator;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public String translate(String text) {\n"
+#~ "      StringBuilder sb = new StringBuilder();\n"
+#~ "      for (String sentence: sentenceParser.parse(text)) {\n"
+#~ "          sb.append(sentenceTranslator.translate(sentence));\n"
+#~ "      }\n"
+#~ "      return sb.toString();\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TextTranslator {\n"
+#~ "    \n"
+#~ "    private SentenceParser sentenceParser;\n"
+#~ "    private Translator sentenceTranslator;\n"
+#~ "    \n"
+#~ "    @Initializer\n"
+#~ "    TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) {\n"
+#~ "        this.sentenceParser = sentenceParser;\n"
+#~ "        this.sentenceTranslator = sentenceTranslator;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public String translate(String text) {\n"
+#~ "        StringBuilder sb = new StringBuilder();\n"
+#~ "        for (String sentence: sentenceParser.parse(text)) {\n"
+#~ "            sb.append(sentenceTranslator.translate(sentence));\n"
+#~ "        }\n"
+#~ "        return sb.toString();\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
+#~ "...\n"
+#~ "public void translate() {\n"
+#~ "   textTranslatorInstance.get().translate(inputText);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public setTextTranslator(TextTranslator textTranslator) {\n"
+#~ "    this.textTranslator = textTranslator;\n"
+#~ "}]]>"
+
 #~ msgid "Getting started with Web Beans"
 #~ msgstr "Web Beans を始めよう"
 

Modified: doc/trunk/reference/ja-JP/master.po
===================================================================
--- doc/trunk/reference/ja-JP/master.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/master.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: master.xml:9
 #, no-c-format
 msgid "A note about naming and nomenclature"
 msgstr ""
 
 #. Tag: para
-#: master.xml:10
 #, no-c-format
 msgid ""
 "Shortly before the final draft of JSR-299 was submitted, the specification "
@@ -35,7 +33,6 @@
 msgstr ""
 
 #. Tag: para
-#: master.xml:19
 #, no-c-format
 msgid ""
 "You'll also find that some of the functionality that once existed in the "
@@ -45,43 +42,37 @@
 msgstr ""
 
 #. Tag: para
-#: master.xml:25
 #, no-c-format
 msgid ""
 "Note that this reference guide was started while changes were still being "
 "made to the specification. We've done our best to update it for accuracy. If "
 "you discover a conflict between what is written in this guide and the "
-"specification, the specification is the authority&#8212;assume it is "
-"correct. If you believe you have found an error in the specification, please "
-"report it to the JSR-299 EG."
+"specification, the specification is the authority—assume it is correct. If "
+"you believe you have found an error in the specification, please report it "
+"to the JSR-299 EG."
 msgstr ""
 
 #. Tag: title
-#: master.xml:36
 #, no-c-format
 msgid "Beans"
 msgstr ""
 
 #. Tag: title
-#: master.xml:49
 #, no-c-format
 msgid "Weld, the CDI Reference Implementation"
 msgstr ""
 
 #. Tag: title
-#: master.xml:59
 #, fuzzy, no-c-format
 msgid "Loose coupling with strong typing"
 msgstr "強い型付けを最大限に活用"
 
 #. Tag: title
-#: master.xml:75
 #, fuzzy, no-c-format
 msgid "CDI and the Java EE ecosystem"
 msgstr "Web Beans と Java EE エコシステム"
 
 #. Tag: title
-#: master.xml:87
 #, fuzzy, no-c-format
 msgid "Weld reference"
 msgstr "Web Beans リファレンス"

Modified: doc/trunk/reference/ja-JP/next.po
===================================================================
--- doc/trunk/reference/ja-JP/next.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/next.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-04-19 02:20+0900\n"
 "Last-Translator: wadahiro <wadahiro at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: next.xml:4
 #, no-c-format
 msgid "Next steps"
 msgstr "次のステップ"
 
 #. Tag: para
-#: next.xml:6
 #, no-c-format
 msgid ""
 "Because CDI is so new, there's not yet a lot of information available "
@@ -34,7 +32,6 @@
 
 # substantiallyってどう訳す
 #. Tag: para
-#: next.xml:14
 #, fuzzy, no-c-format
 msgid ""
 "The CDI reference implementation, Weld, is being developed at the <ulink url="
@@ -51,7 +48,6 @@
 "かれた一連のブログエントリーに基づいています。"
 
 #. Tag: para
-#: next.xml:22
 #, no-c-format
 msgid ""
 "We encourage you to follow the <ulink url=\"https://lists.jboss.org/mailman/"
@@ -61,7 +57,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:28
 #, no-c-format
 msgid ""
 "We are eager to find volunteers to help revise, proofread or translate this "
@@ -70,7 +65,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:35
 #, no-c-format
 msgid ""
 "Checkout source from <ulink url=\"http://anonsvn.jboss.org/repos/weld/doc/"
@@ -78,16 +72,7 @@
 "ulink> using SVN"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:40
-#, no-c-format
-msgid ""
-"<![CDATA[$> svn co http://anonsvn.jboss.org/repos/weld/doc/trunk/reference "
-"weld-reference]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:43
 #, no-c-format
 msgid ""
 "Edit the <literal>pom.xml</literal> file in the root of the checkout and "
@@ -96,19 +81,11 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:49
 #, no-c-format
 msgid "Build using Maven 2"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:52
-#, no-c-format
-msgid "<![CDATA[$> mvn]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:54
 #, no-c-format
 msgid ""
 "If you experience an out of memory error, try setting this environment "
@@ -116,7 +93,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:61
 #, no-c-format
 msgid ""
 "The PDF version of the reference guide will appear the current directory. "
@@ -125,7 +101,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:66
 #, no-c-format
 msgid "We look forward to your participation!"
 msgstr ""

Modified: doc/trunk/reference/ja-JP/part1.po
===================================================================
--- doc/trunk/reference/ja-JP/part1.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/part1.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part1.xml:14
 #, fuzzy, no-c-format
 msgid ""
 "The <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-299</ulink> "
@@ -30,7 +29,6 @@
 "モデルを補足するものとして、Web Beans は以下のサービスを提供します:"
 
 #. Tag: para
-#: part1.xml:23
 #, fuzzy, no-c-format
 msgid ""
 "an improved lifecycle for stateful objects, bound to well-defined "
@@ -40,7 +38,6 @@
 "フルコンポーネントのための改善されたライフサイクル"
 
 #. Tag: para
-#: part1.xml:28
 #, no-c-format
 msgid "a typesafe approach to <emphasis>dependency injection</emphasis>,"
 msgstr ""
@@ -48,14 +45,12 @@
 "DI)</emphasis>"
 
 #. Tag: para
-#: part1.xml:33
 #, fuzzy, no-c-format
 msgid ""
 "object interaction via an <emphasis>event notification facility</emphasis>,"
 msgstr "<emphasis>イベント通知 (event notification)</emphasis> による相互作用"
 
 #. Tag: para
-#: part1.xml:38
 #, fuzzy, no-c-format
 msgid ""
 "a better approach to binding <emphasis>interceptors</emphasis> to objects, "
@@ -68,7 +63,6 @@
 "際に使用するのがより適したものになります"
 
 #. Tag: para
-#: part1.xml:45
 #, no-c-format
 msgid ""
 "an <emphasis>SPI</emphasis> for developing portable extensions to the "
@@ -76,22 +70,21 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:51
 #, no-c-format
 msgid ""
 "The CDI services are a core aspect of the Java EE platform and include full "
 "support for Java EE modularity and the Java EE component architecture. But "
 "the specification does not limit the use of CDI to the Java EE environment. "
 "In the Java SE environment, the services might be provided by a standalone "
-"CDI implementation like Weld (see <xref linkend=\"weld-se\"/>), or even by a "
-"container that also implements the subset of EJB defined for embedded usage "
-"by the EJB 3.1 specification. CDI is especially useful in the context of web "
-"application development, but the problems it solves are general development "
-"concerns and it is therefore applicable to a wide variety of application."
+"CDI implementation like Weld (see <xref linkend=\"weld-se\" />), or even by "
+"a container that also implements the subset of EJB defined for embedded "
+"usage by the EJB 3.1 specification. CDI is especially useful in the context "
+"of web application development, but the problems it solves are general "
+"development concerns and it is therefore applicable to a wide variety of "
+"application."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:61
 #, no-c-format
 msgid ""
 "An object bound to a lifecycle context is called a bean. CDI includes built-"
@@ -100,19 +93,16 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:68
 #, no-c-format
 msgid "managed beans, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:71
 #, no-c-format
 msgid "EJB session beans."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:75
 #, no-c-format
 msgid ""
 "Both managed beans and EJB session beans may inject other beans. But some "
@@ -122,37 +112,31 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:83
 #, no-c-format
 msgid "message-driven beans,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:86
 #, no-c-format
 msgid "interceptors,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:89
 #, no-c-format
 msgid "servlets, servlet filters and servlet event listeners,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:92
 #, no-c-format
 msgid "JAX-WS service endpoints and handlers, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:95
 #, no-c-format
 msgid "JSP tag handlers and tag library event listeners."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:99
 #, fuzzy, no-c-format
 msgid ""
 "CDI relieves the user of an unfamiliar API of the need to answer the "
@@ -163,37 +147,31 @@
 "す:"
 
 #. Tag: para
-#: part1.xml:105
 #, fuzzy, no-c-format
 msgid "What is the lifecycle of this object?"
 msgstr "このオブジェクトのライフサイクルは何ですか?"
 
 #. Tag: para
-#: part1.xml:108
 #, fuzzy, no-c-format
 msgid "How many simultaneous clients can it have?"
 msgstr "同時にいくつのクライアントがアクセスできますか?"
 
 #. Tag: para
-#: part1.xml:111
 #, fuzzy, no-c-format
 msgid "Is it multithreaded?"
 msgstr "マルチスレッド対応ですか?"
 
 #. Tag: para
-#: part1.xml:114
 #, no-c-format
 msgid "How do I get access to it from a client?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:117
 #, fuzzy, no-c-format
 msgid "Do I need to explicitly destroy it?"
 msgstr "明示的に破棄する必要がありますか?"
 
 #. Tag: para
-#: part1.xml:120
 #, fuzzy, no-c-format
 msgid ""
 "Where should I keep the reference to it when I'm not currently using it?"
@@ -201,7 +179,6 @@
 "直接的に使用していないときに、それへのリファレンスはどこに保持すべきですか?"
 
 #. Tag: para
-#: part1.xml:125
 #, fuzzy, no-c-format
 msgid ""
 "How can I define an alternative implementation, so that the implementation "
@@ -211,13 +188,11 @@
 "にするために、間接的なレイヤをどのように追加することができますか?"
 
 #. Tag: para
-#: part1.xml:131
 #, fuzzy, no-c-format
 msgid "How should I go about sharing this object between other objects?"
 msgstr "どのようにこのオブジェクトを他のオブジェクトとの間で共有すべきですか?"
 
 #. Tag: para
-#: part1.xml:137
 #, no-c-format
 msgid ""
 "CDI is more than a framework. It's a whole, rich programming model. The "
@@ -226,7 +201,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:142
 #, fuzzy, no-c-format
 msgid ""
 "A bean specifies only the type and semantics of other beans it depends upon. "
@@ -245,7 +219,6 @@
 "す。"
 
 #. Tag: para
-#: part1.xml:149
 #, fuzzy, no-c-format
 msgid ""
 "Events, interceptors and decorators enhance the loose-coupling inherent in "
@@ -255,7 +228,6 @@
 "<emphasis>疎結合 (loose-coupling)</emphasis> を強化します:"
 
 #. Tag: para
-#: part1.xml:155
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -266,7 +238,6 @@
 "ます"
 
 #. Tag: para
-#: part1.xml:159
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -276,7 +247,6 @@
 "関心事を切り離します"
 
 #. Tag: para
-#: part1.xml:163
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> allow business concerns to be "
@@ -286,7 +256,6 @@
 "可能にします"
 
 #. Tag: para
-#: part1.xml:168
 #, fuzzy, no-c-format
 msgid ""
 "What's even more powerful (and comforting) is that CDI provides all these "
@@ -310,7 +279,6 @@
 "タ、イベント消費者とが結び付けられます。"
 
 #. Tag: para
-#: part1.xml:177
 #, no-c-format
 msgid ""
 "But CDI isn't a restrictive programming model. It doesn't tell you how you "
@@ -320,7 +288,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:183
 #, fuzzy, no-c-format
 msgid ""
 "CDI even provides a comprehensive SPI, allowing other kinds of object "
@@ -335,7 +302,6 @@
 "ます。"
 
 #. Tag: para
-#: part1.xml:189
 #, fuzzy, no-c-format
 msgid ""
 "CDI was influenced by a number of existing Java frameworks, including Seam, "
@@ -353,7 +319,6 @@
 "ズアプリケーション向けの機能があります。"
 
 #. Tag: para
-#: part1.xml:197
 #, no-c-format
 msgid ""
 "Finally, CDI is a <ulink url=\"http://jcp.org\">Java Community Process</"

Modified: doc/trunk/reference/ja-JP/part2.po
===================================================================
--- doc/trunk/reference/ja-JP/part2.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/part2.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-04-30 23:10+0900\n"
 "Last-Translator: Fusayuki Minamoto <miki.htmnet at nifty.com>\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part2.xml:5
 #, no-c-format
 msgid ""
 "Weld, the JSR-299 Reference Implementation (RI), is being developed as part "
@@ -26,7 +25,6 @@
 msgstr ""
 
 #. Tag: para
-#: part2.xml:12
 #, no-c-format
 msgid ""
 "Weld provides a complete SPI allowing Java EE containers such as JBoss AS "
@@ -36,7 +34,6 @@
 msgstr ""
 
 #. Tag: para
-#: part2.xml:18
 #, no-c-format
 msgid ""
 "Weld comes with an extensive library of examples, which are a great starting "

Modified: doc/trunk/reference/ja-JP/part3.po
===================================================================
--- doc/trunk/reference/ja-JP/part3.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/part3.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-07-02 12:31+0900\n"
 "Last-Translator: minamoto <minamoto at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part3.xml:5
 #, no-c-format
 msgid ""
 "The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've "
@@ -22,19 +21,16 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:12
 #, no-c-format
 msgid "<emphasis>alternatives</emphasis> enable deployment time polymorphism,"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:17
 #, no-c-format
 msgid "<emphasis>producer methods</emphasis> enable runtime polymorphism, and"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:21
 #, no-c-format
 msgid ""
 "<emphasis>contextual lifecycle management</emphasis> decouples bean "
@@ -42,7 +38,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:27
 #, no-c-format
 msgid ""
 "These techniques serve to enable loose coupling of client and server. The "
@@ -52,7 +47,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:33
 #, no-c-format
 msgid ""
 "Loose coupling makes a system more <emphasis>dynamic</emphasis>. The system "
@@ -64,7 +58,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:40
 #, no-c-format
 msgid ""
 "CDI provides three extra important facilities that further the goal of loose "
@@ -72,7 +65,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:46
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -80,7 +72,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:51
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> may be used to decouple some business "
@@ -88,7 +79,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:56
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -96,7 +86,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:62
 #, fuzzy, no-c-format
 msgid ""
 "The second major theme of CDI is <emphasis>strong typing</emphasis>. The "
@@ -110,13 +99,12 @@
 "れることがありえるタイプセーフな Java のコンストラクトに含まれます。"
 
 #. Tag: para
-#: part3.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "You don't see string-based identifiers in CDI code, not because the "
-"framework is hiding them from you using clever defaulting rules&#8212;so-"
-"called \"configuration by convention\"&#8212;but because there are simply no "
-"strings there to begin with!"
+"framework is hiding them from you using clever defaulting rules—so-called "
+"\"configuration by convention\"—but because there are simply no strings "
+"there to begin with!"
 msgstr ""
 "Web Beans コードでストリングベースの識別子を認知しません。上手なデフォルティ"
 "ングを使うことで、&#151;いわゆる\"規則による構成\"&#151;を除外します。フレー"
@@ -124,7 +112,6 @@
 "ん。 "
 
 #. Tag: para
-#: part3.xml:74
 #, no-c-format
 msgid ""
 "The obvious benefit of this approach is that <emphasis>any</emphasis> IDE "
@@ -141,7 +128,6 @@
 "かるとき、コードの意味上のレベルを良くする機会があることがわかります。"
 
 #. Tag: para
-#: part3.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "CDI encourages you develop annotations that model concepts, for example,"
@@ -150,61 +136,51 @@
 "のものです。"
 
 #. Tag: para
-#: part3.xml:87
 #, no-c-format
 msgid "<literal>@Asynchronous</literal>,"
 msgstr "<literal>@Asynchronous</literal>"
 
 #. Tag: para
-#: part3.xml:90
 #, no-c-format
 msgid "<literal>@Mock</literal>,"
 msgstr "<literal>@Mock</literal>"
 
 #. Tag: para
-#: part3.xml:93
 #, no-c-format
 msgid "<literal>@Secure</literal> or"
 msgstr "<literal>@Secure</literal>"
 
 #. Tag: para
-#: part3.xml:96
 #, no-c-format
 msgid "<literal>@Updated</literal>,"
 msgstr "<literal>@Updated</literal>"
 
 #. Tag: para
-#: part3.xml:100
 #, no-c-format
 msgid "instead of using compound names like"
 msgstr "名前が合う複合語を使う代わりに、以下のものを使います。"
 
 #. Tag: para
-#: part3.xml:104
 #, no-c-format
 msgid "<literal>asyncPaymentProcessor</literal>,"
 msgstr "<literal>asyncPaymentProcessor</literal>"
 
 #. Tag: para
-#: part3.xml:107
 #, no-c-format
 msgid "<literal>mockPaymentProcessor</literal>,"
 msgstr "<literal>mockPaymentProcessor</literal>"
 
 #. Tag: para
-#: part3.xml:110
 #, no-c-format
 msgid "<literal>SecurityInterceptor</literal> or"
 msgstr "<literal>SecurityInterceptor</literal>"
 
 #. Tag: para
-#: part3.xml:113
 #, no-c-format
 msgid "<literal>DocumentUpdatedEvent</literal>."
 msgstr "<literal>DocumentUpdatedEvent</literal>"
 
 #. Tag: para
-#: part3.xml:117
 #, no-c-format
 msgid ""
 "The annotations are reusable. They help describe common qualities of "
@@ -217,7 +193,6 @@
 "に対処するのを助けます。また、コードをより明晰でより理解できるようにします。"
 
 #. Tag: para
-#: part3.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "CDI <emphasis>stereotypes</emphasis> take this idea a step further. A "
@@ -234,7 +209,6 @@
 "いろな特性をカプセル化します。"
 
 #. Tag: para
-#: part3.xml:138
 #, fuzzy, no-c-format
 msgid ""
 "We're now ready to meet some more advanced features of CDI. Bear in mind "

Modified: doc/trunk/reference/ja-JP/part4.po
===================================================================
--- doc/trunk/reference/ja-JP/part4.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/part4.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-04-25 00:28+0900\n"
 "Last-Translator: tagawaman <karlgotch1924.2007 at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part4.xml:5
 #, no-c-format
 msgid ""
 "The third theme of CDI is <emphasis>integration</emphasis>. We've already "
@@ -26,7 +25,6 @@
 msgstr ""
 
 #. Tag: para
-#: part4.xml:12
 #, fuzzy, no-c-format
 msgid ""
 "CDI is also designed to work in concert with technologies outside of the "
@@ -52,7 +50,6 @@
 "へ、その技術をより簡単に使えるようにしてくれます。"
 
 #. Tag: para
-#: part4.xml:23
 #, fuzzy, no-c-format
 msgid ""
 "We're about to see how to take full advantage of the Java EE platform in an "

Modified: doc/trunk/reference/ja-JP/part5.po
===================================================================
--- doc/trunk/reference/ja-JP/part5.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/part5.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-05-03 06:31+0900\n"
 "Last-Translator: TANABE Junnichi <jun at lmns.biz>\n"
 "Language-Team: none\n"
@@ -15,7 +15,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part5.xml:5
 #, fuzzy, no-c-format
 msgid ""
 "Weld is the reference implementation of JSR-299, and is used by JBoss AS and "
@@ -33,7 +32,6 @@
 "るサポートを提供します。"
 
 #. Tag: para
-#: part5.xml:12
 #, no-c-format
 msgid ""
 "Some of the extensions in Weld are portable across JSR-299 implementations "
@@ -43,12 +41,11 @@
 msgstr ""
 
 #. Tag: para
-#: part5.xml:18
 #, fuzzy, no-c-format
 msgid ""
 "If you want to get started quickly using Weld (and, in turn, CDI) with JBoss "
 "AS, GlassFish or Tomcat and experiment with one of the examples, take a look "
-"at <xref linkend=\"gettingstarted\"/>. Otherwise read on for a exhaustive "
+"at <xref linkend=\"gettingstarted\" />. Otherwise read on for a exhaustive "
 "discussion of using Weld in all the environments and application servers it "
 "supports and the Weld extensions."
 msgstr ""

Modified: doc/trunk/reference/ja-JP/producermethods.po
===================================================================
--- doc/trunk/reference/ja-JP/producermethods.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/producermethods.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-06-23 23:39+0900\n"
 "Last-Translator: TANABE Junnichi <jun at lmns.biz>\n"
 "Language-Team: none\n"
@@ -15,13 +15,11 @@
 "X-Poedit-Bookmarks: -1,1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
 #. Tag: title
-#: producermethods.xml:5
 #, no-c-format
 msgid "Producer methods"
 msgstr "プロデューサメソッド"
 
 #. Tag: para
-#: producermethods.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Producer methods let us overcome certain limitations that arise when a "
@@ -36,13 +34,11 @@
 "ることになるでしょう。)"
 
 #. Tag: para
-#: producermethods.xml:14
 #, no-c-format
 msgid "According to the spec:"
 msgstr "仕様によると、"
 
 #. Tag: para
-#: producermethods.xml:18
 #, fuzzy, no-c-format
 msgid "A producer method acts as a source of objects to be injected, where:"
 msgstr ""
@@ -50,21 +46,18 @@
 "クトを生成するものとして動作します。"
 
 #. Tag: para
-#: producermethods.xml:22
 #, fuzzy, no-c-format
 msgid "the objects to be injected are not required to be instances of beans,"
 msgstr ""
 "インジェクトされるオブジェクトはWeb Beansのインスタンスである必要はない。"
 
 #. Tag: para
-#: producermethods.xml:25
 #, no-c-format
 msgid "the concrete type of the objects to be injected may vary at runtime or"
 msgstr ""
 "インジェクトされるオブジェクトの具象型は実行時によって変わるかもしれない。"
 
 #. Tag: para
-#: producermethods.xml:28
 #, fuzzy, no-c-format
 msgid ""
 "the objects require some custom initialization that is not performed by the "
@@ -74,25 +67,21 @@
 "とする。"
 
 #. Tag: para
-#: producermethods.xml:36
 #, no-c-format
 msgid "For example, producer methods let us:"
 msgstr "例えば、プロデューサメソッドによって以下のことをすることができます。"
 
 #. Tag: para
-#: producermethods.xml:40
 #, fuzzy, no-c-format
 msgid "expose a JPA entity as a bean,"
 msgstr "JPAエンティティをWeb Beanとして公開する。"
 
 #. Tag: para
-#: producermethods.xml:43
 #, fuzzy, no-c-format
 msgid "expose any JDK class as a bean,"
 msgstr "あらゆるJDKクラスをWeb Beanとして公開する。"
 
 #. Tag: para
-#: producermethods.xml:46
 #, fuzzy, no-c-format
 msgid ""
 "define multiple beans, with different scopes or initialization, for the same "
@@ -102,13 +91,11 @@
 "定義する。"
 
 #. Tag: para
-#: producermethods.xml:51
 #, fuzzy, no-c-format
 msgid "vary the implementation of a bean type at runtime."
 msgstr "実行時にAPIタイプの実装を変える。"
 
 #. Tag: para
-#: producermethods.xml:55
 #, fuzzy, no-c-format
 msgid ""
 "In particular, producer methods let us use runtime polymorphism with CDI. As "
@@ -122,58 +109,12 @@
 "がデプロイされると、そのWeb Beanの実装は固定されてしまいます。プロデューサメ"
 "ソッドにはそのような制限はありません。"
 
-#. Tag: programlisting
-#: producermethods.xml:61
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Preferences implements Serializable {\n"
-"   private PaymentStrategyType paymentStrategy;\n"
-"   ...\n"
-"   @Produces @Preferred \n"
-"   public PaymentStrategy getPaymentStrategy() {\n"
-"       switch (paymentStrategy) {\n"
-"           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
-"           case CHECK: return new CheckPaymentStrategy();\n"
-"           case PAYPAL: return new PayPalPaymentStrategy();\n"
-"           default: return null;\n"
-"       } \n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped\n"
-"public class Preferences {\n"
-"    \n"
-"    private PaymentStrategyType paymentStrategy;\n"
-"    \n"
-"    ...\n"
-"    \n"
-"    @Produces @Preferred \n"
-"    public PaymentStrategy getPaymentStrategy() {\n"
-"        switch (paymentStrategy) {\n"
-"            case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
-"            case CHEQUE: return new ChequePaymentStrategy();\n"
-"            case PAYPAL: return new PayPalPaymentStrategy();\n"
-"            default: return null;\n"
-"        } \n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:63
 #, no-c-format
 msgid "Consider an injection point:"
 msgstr "インジェクションポイントを見てみましょう。"
 
-#. Tag: programlisting
-#: producermethods.xml:65
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
-msgstr "<![CDATA[@Preferred PaymentStrategy paymentStrat;]]>"
-
 #. Tag: para
-#: producermethods.xml:67
 #, fuzzy, no-c-format
 msgid ""
 "This injection point has the same type and qualifier annotations as the "
@@ -188,13 +129,11 @@
 "されるでしょう。"
 
 #. Tag: title
-#: producermethods.xml:74
 #, no-c-format
 msgid "Scope of a producer method"
 msgstr "プロデューサメソッドのスコープ"
 
 #. Tag: para
-#: producermethods.xml:76
 #, fuzzy, no-c-format
 msgid ""
 "The scope of the producer method defaults to <literal>@Dependent</literal>, "
@@ -211,7 +150,6 @@
 "しれません。"
 
 #. Tag: para
-#: producermethods.xml:83
 #, no-c-format
 msgid ""
 "To change this behavior, we can add a <literal>@SessionScoped</literal> "
@@ -220,22 +158,7 @@
 "この振る舞いを変えるために、私たちはメソッドに<literal>@SessionScoped</"
 "literal>アノテーションを追記することができます。"
 
-#. Tag: programlisting
-#: producermethods.xml:87
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"    ...\n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:89
 #, no-c-format
 msgid ""
 "Now, when the producer method is called, the returned "
@@ -247,7 +170,6 @@
 "が同じセッションで再び呼び出されることは無いでしょう。"
 
 #. Tag: para
-#: producermethods.xml:95
 #, no-c-format
 msgid ""
 "A producer method does <emphasis>not</emphasis> inherit the scope of the "
@@ -260,13 +182,11 @@
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:107
 #, no-c-format
 msgid "Injection into producer methods"
 msgstr "プロデューサメソッドへのインジェクション"
 
 #. Tag: para
-#: producermethods.xml:109
 #, no-c-format
 msgid ""
 "There's one potential problem with the code above. The implementations of "
@@ -282,7 +202,6 @@
 "ターセプタを持ちません。"
 
 #. Tag: para
-#: producermethods.xml:116
 #, fuzzy, no-c-format
 msgid ""
 "If this isn't what we want, we can use dependency injection into the "
@@ -291,36 +210,7 @@
 "これが望むことでないのであれば、私たちはWeb Beanインスタンスを取得するために"
 "プロデューサメソッドに依存性注入することができます。"
 
-#. Tag: programlisting
-#: producermethods.xml:121
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          CheckPaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          ChequePaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-"
@@ -342,7 +232,6 @@
 "ンスをプロデューサメソッドから戻すときには気をつけてください。"
 
 #. Tag: para
-#: producermethods.xml:132
 #, fuzzy, no-c-format
 msgid ""
 "There's at least three ways we could go about fixing this bug. We could "
@@ -358,7 +247,6 @@
 "<literal>@RequestScoped</literal>に変えることでしょう。"
 
 #. Tag: para
-#: producermethods.xml:139
 #, fuzzy, no-c-format
 msgid ""
 "But a more common solution is to use the special <literal>@New</literal> "
@@ -368,51 +256,16 @@
 "グアノテーションを使用することです。"
 
 #. Tag: title
-#: producermethods.xml:144
 #, no-c-format
 msgid "Use of <literal>@New</literal> with producer methods"
 msgstr "プロデューサメソッドへの<literal>@New</literal>アノテーションの使用"
 
 #. Tag: para
-#: producermethods.xml:146
 #, no-c-format
 msgid "Consider the following producer method:"
 msgstr "以下のプロデューサメソッドを見てみましょう。"
 
-#. Tag: programlisting
-#: producermethods.xml:148
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New CheckPaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New ChequePaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:150
 #, no-c-format
 msgid ""
 "Then a new <emphasis>dependent</emphasis> instance of "
@@ -429,47 +282,25 @@
 "れるまで依存オブジェクトは破棄されることは無いでしょう。"
 
 #. Tag: title
-#: producermethods.xml:160
 #, fuzzy, no-c-format
 msgid "Disposer methods"
 msgstr "プロデューサメソッド"
 
 #. Tag: para
-#: producermethods.xml:162
 #, no-c-format
 msgid ""
 "Some producer methods return objects that require explicit destruction. For "
 "example, somebody needs to close this JDBC connection:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:167
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @RequestScoped Connection connect(User user) {\n"
-"   return createConnection(user.getId(), user.getPassword());\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:169
 #, no-c-format
 msgid ""
 "Destruction can be performed by a matching <emphasis>disposer method</"
 "emphasis>, defined by the same class as the producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:172
-#, no-c-format
-msgid ""
-"<![CDATA[void close(@Disposes Connection connection) {\n"
-"   connection.close();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:174
 #, no-c-format
 msgid ""
 "The disposer method must have at least one parameter, annotated "
@@ -482,5 +313,116 @@
 "method automatically."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Preferences implements Serializable {\n"
+#~ "   private PaymentStrategyType paymentStrategy;\n"
+#~ "   ...\n"
+#~ "   @Produces @Preferred \n"
+#~ "   public PaymentStrategy getPaymentStrategy() {\n"
+#~ "       switch (paymentStrategy) {\n"
+#~ "           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
+#~ "           case CHECK: return new CheckPaymentStrategy();\n"
+#~ "           case PAYPAL: return new PayPalPaymentStrategy();\n"
+#~ "           default: return null;\n"
+#~ "       } \n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Preferences {\n"
+#~ "    \n"
+#~ "    private PaymentStrategyType paymentStrategy;\n"
+#~ "    \n"
+#~ "    ...\n"
+#~ "    \n"
+#~ "    @Produces @Preferred \n"
+#~ "    public PaymentStrategy getPaymentStrategy() {\n"
+#~ "        switch (paymentStrategy) {\n"
+#~ "            case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
+#~ "            case CHEQUE: return new ChequePaymentStrategy();\n"
+#~ "            case PAYPAL: return new PayPalPaymentStrategy();\n"
+#~ "            default: return null;\n"
+#~ "        } \n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
+#~ msgstr "<![CDATA[@Preferred PaymentStrategy paymentStrat;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "    ...\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          CheckPaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          ChequePaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          @New CheckPaymentStrategy cps,\n"
+#~ "                                          @New PayPalPaymentStrategy "
+#~ "ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          @New ChequePaymentStrategy "
+#~ "cps,\n"
+#~ "                                          @New PayPalPaymentStrategy "
+#~ "ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
 #~ msgid "<chapter>.</chapter>"
 #~ msgstr "<chapter>.</chapter>"

Modified: doc/trunk/reference/ja-JP/resources.po
===================================================================
--- doc/trunk/reference/ja-JP/resources.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/resources.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: resources.xml:5
 #, no-c-format
 msgid "Java EE component environment resources"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:7
 #, no-c-format
 msgid ""
 "Java EE 5 already introduced some limited support for dependency injection, "
@@ -30,7 +28,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:13
 #, no-c-format
 msgid ""
 "Naturally, there is now a slight mismatch with the new style of dependency "
@@ -44,7 +41,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:22
 #, no-c-format
 msgid ""
 "Fields have a duality in that they can both be the target of Java EE "
@@ -57,13 +53,11 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:31
 #, no-c-format
 msgid "Defining a resource"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:33
 #, no-c-format
 msgid ""
 "The CDI specification uses the term <emphasis>resource</emphasis> to refer, "
@@ -72,7 +66,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:38
 #, no-c-format
 msgid ""
 "JDBC <literal>Datasource</literal>s, JMS <literal>Queue</literal>s, "
@@ -82,7 +75,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:43
 #, no-c-format
 msgid ""
 "JPA <literal>EntityManager</literal>s and <literal>EntityManagerFactory</"
@@ -90,19 +82,16 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:46
 #, no-c-format
 msgid "remote EJBs, and"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:49
 #, no-c-format
 msgid "web services"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:53
 #, no-c-format
 msgid ""
 "We declare a resource by annotating a producer field with a component "
@@ -111,61 +100,17 @@
 "<literal>@PersistenceUnit</literal> or <literal>@WebServiceRef</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:57
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @WebServiceRef(lookup=\"java:app/service/Catalog\")\n"
-"Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Resource(lookup=\"java:global/env/jdbc/CustomerDatasource"
-"\") \n"
-"@CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceContext(unitName=\"CustomerDatabase\")\n"
-"@CustomerDatabase EntityManager customerDatabasePersistenceContext;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:63
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceUnit(unitName=\"CustomerDatabase\") \n"
-"@CustomerDatabase EntityManagerFactory customerDatabasePersistenceUnit;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @EJB(ejbLink=\"../their.jar#PaymentService\") \n"
-"PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:67
 #, no-c-format
 msgid "The field may be static (but not final)."
 msgstr ""
 
 #. Tag: para
-#: resources.xml:69
 #, no-c-format
 msgid "A resource declaration really contains two pieces of information:"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:73
 #, no-c-format
 msgid ""
 "the JNDI name, EJB link, persistence unit name, or other metadata needed to "
@@ -173,7 +118,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:77
 #, no-c-format
 msgid ""
 "the type and qualifiers that we will use to inject the reference into our "
@@ -181,7 +125,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:82
 #, no-c-format
 msgid ""
 "It might feel strange to be declaring resources in Java code. Isn't this "
@@ -191,53 +134,16 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:90
 #, no-c-format
 msgid "Typesafe resource injection"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:92
 #, no-c-format
 msgid "These resources can now be injected in the usual way."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:96
-#, no-c-format
-msgid "<![CDATA[@Inject Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:97
-#, no-c-format
-msgid "<![CDATA[@Inject @CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:98
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManager "
-"customerDatabaseEntityManager;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManagerFactory "
-"customerDatabaseEntityManagerFactory;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:100
-#, no-c-format
-msgid "<![CDATA[@Inject PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:102
 #, no-c-format
 msgid ""
 "The bean type and qualifiers of the resource are determined by the producer "
@@ -245,7 +151,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:106
 #, no-c-format
 msgid ""
 "It might seem like a pain to have to write these extra producer field "
@@ -256,26 +161,12 @@
 "and more typesafe to write"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:113
-#, no-c-format
-msgid "@Inject @CustomerDatabase EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:115
 #, no-c-format
 msgid "instead of"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:117
-#, no-c-format
-msgid "@PersistenceContext(unitName=\"CustomerDatabase\") EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:119
 #, no-c-format
 msgid "all over the place?"
 msgstr ""

Modified: doc/trunk/reference/ja-JP/ri-spi.po
===================================================================
--- doc/trunk/reference/ja-JP/ri-spi.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/ri-spi.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-05-18 01:40+0900\n"
 "Last-Translator: wadahiro <wadahiro at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: ri-spi.xml:4
 #, fuzzy, no-c-format
 msgid "Integrating Weld into other environments"
 msgstr "他の環境へのWeb Beansの統合"
 
 #. Tag: para
-#: ri-spi.xml:6
 #, no-c-format
 msgid ""
 "If you want to use Weld in another environment, you will need to provide "
@@ -29,13 +27,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:12
 #, fuzzy, no-c-format
 msgid "Enterprise Services"
 msgstr "リソースサービス"
 
 #. Tag: para
-#: ri-spi.xml:13
 #, no-c-format
 msgid ""
 "If you just want to use managed beans, and not take advantage of enterprise "
@@ -47,7 +43,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:21
 #, no-c-format
 msgid ""
 "All SPIs and APIs described have extensive JavaDoc, which spell out the "
@@ -55,13 +50,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:27
 #, fuzzy, no-c-format
 msgid "The Weld SPI"
 msgstr "Web Beans SPI"
 
 #. Tag: para
-#: ri-spi.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "The Weld SPI is located in the <literal>weld-spi</literal> module, and "
@@ -75,7 +68,6 @@
 "が必要です。"
 
 #. Tag: para
-#: ri-spi.xml:35
 #, no-c-format
 msgid ""
 "All interfaces in the SPI support the decorator pattern and provide a "
@@ -90,7 +82,6 @@
 "準実装は<literal>helpers</literal>サブパッケージの中にあります、"
 
 #. Tag: para
-#: ri-spi.xml:41
 #, fuzzy, no-c-format
 msgid ""
 "Weld supports multiple environments. An environment is defined by an "
@@ -110,7 +101,6 @@
 "<literal>bootstrap.setEnvironment()</literal>を呼ぶことで環境を設定できます。"
 
 #. Tag: para
-#: ri-spi.xml:50
 #, fuzzy, no-c-format
 msgid ""
 "Weld uses a generic-typed service registry to allow services to be "
@@ -122,18 +112,16 @@
 "スレジストリは、サービスが追加されて、検索されることを可能とします。"
 
 #. Tag: title
-#: ri-spi.xml:56
 #, no-c-format
 msgid "Deployment structure"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:58
 #, no-c-format
 msgid ""
 "An application is often comprised of a number of modules. For example, a "
 "Java EE deployment may contain a number of EJB modules (containing business "
-"logic) and WAR modules (containing the user interface). A container may "
+"logic) and war modules (containing the user interface). A container may "
 "enforce certain <emphasis>accessibility</emphasis> rules which limit the "
 "visibility of classes between modules. CDI allows these same rules to apply "
 "to bean and observer method resolution. As the accessibility rules vary "
@@ -143,13 +131,12 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:67
 #, no-c-format
 msgid ""
 "The CDI specification discusses <emphasis>Bean Deployment Archives</"
-"emphasis> (BDAs)&#8212;archives which are marked as containing beans which "
-"should be deployed to the CDI container, and made available for injection "
-"and resolution. Weld reuses this description of <emphasis>Bean Deployment "
+"emphasis> (BDAs)—archives which are marked as containing beans which should "
+"be deployed to the CDI container, and made available for injection and "
+"resolution. Weld reuses this description of <emphasis>Bean Deployment "
 "Archives</emphasis> in its deployment structure SPI. Each deployment exposes "
 "the BDAs which it contains; each BDA may also reference other which it can "
 "access. Together, the transitive closure of this graph forms the beans which "
@@ -157,7 +144,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:76
 #, no-c-format
 msgid ""
 "To describe the deployment structure to Weld, the container should provide "
@@ -171,7 +157,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:85
 #, no-c-format
 msgid ""
 "As programmatically described beans may result in additional BDAs being "
@@ -181,13 +166,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:92
 #, no-c-format
 msgid "Virtual BDAs"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:93
 #, no-c-format
 msgid ""
 "In a strict container, each BDA might have to explicitly specify which other "
@@ -198,7 +181,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:100
 #, no-c-format
 msgid ""
 "A container, might, for example, use a flat accessibility structure for the "
@@ -207,11 +189,10 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:106
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it's contents to be discovered by Weld&#8212;<literal>BeanDeploymentArchive."
+"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
 "getBeanClasses()</literal> must return all the classes in the BDA, "
 "<literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the "
 "deployment descriptors in the archive, and <literal>BeanDeploymentArchive."
@@ -220,7 +201,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:114
 #, no-c-format
 msgid ""
 "BDA X may also reference another BDA Y whose beans can be resolved by, and "
@@ -231,13 +211,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:122
 #, no-c-format
 msgid "Matching the classloader structure for the deployment"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:124
 #, no-c-format
 msgid ""
 "In practice, you can regard the deployment structure represented by "
@@ -248,7 +226,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:132
 #, no-c-format
 msgid ""
 "To specify the directly accessible BDAs, the container should provide an "
@@ -257,7 +234,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:138
 #, no-c-format
 msgid ""
 "Weld allows the container to describe a circular graph, and will convert a "
@@ -265,7 +241,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:144
 #, no-c-format
 msgid ""
 "Certain services are provided for the whole deployment, whilst some are "
@@ -275,13 +250,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:153
 #, no-c-format
 msgid "EJB descriptors"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:155
 #, no-c-format
 msgid ""
 "Weld delegates EJB 3 bean discovery to the container so that it doesn't "
@@ -290,7 +263,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:160
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>EjbDescriptor</literal> should return the relevant metadata as "
@@ -304,13 +276,11 @@
 "<literal>BusinessInterfaceDescriptor</literal>があります。"
 
 #. Tag: title
-#: ri-spi.xml:169
 #, no-c-format
 msgid "EE resource injection and resolution services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:171
 #, no-c-format
 msgid ""
 "All the EE resource services are per-BDA services, and may be provided using "
@@ -319,37 +289,33 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:176
 #, no-c-format
 msgid ""
 "The integrator may choose to provide all EE resource injection services "
 "themselves, using another library or framework. In this case the integrator "
 "should use the <literal>EE</literal> environment, and implement the <xref "
-"linkend=\"injection.services\"/> SPI."
+"linkend=\"injection.services\" /> SPI."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:182
 #, no-c-format
 msgid ""
 "Alternatively, the integrator may choose to use CDI to provide EE resource "
 "injection. In this case, the <literal>EE_INJECT</literal> environment should "
 "be used, and the integrator should implement the <xref linkend=\"ejb."
-"services.resolution\"/>, <xref linkend=\"resource.services\"/> and <xref "
-"linkend=\"jpa.services\"/>."
+"services.resolution\" />, <xref linkend=\"resource.services\" /> and <xref "
+"linkend=\"jpa.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:189
 #, no-c-format
 msgid ""
 "CDI only provides annotation-based EE resource injection; if you wish to "
 "provide deployment descriptor (e.g. <literal>ejb-jar.xml</literal>) "
-"injection, you must use <xref linkend=\"injection.services\"/>."
+"injection, you must use <xref linkend=\"injection.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:195
 #, no-c-format
 msgid ""
 "If the container performs EE resource injection, the injected resources must "
@@ -358,7 +324,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:201
 #, no-c-format
 msgid ""
 "If you use a non-EE environment then you may implement any of the EE service "
@@ -367,29 +332,26 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:210
 #, no-c-format
 msgid "EJB services"
 msgstr "EJBサービス"
 
 #. Tag: para
-#: ri-spi.xml:212
 #, no-c-format
 msgid "EJB services are split between two interfaces which are both per-BDA."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:216
 #, fuzzy, no-c-format
 msgid ""
 "<literal>EJBServices</literal> is used to resolve local EJBs used to back "
 "session beans, and must always be provided in an EE environment. "
 "<literal>EJBServices.resolveEjb(EjbDescriptor ejbDescriptor)</literal> "
-"returns a wrapper&#8212;<literal>SessionObjectReference</literal>&#8212;"
-"around the EJB reference. This wrapper allows Weld to request a reference "
-"that implements the given business interface, and, in the case of SFSBs, "
-"both request the removal of the EJB from the container and query whether the "
-"EJB has been previously removed."
+"returns a wrapper—<literal>SessionObjectReference</literal>—around the EJB "
+"reference. This wrapper allows Weld to request a reference that implements "
+"the given business interface, and, in the case of SFSBs, both request the "
+"removal of the EJB from the container and query whether the EJB has been "
+"previously removed."
 msgstr ""
 "(よくセッションBeanを背後とする)ローカルEJBを解決するとき、EJB参照を囲んだ"
 "ラッパー(<literal>SessionObjectReference</literal>)を返します。このラッパーの"
@@ -397,23 +359,25 @@
 "ができます。SFSBの場合は、コンテナからEJBの削除を要求することができます。"
 
 #. Tag: para
-#: ri-spi.xml:225
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>EJBResolutionServices.resolveEjb(InjectionPoint ij)</literal> "
 "allows the resolution of <literal>@EJB</literal> (for injection into managed "
 "beans). This service is not required if the implementation of <xref linkend="
-"\"injection.services\"/> takes care of <literal>@EJB</literal> injection."
+"\"injection.services\" /> takes care of <literal>@EJB</literal> injection."
 msgstr ""
+"(Java EEリソースとしてのインジェクションの)Webサービスの参照の解決は、コンテ"
+"ナに委譲されます。あなたはこの操作を提供する<literal>WebServices</literal>の"
+"実装を提供する必要があります。Java EEリソースの解決のために、"
+"<literal>jndiName</literal>または<literal>mappedName</literal>が提供されるで"
+"しょう。"
 
 #. Tag: title
-#: ri-spi.xml:234
 #, no-c-format
 msgid "JPA services"
 msgstr "JPAサービス"
 
 #. Tag: para
-#: ri-spi.xml:236
 #, fuzzy, no-c-format
 msgid ""
 "Just as EJB resolution is delegated to the container, resolution of "
@@ -428,23 +392,25 @@
 "られた)永続ユニットの解決はコンテナに委譲されます。"
 
 #. Tag: para
-#: ri-spi.xml:242
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "To allow JPA integration, the <literal>JpaServices</literal> interface "
 "should be implemented. This service is not required if the implementation of "
-"<xref linkend=\"injection.services\"/> takes care of "
+"<xref linkend=\"injection.services\" /> takes care of "
 "<literal>@PersistenceContext</literal> injection."
 msgstr ""
+"(Java EEリソースとしてのインジェクションの)Webサービスの参照の解決は、コンテ"
+"ナに委譲されます。あなたはこの操作を提供する<literal>WebServices</literal>の"
+"実装を提供する必要があります。Java EEリソースの解決のために、"
+"<literal>jndiName</literal>または<literal>mappedName</literal>が提供されるで"
+"しょう。"
 
 #. Tag: title
-#: ri-spi.xml:251
 #, no-c-format
 msgid "Transaction Services"
 msgstr "トランザクションサービス"
 
 #. Tag: para
-#: ri-spi.xml:253
 #, fuzzy, no-c-format
 msgid ""
 "Weld delegates JTA activities to the container. The SPI provides a couple "
@@ -456,7 +422,6 @@
 "フックを提供します。"
 
 #. Tag: para
-#: ri-spi.xml:258
 #, no-c-format
 msgid ""
 "Any <literal>javax.transaction.Synchronization</literal> implementation may "
@@ -470,7 +435,6 @@
 "すぐに登録すべきです。"
 
 #. Tag: para
-#: ri-spi.xml:264
 #, no-c-format
 msgid ""
 "To make it easier to determine whether or not a transaction is currently "
@@ -484,20 +448,18 @@
 "きです。"
 
 #. Tag: title
-#: ri-spi.xml:272
 #, no-c-format
 msgid "Resource Services"
 msgstr "リソースサービス"
 
 #. Tag: para
-#: ri-spi.xml:274
 #, fuzzy, no-c-format
 msgid ""
 "The resolution of <literal>@Resource</literal> (for injection into managed "
 "beans) is delegated to the container. You must provide an implementation of "
 "<literal>ResourceServices</literal> which provides these operations. This "
 "service is not required if the implementation of <xref linkend=\"injection."
-"services\"/> takes care of <literal>@Resource</literal> injection."
+"services\" /> takes care of <literal>@Resource</literal> injection."
 msgstr ""
 "(Java EEリソースとしてのインジェクションの)Webサービスの参照の解決は、コンテ"
 "ナに委譲されます。あなたはこの操作を提供する<literal>WebServices</literal>の"
@@ -506,13 +468,11 @@
 "しょう。"
 
 #. Tag: title
-#: ri-spi.xml:283
 #, fuzzy, no-c-format
 msgid "Injection Services"
 msgstr "トランザクションサービス"
 
 #. Tag: para
-#: ri-spi.xml:285
 #, no-c-format
 msgid ""
 "An integrator may wish to use <literal>InjectionServices</literal> to "
@@ -523,7 +483,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:291
 #, no-c-format
 msgid ""
 "<literal>InjectionServices</literal> provides a very simple contract, the "
@@ -534,7 +493,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:298
 #, no-c-format
 msgid ""
 "The <literal>InjectionContext</literal> can be used to discover additional "
@@ -545,13 +503,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:307
 #, fuzzy, no-c-format
 msgid "Security Services"
 msgstr "リソースサービス"
 
 #. Tag: para
-#: ri-spi.xml:309
 #, no-c-format
 msgid ""
 "In order to obtain the <literal>Principal</literal> representing the current "
@@ -560,13 +516,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:317
 #, fuzzy, no-c-format
 msgid "Bean Validation Services"
 msgstr "トランザクションサービス"
 
 #. Tag: para
-#: ri-spi.xml:319
 #, no-c-format
 msgid ""
 "In order to obtain the default <literal>ValidatorFactory</literal> for the "
@@ -575,13 +529,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:327
 #, no-c-format
 msgid "Identifying the BDA being addressed"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:329
 #, no-c-format
 msgid ""
 "When a client makes a request to an application which uses Weld, the request "
@@ -592,43 +544,39 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:337
 #, no-c-format
 msgid ""
-"Most Servlet contains use a classloader-per-WAR, this may provide a good way "
+"Most Servlet contains use a classloader-per-war, this may provide a good way "
 "to identify the BDA in use for web requests."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:343
 #, no-c-format
 msgid ""
 "When Weld needs to identify the BDA, it will use one of these services, "
 "depending on what is servicing the request:"
 msgstr ""
 
-#. Tag: literal
-#: ri-spi.xml:350
+#. Tag: term
 #, no-c-format
-msgid "ServletServices.getBeanDeploymentArchive(ServletContext ctx)"
+msgid ""
+"<literal>ServletServices.getBeanDeploymentArchive(ServletContext ctx)</"
+"literal>"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:352
 #, no-c-format
 msgid ""
-"Identify the WAR in use. The <literal>ServletContext</literal> is provided "
+"Identify the war in use. The <literal>ServletContext</literal> is provided "
 "for additional context."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:362
 #, no-c-format
 msgid "The bean store"
 msgstr "Beanストア"
 
 #. Tag: para
-#: ri-spi.xml:364
 #, fuzzy, no-c-format
 msgid ""
 "Weld uses a map like structure to store bean instances - <literal>org.jboss."
@@ -641,13 +589,11 @@
 "literal>が役に立つことがわかるでしょう。"
 
 #. Tag: title
-#: ri-spi.xml:372
 #, no-c-format
 msgid "The application context"
 msgstr "アプリケーションコンテキスト"
 
 #. Tag: para
-#: ri-spi.xml:374
 #, fuzzy, no-c-format
 msgid ""
 "Weld expects the Application Server or other container to provide the "
@@ -661,13 +607,11 @@
 "域を提供するように実装される必要があります。"
 
 #. Tag: title
-#: ri-spi.xml:383
 #, fuzzy, no-c-format
 msgid "Initialization and shutdown"
 msgstr "ブートストラップとシャットダウン"
 
 #. Tag: para
-#: ri-spi.xml:384
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>org.jboss.weld.bootstrap.api.Bootstrap</literal> interface "
@@ -683,7 +627,6 @@
 "動を要求する必要があります。"
 
 #. Tag: para
-#: ri-spi.xml:391
 #, fuzzy, no-c-format
 msgid ""
 "The bootstrap is split into phases, container initialization, bean "
@@ -699,7 +642,6 @@
 "すべてのBeansの妥当性確認を行います。"
 
 #. Tag: para
-#: ri-spi.xml:398
 #, fuzzy, no-c-format
 msgid ""
 "To initialize the container, you call <literal>Bootstrap.startInitialization"
@@ -716,7 +658,6 @@
 "す。また、アプリケーションコンテキストのBeanストアを提供する必要があります。"
 
 #. Tag: para
-#: ri-spi.xml:405
 #, fuzzy, no-c-format
 msgid ""
 "Having called <literal>startInitialization()</literal>, the "
@@ -727,7 +668,6 @@
 "<literal>Bootstrap.getManager()</literal>を呼ぶことで得ることができます。"
 
 #. Tag: para
-#: ri-spi.xml:410
 #, fuzzy, no-c-format
 msgid ""
 "To deploy the discovered beans, call <literal>Bootstrap.deployBeans()</"
@@ -736,7 +676,6 @@
 "コンテナをブートするためには<literal>Bootstrap.boot()</literal>を呼びます。"
 
 #. Tag: para
-#: ri-spi.xml:414
 #, fuzzy, no-c-format
 msgid ""
 "To validate the deployed beans, call <literal>Bootstrap.validateBeans()</"
@@ -745,7 +684,6 @@
 "コンテナをブートするためには<literal>Bootstrap.boot()</literal>を呼びます。"
 
 #. Tag: para
-#: ri-spi.xml:418
 #, fuzzy, no-c-format
 msgid ""
 "To place the container into a state where it can service requests, call "
@@ -754,7 +692,6 @@
 "コンテナをブートするためには<literal>Bootstrap.boot()</literal>を呼びます。"
 
 #. Tag: para
-#: ri-spi.xml:423
 #, fuzzy, no-c-format
 msgid ""
 "To shutdown the container you call <literal>Bootstrap.shutdown()</literal>. "
@@ -765,13 +702,11 @@
 "ナは必要なクリーンアップ操作を実行できます。"
 
 #. Tag: title
-#: ri-spi.xml:431
 #, no-c-format
 msgid "Resource loading"
 msgstr "リソースのロード"
 
 #. Tag: para
-#: ri-spi.xml:433
 #, fuzzy, no-c-format
 msgid ""
 "Weld needs to load classes and resources from the classpath at various "
@@ -788,13 +723,11 @@
 "ます。"
 
 #. Tag: title
-#: ri-spi.xml:445
 #, no-c-format
 msgid "The contract with the container"
 msgstr "コンテナとの契約"
 
 #. Tag: para
-#: ri-spi.xml:447
 #, fuzzy, no-c-format
 msgid ""
 "There are a number of requirements that Weld places on the container for "
@@ -804,13 +737,11 @@
 "置するにあたって多くの要件があります。"
 
 #. Tag: term
-#: ri-spi.xml:454
 #, no-c-format
 msgid "Classloader isolation"
 msgstr "クラスローダの分離"
 
 #. Tag: para
-#: ri-spi.xml:458
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into an environment that supports deployment of "
@@ -822,13 +753,11 @@
 "はユーザによる設定によって有効とする必要があります。"
 
 #. Tag: term
-#: ri-spi.xml:466
 #, no-c-format
 msgid "Servlet"
 msgstr "サーブレット"
 
 #. Tag: para
-#: ri-spi.xml:470
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a Servlet environment you must register "
@@ -842,7 +771,6 @@
 "る各Web Beansアプリケーションで必要です。"
 
 #. Tag: para
-#: ri-spi.xml:475
 #, no-c-format
 msgid ""
 "You must ensure that that <literal>WeldListener.contextInitialized()</"
@@ -851,13 +779,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:482
 #, no-c-format
-msgid "<term>JSF</term>"
-msgstr "<term>JSF</term>"
+msgid "JSF"
+msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:487
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -869,7 +795,6 @@
 "る各Web Beansアプリケーションで必要です。"
 
 #. Tag: para
-#: ri-spi.xml:492
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -882,7 +807,6 @@
 "る各Web Beansアプリケーションで必要です。"
 
 #. Tag: para
-#: ri-spi.xml:497
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -895,7 +819,6 @@
 "る各Web Beansアプリケーションで必要です。"
 
 #. Tag: para
-#: ri-spi.xml:502
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -907,7 +830,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:509
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -917,7 +839,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:516 ri-spi.xml:562
 #, no-c-format
 msgid ""
 "There are a number of ways you can obtain the bean manager for the module. "
@@ -927,7 +848,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:523
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -943,19 +863,16 @@
 "このフィルタは安全に登録できます。"
 
 #. Tag: para
-#: ri-spi.xml:531
 #, fuzzy, no-c-format
 msgid "Weld only supports JSF 1.2 and above."
 msgstr "Web BeansはJSF 1.2以上をサポートしています。"
 
 #. Tag: term
-#: ri-spi.xml:538
-#, fuzzy, no-c-format
-msgid "<term>JSP</term>"
-msgstr "<term>JSF</term>"
+#, no-c-format
+msgid "JSP"
+msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:543
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must register "
@@ -968,7 +885,6 @@
 "る各Web Beansアプリケーションで必要です。"
 
 #. Tag: para
-#: ri-spi.xml:548
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -979,7 +895,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:555
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -989,20 +904,20 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:572
 #, no-c-format
 msgid "Session Bean Interceptor"
 msgstr "セッションBeanインタセプタ"
 
 #. Tag: para
-#: ri-spi.xml:576
 #, fuzzy, no-c-format
 msgid ""
-"If you are integrating Weld into an EJB environment you must register "
-"<literal>org.jboss.weld.ejb.SessionBeanInterceptor</literal> as a EJB "
-"interceptor for all EJBs in the application, either automatically, or "
-"through user configuration, for each CDI application which uses enterprise "
-"beans."
+"If you are integrating Weld into an EJB environment you must register the "
+"<literal>aroundInvoke</literal> method of <literal>org.jboss.weld.ejb."
+"SessionBeanInterceptor</literal> as a EJB around-invoke interceptor for all "
+"EJBs in the application, either automatically, or through user "
+"configuration, for each CDI application which uses enterprise beans. If you "
+"are running in a EJB 3.1 environment, you should register this as an around-"
+"timeout interceptor as well."
 msgstr ""
 "Web BeansをEJB環境と統合しているなら、自動的またはユーザ設定によって、アプリ"
 "ケーション中のすべてのEJBに対して<literal>org.jboss.webbeans.ejb."
@@ -1011,7 +926,6 @@
 "要です。"
 
 #. Tag: para
-#: ri-spi.xml:583
 #, no-c-format
 msgid ""
 "You must register the <literal>SessionBeanInterceptor</literal> as the inner "
@@ -1021,13 +935,11 @@
 "クの中で最も内側に登録する必要があります。"
 
 #. Tag: term
-#: ri-spi.xml:591
 #, fuzzy, no-c-format
 msgid "The <literal>weld-core.jar</literal>"
 msgstr "<literal>webbeans-core.jar</literal>"
 
 #. Tag: para
-#: ri-spi.xml:595
 #, no-c-format
 msgid ""
 "Weld can reside on an isolated classloader, or on a shared classloader. If "
@@ -1039,7 +951,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:601
 #, no-c-format
 msgid ""
 "You can provide your own implementation of <literal>Singleton</literal> and "
@@ -1048,7 +959,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:606
 #, no-c-format
 msgid ""
 "Weld also provides an implementation of Thread Context Classloader per "
@@ -1056,13 +966,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:613
 #, no-c-format
 msgid "Binding the manager in JNDI"
 msgstr "JNDIにマネージャをバインドする"
 
 #. Tag: para
-#: ri-spi.xml:617
 #, fuzzy, no-c-format
 msgid ""
 "You should bind the bean manager for the bean deployment archive into JNDI "
@@ -1078,13 +986,11 @@
 "ばなりません。"
 
 #. Tag: term
-#: ri-spi.xml:627
 #, no-c-format
 msgid "Performing CDI injection on Java EE component classes"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:631
 #, no-c-format
 msgid ""
 "The CDI specification requires the container to provide injection into non-"
@@ -1096,7 +1002,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:639
 #, no-c-format
 msgid ""
 "The CDI specification also requires that a <literal>ProcessInjectionTarget</"
@@ -1107,7 +1012,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:646
 #, no-c-format
 msgid ""
 "To help the integrator, Weld provides <literal>WeldManager."
@@ -1115,36 +1019,7 @@
 "<literal>InjectionTarget</literal> to use."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:651
-#, no-c-format
-msgid ""
-"<![CDATA[// Fire ProcessInjectionTarget, returning the InjectionTarget\n"
-"// to use\n"
-"InjectionTarget it = weldBeanManager.fireProcessInjectionTarget(clazz);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = beanManager.createCreationalContext(null);\n"
-"\n"
-"// Produce the instance, performing any constructor injection required\n"
-"Object instance = it.produce();\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
-
 #. Tag: para
-#: ri-spi.xml:652
 #, no-c-format
 msgid ""
 "The container may intersperse other operations between these calls. Further, "
@@ -1153,7 +1028,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:656
 #, no-c-format
 msgid ""
 "When performing injections on EJBs you must use the Weld-defined SPI, "
@@ -1162,42 +1036,13 @@
 "EJB."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:661
-#, no-c-format
-msgid ""
-"<![CDATA[// Obtain the EjbDescriptor for the EJB\n"
-"// You may choose to use this utility method to get the descriptor\n"
-"EjbDescriptor<?> ejbDescriptor = beanManager.getEjbDescriptor(ejbName);\n"
-"\n"
-"// Get an the Bean object\n"
-"Bean<?> bean = beanManager.getBean(ejbDescriptor);\n"
-"\n"
-"// Create the injection target\n"
-"InjectionTarget it = deploymentBeanManager.createInjectionTarget"
-"(ejbDescriptor);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = deploymentBeanManager.createCreationalContext"
-"(bean);\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// You may choose to have CDI call the post construct and pre destroy\n"
-"// lifecycle callbacks\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
+#~ msgid "<term>JSF</term>"
+#~ msgstr "<term>JSF</term>"
 
+#, fuzzy
+#~ msgid "<term>JSP</term>"
+#~ msgstr "<term>JSF</term>"
+
 #~ msgid ""
 #~ "Currently Web Beans only runs in JBoss AS 5; integrating the RI into "
 #~ "other EE environments (for example another application server like "

Modified: doc/trunk/reference/ja-JP/scopescontexts.po
===================================================================
--- doc/trunk/reference/ja-JP/scopescontexts.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/scopescontexts.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-06-04 00:47+0900\n"
 "Last-Translator: Daisuke Sano <d-sano at nri.co.jp>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: scopescontexts.xml:5
 #, no-c-format
 msgid "Scopes and contexts"
 msgstr "スコープとコンテキスト"
 
 #. Tag: para
-#: scopescontexts.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "So far, we've seen a few examples of <emphasis>scope type annotations</"
@@ -35,26 +33,22 @@
 "す。"
 
 #. Tag: para
-#: scopescontexts.xml:16
 #, fuzzy, no-c-format
 msgid "When a new instance of any bean with that scope is created"
 msgstr "そのスコープを持ったWeb Beanインスタンスがいつ生成されるか"
 
 #. Tag: para
-#: scopescontexts.xml:19
 #, fuzzy, no-c-format
 msgid "When an existing instance of any bean with that scope is destroyed"
 msgstr "そのスコープを持ったWeb Beanインスタンスがいつ破棄されるか"
 
 #. Tag: para
-#: scopescontexts.xml:22
 #, fuzzy, no-c-format
 msgid ""
 "Which injected references refer to any instance of a bean with that scope"
 msgstr "注入された参照が、そのスコープを持ったどのWeb Beanインスタンスを指すか"
 
 #. Tag: para
-#: scopescontexts.xml:27
 #, fuzzy, no-c-format
 msgid ""
 "For example, if we have a session-scoped bean, <literal>CurrentUser</"
@@ -72,7 +66,6 @@
 "破棄されます。"
 
 #. Tag: para
-#: scopescontexts.xml:35
 #, no-c-format
 msgid ""
 "JPA entities aren't a great fit for this model. Entities have their whole "
@@ -85,13 +78,11 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:45
 #, no-c-format
 msgid "Scope types"
 msgstr "スコープタイプ"
 
 #. Tag: para
-#: scopescontexts.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "CDI features an <emphasis>extensible context model</emphasis>. It's possible "
@@ -101,22 +92,7 @@
 "おり、新たなスコープタイプアノテーションを作成することによって、新たなスコー"
 "プを定義することが可能になっています。"
 
-#. Tag: programlisting
-#: scopescontexts.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ScopeType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"public @interface ClusterScoped {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"@ScopeType\n"
-"public @interface ClusterScoped {}]]>"
-
 #. Tag: para
-#: scopescontexts.xml:54
 #, fuzzy, no-c-format
 msgid ""
 "Of course, that's the easy part of the job. For this scope type to be "
@@ -132,7 +108,6 @@
 "作業であり、フレームワークを開発する目的でのみ行われます。"
 
 #. Tag: para
-#: scopescontexts.xml:61
 #, fuzzy, no-c-format
 msgid ""
 "We can apply a scope type annotation to a bean implementation class to "
@@ -141,66 +116,47 @@
 "Web Beanのスコープを指定するために、Web Beanの実装クラスにスコープタイプアノ"
 "テーションを適用することができます。"
 
-#. Tag: programlisting
-#: scopescontexts.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-msgstr ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:67
 #, fuzzy, no-c-format
 msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr "通常、Web Beansの組み込みスコープの中の一つを使います。"
 
 #. Tag: title
-#: scopescontexts.xml:72
 #, no-c-format
 msgid "Built-in scopes"
 msgstr "組み込みスコープ"
 
 #. Tag: para
-#: scopescontexts.xml:74
 #, fuzzy, no-c-format
 msgid "CDI defines four built-in scopes:"
 msgstr "Web Beansは四つの組み込みスコープを持ちます。"
 
-#. Tag: literal
-#: scopescontexts.xml:78
-#, no-c-format
-msgid "@RequestScoped"
-msgstr "@RequestScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@RequestScoped</literal>"
+msgstr "<literal>@New</literal>アノテーション"
 
-#. Tag: literal
-#: scopescontexts.xml:81
-#, no-c-format
-msgid "@SessionScoped"
-msgstr "@SessionScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@SessionScoped</literal>"
+msgstr "<literal>@New</literal>アノテーション"
 
-#. Tag: literal
-#: scopescontexts.xml:84
-#, no-c-format
-msgid "@ApplicationScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@ApplicationScoped</literal>"
 msgstr "@ApplicationScoped"
 
-#. Tag: literal
-#: scopescontexts.xml:87
-#, no-c-format
-msgid "@ConversationScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@ConversationScoped</literal>"
 msgstr "@ConversationScoped"
 
 #. Tag: para
-#: scopescontexts.xml:91
 #, fuzzy, no-c-format
 msgid "For a web application that uses CDI:"
 msgstr "Web Beansを使用するWebアプリケーションでは、"
 
 #. Tag: para
-#: scopescontexts.xml:95
 #, no-c-format
 msgid ""
 "any servlet request has access to active request, session and application "
@@ -210,13 +166,11 @@
 "コープ、アプリケーションスコープにアクセスし、さらに、"
 
 #. Tag: para
-#: scopescontexts.xml:100
 #, no-c-format
 msgid "any JSF request has access to an active conversation scope."
 msgstr "すべてのJSFリクエストはアクティブな対話スコープにアクセスします。"
 
 #. Tag: para
-#: scopescontexts.xml:105
 #, no-c-format
 msgid ""
 "A CDI extension can implement support for the conversation scope in other "
@@ -224,7 +178,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:108
 #, no-c-format
 msgid "The request and application scopes are also active:"
 msgstr ""
@@ -232,43 +185,36 @@
 "ブとなります。"
 
 #. Tag: para
-#: scopescontexts.xml:112
 #, no-c-format
 msgid "during invocations of EJB remote methods,"
 msgstr "EJBのリモートメソッドが起動する際"
 
 #. Tag: para
-#: scopescontexts.xml:115
 #, fuzzy, no-c-format
 msgid "during invocations of EJB asynchronous methods,"
 msgstr "EJBのリモートメソッドが起動する際"
 
 #. Tag: para
-#: scopescontexts.xml:118
 #, no-c-format
 msgid "during EJB timeouts,"
 msgstr "EJBがタイムアウトになる際"
 
 #. Tag: para
-#: scopescontexts.xml:121
 #, fuzzy, no-c-format
 msgid "during message delivery to a message-driven bean,"
 msgstr "メッセージドリブンビーンにメッセージが到着する際"
 
 #. Tag: para
-#: scopescontexts.xml:124
 #, fuzzy, no-c-format
 msgid "during message delivery to a <literal>MessageListener</literal>, and"
 msgstr "メッセージドリブンビーンにメッセージが到着する際"
 
 #. Tag: para
-#: scopescontexts.xml:127
 #, no-c-format
 msgid "during web service invocations."
 msgstr "Webサービスが起動する際"
 
 #. Tag: para
-#: scopescontexts.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "If the application tries to invoke a bean with a scope that does not have an "
@@ -280,7 +226,6 @@
 "<literal>ContextNotActiveException</literal>を送出します。"
 
 #. Tag: para
-#: scopescontexts.xml:136
 #, no-c-format
 msgid ""
 "Managed beans with scope <literal>@SessionScoped</literal> or "
@@ -289,7 +234,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:141
 #, no-c-format
 msgid ""
 "Three of the four built-in scopes should be extremely familiar to every Java "
@@ -301,13 +245,11 @@
 "ら、残りの一つは新たなスコープです。"
 
 #. Tag: title
-#: scopescontexts.xml:149
 #, no-c-format
 msgid "The conversation scope"
 msgstr "対話スコープ"
 
 #. Tag: para
-#: scopescontexts.xml:151
 #, fuzzy, no-c-format
 msgid ""
 "The conversation scope is a bit like the traditional session scope in that "
@@ -321,13 +263,11 @@
 "コープとは異なります。"
 
 #. Tag: para
-#: scopescontexts.xml:159
 #, no-c-format
 msgid "is demarcated explicitly by the application, and"
 msgstr "対話スコープの境界は、アプリケーションによって明示的に定義されます"
 
 #. Tag: para
-#: scopescontexts.xml:162
 #, no-c-format
 msgid ""
 "holds state associated with a particular web browser tab in a JSF "
@@ -336,20 +276,18 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:169
 #, fuzzy, no-c-format
 msgid ""
-"A conversation represents a task&#8212;a unit of work from the point of view "
-"of the user. The conversation context holds state associated with what the "
-"user is currently working on. If the user is doing multiple things at the "
-"same time, there are multiple conversations."
+"A conversation represents a task—a unit of work from the point of view of "
+"the user. The conversation context holds state associated with what the user "
+"is currently working on. If the user is doing multiple things at the same "
+"time, there are multiple conversations."
 msgstr ""
 "一つの対話は、一つのタスク、ユーザー視点での作業の単位を表現します。対話コン"
 "テキストは、ユーザーが今行っている作業に関連する状態を保持します。もし、ユー"
 "ザーが複数の作業を同時に行っている場合は、対話も複数になります。"
 
 #. Tag: para
-#: scopescontexts.xml:175
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context is active during any JSF request. Most "
@@ -363,13 +301,11 @@
 "対話</emphasis>として導入する必要があります。"
 
 #. Tag: title
-#: scopescontexts.xml:182
 #, no-c-format
 msgid "Conversation demarcation"
 msgstr "対話の境界"
 
 #. Tag: para
-#: scopescontexts.xml:184
 #, fuzzy, no-c-format
 msgid ""
 "CDI provides a built-in bean for controlling the lifecycle of conversations "
@@ -379,14 +315,7 @@
 "組み込みWeb Beanを提供します。このWeb Beanは、注入によって取得することができ"
 "ます。"
 
-#. Tag: programlisting
-#: scopescontexts.xml:189
-#, fuzzy, no-c-format
-msgid "@Inject Conversation conversation;"
-msgstr "@Current Conversation conversation;"
-
 #. Tag: para
-#: scopescontexts.xml:191
 #, no-c-format
 msgid ""
 "To promote the conversation associated with the current request to a long-"
@@ -401,7 +330,6 @@
 "<literal>end()</literal>メソッドを呼びます。"
 
 #. Tag: para
-#: scopescontexts.xml:197
 #, fuzzy, no-c-format
 msgid ""
 "In the following example, a conversation-scoped bean controls the "
@@ -410,72 +338,7 @@
 "次の例では、対話スコープをもつWeb Beanが、自分自身に関連した対話を制御しま"
 "す。"
 
-#. Tag: programlisting
-#: scopescontexts.xml:201
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"   private Order order;\n"
-"   private @Inject Conversation conversation;\n"
-"   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
-"   \n"
-"   @Produces public Order getOrder() {\n"
-"      return order;\n"
-"   }\n"
-"\n"
-"   public Order createOrder() {\n"
-"      order = new Order();\n"
-"      conversation.begin();\n"
-"      return order;\n"
-"   }\n"
-"   \n"
-"   public void addLineItem(Product product, int quantity) {\n"
-"      order.add(new LineItem(product, quantity));\n"
-"   }\n"
-"\n"
-"   public void saveOrder(Order order) {\n"
-"      em.persist(order);\n"
-"      conversation.end();\n"
-"   }\n"
-"   \n"
-"   @Remove\n"
-"   public void destroy() {}\n"
-"}]]>"
-msgstr ""
-"@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"\n"
-"    private Order order;\n"
-"    private @Current Conversation conversation;\n"
-"    private @PersistenceContext(type=EXTENDED) EntityManager em;\n"
-"    \n"
-"    @Produces public Order getOrder() {\n"
-"        return order;\n"
-"    }\n"
-"\n"
-"    public Order createOrder() {\n"
-"        order = new Order();\n"
-"        conversation.begin();\n"
-"        return order;\n"
-"    }\n"
-"    \n"
-"    public void addLineItem(Product product, int quantity) {\n"
-"        order.add( new LineItem(product, quantity) );\n"
-"    }\n"
-"\n"
-"    public void saveOrder(Order order) {\n"
-"        em.persist(order);\n"
-"        conversation.end();\n"
-"    }\n"
-"    \n"
-"    @Remove\n"
-"    public void destroy() {}\n"
-"    \n"
-"}"
-
 #. Tag: para
-#: scopescontexts.xml:203
 #, fuzzy, no-c-format
 msgid ""
 "This bean is able to control its own lifecycle through use of the "
@@ -487,13 +350,11 @@
 "ジェクトに依存するようなWeb Beanも存在します。"
 
 #. Tag: title
-#: scopescontexts.xml:211
 #, no-c-format
 msgid "Conversation propagation"
 msgstr "対話の伝播"
 
 #. Tag: para
-#: scopescontexts.xml:213
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context automatically propagates with any JSF faces request "
@@ -505,7 +366,6 @@
 "クエストについては自動的に伝播されません。"
 
 #. Tag: para
-#: scopescontexts.xml:218
 #, fuzzy, no-c-format
 msgid ""
 "We can force the conversation to propagate with a non-faces request by "
@@ -523,38 +383,16 @@
 "す。"
 
 #. Tag: para
-#: scopescontexts.xml:225
 #, no-c-format
 msgid "Therefore, the following link propagates the conversation:"
 msgstr "ゆえに、次のリンクは対話を伝播します。"
 
-#. Tag: programlisting
-#: scopescontexts.xml:229
-#, no-c-format
-msgid ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-msgstr ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-
 #. Tag: para
-#: scopescontexts.xml:231
 #, no-c-format
 msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:235
-#, no-c-format
-msgid ""
-"<![CDATA[<h:link outcome=\"/addProduct.xhtml value=\"Add Product\">\n"
-"   <f:param name=\"cid\" value=\"#{conversation.id}\"/>\n"
-"</h:link>]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:238
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context propagates across redirects, making it very easy to "
@@ -570,21 +408,19 @@
 "タを付加します。"
 
 #. Tag: title
-#: scopescontexts.xml:248
 #, no-c-format
 msgid "Conversation timeout"
 msgstr "対話のタイムアウト"
 
 #. Tag: para
-#: scopescontexts.xml:250
 #, fuzzy, no-c-format
 msgid ""
 "The container is permitted to destroy a conversation and all state held in "
 "its context at any time in order to conserve resources. A CDI implementation "
-"will normally do this on the basis of some kind of timeout&#8212;though this "
-"is not required by the specification. The timeout is the period of "
-"inactivity before the conversation is destroyed (as opposed to the amount of "
-"time the conversation is active)."
+"will normally do this on the basis of some kind of timeout—though this is "
+"not required by the specification. The timeout is the period of inactivity "
+"before the conversation is destroyed (as opposed to the amount of time the "
+"conversation is active)."
 msgstr ""
 "Web Beanマネージャは、対話とそこに保持されたすべての状態を、リソースを保つ目"
 "的で破棄することを許されています。Web Beansの仕様で必須というわけではありませ"
@@ -593,7 +429,6 @@
 "期間となります。"
 
 #. Tag: para
-#: scopescontexts.xml:257
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Conversation</literal> object provides a method to set the "
@@ -604,20 +439,12 @@
 "ソッドを提供します。これはWeb Beanマネージャへのヒントにはなりますが、Web "
 "Beanマネージャはこれを自由に無視することもできます。"
 
-#. Tag: programlisting
-#: scopescontexts.xml:262
-#, no-c-format
-msgid "conversation.setTimeout(timeoutInMillis);"
-msgstr "conversation.setTimeout(timeoutInMillis);"
-
 #. Tag: title
-#: scopescontexts.xml:269
 #, fuzzy, no-c-format
 msgid "The singleton pseudo-scope"
 msgstr "依存擬似スコープ"
 
 #. Tag: para
-#: scopescontexts.xml:271
 #, fuzzy, no-c-format
 msgid ""
 "In addition to the four built-in scopes, CDI also supports two "
@@ -630,7 +457,6 @@
 "ていないWeb Beanのデフォルトのスコープになります。"
 
 #. Tag: para
-#: scopescontexts.xml:277
 #, no-c-format
 msgid ""
 "Unlike the other scopes, which belong to the package <literal>javax."
@@ -639,7 +465,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:283
 #, no-c-format
 msgid ""
 "You can guess what \"singleton\" means here. It means a bean that is "
@@ -654,7 +479,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:292
 #, no-c-format
 msgid ""
 "Now, if the singleton instance is a simple, immutable, serializable object "
@@ -665,7 +489,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:298
 #, no-c-format
 msgid ""
 "There are several ways to ensure that the singleton bean remains a singleton "
@@ -673,7 +496,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:302
 #, no-c-format
 msgid ""
 "have the singleton bean implement <literal>writeResolve()</literal> and "
@@ -682,7 +504,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:308
 #, no-c-format
 msgid ""
 "make sure the client keeps only a transient reference to the singleton bean, "
@@ -690,7 +511,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:313
 #, no-c-format
 msgid ""
 "give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
@@ -698,7 +518,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:320
 #, no-c-format
 msgid ""
 "A fourth, better solution is to instead use <literal>@ApplicationScoped</"
@@ -707,13 +526,11 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:326
 #, no-c-format
 msgid "The dependent pseudo-scope"
 msgstr "依存擬似スコープ"
 
 #. Tag: para
-#: scopescontexts.xml:328
 #, fuzzy, no-c-format
 msgid ""
 "Finally, CDI features the so-called <emphasis>dependent pseudo-scope</"
@@ -725,21 +542,13 @@
 "ていないWeb Beanのデフォルトのスコープになります。"
 
 #. Tag: para
-#: scopescontexts.xml:333
 #, fuzzy, no-c-format
 msgid ""
 "For example, this bean has the scope type <literal>@Dependent</literal>:"
 msgstr ""
 "例えば、次のWeb Beanは<literal>@Dependent</literal>スコープタイプを持ちます。"
 
-#. Tag: programlisting
-#: scopescontexts.xml:337
-#, no-c-format
-msgid "<![CDATA[public class Calculator { ... }]]>"
-msgstr "<![CDATA[public class Calculator { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:339
 #, no-c-format
 msgid ""
 "An instance of a dependent bean is never shared between different clients or "
@@ -750,7 +559,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:345
 #, no-c-format
 msgid ""
 "If a Unified EL expression refers to a dependent bean by EL name, an "
@@ -759,7 +567,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:351
 #, no-c-format
 msgid ""
 "If you need to access a bean directly by EL name in a JSF page, you probably "
@@ -774,7 +581,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:361
 #, no-c-format
 msgid ""
 "Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
@@ -782,7 +588,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:366
 #, fuzzy, no-c-format
 msgid ""
 "CDI makes it easy to obtain a dependent instance of a bean, even if the bean "
@@ -793,27 +598,18 @@
 "す。"
 
 #. Tag: title
-#: scopescontexts.xml:374
 #, fuzzy, no-c-format
 msgid "The <literal>@New</literal> qualifier"
 msgstr "<literal>@New</literal>アノテーション"
 
 #. Tag: para
-#: scopescontexts.xml:376
 #, no-c-format
 msgid ""
 "The built-in qualifier <literal>@New</literal> allows us to obtain a "
 "dependent object of a specified class."
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:380
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
-msgstr "<![CDATA[@New Calculator calculator;]]>"
-
 #. Tag: para
-#: scopescontexts.xml:382
 #, no-c-format
 msgid ""
 "The class must be a valid managed bean or session bean, but need not be an "
@@ -821,7 +617,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:384
 #, fuzzy, no-c-format
 msgid ""
 "This works even if <literal>Calculator</literal> is <emphasis>already</"
@@ -830,18 +625,7 @@
 "これは、<literal>Calculator</literal>が、次の例のように<emphasis>既に</"
 "emphasis>異なるスコープタイプを持って宣言されていた場合でも有効となります。"
 
-#. Tag: programlisting
-#: scopescontexts.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-msgstr ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:391
 #, no-c-format
 msgid ""
 "So the following injected attributes each get a different instance of "
@@ -850,24 +634,7 @@
 "よって、次の注入された属性は、お互いに異なる<literal>Calculator</literal>のイ"
 "ンスタンスを得ることとなります。"
 
-#. Tag: programlisting
-#: scopescontexts.xml:395
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class PaymentCalc {\n"
-"   @Inject Calculator calculator;\n"
-"   @Inject @New Calculator newCalculator;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class PaymentCalc {\n"
-"\n"
-"    @Current Calculator calculator;\n"
-"    @New Calculator newCalculator;\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: scopescontexts.xml:397
 #, no-c-format
 msgid ""
 "The <literal>calculator</literal> field has a conversation-scoped instance "
@@ -882,7 +649,6 @@
 "され、注入されます。"
 
 #. Tag: para
-#: scopescontexts.xml:403
 #, no-c-format
 msgid ""
 "This feature is particularly useful with producer methods, as we'll see in "
@@ -890,7 +656,136 @@
 msgstr ""
 "この機能は、特に次章で説明するプロデューサメソッドにおいて効果を発揮します。"
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@ScopeType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD})\n"
+#~ "public @interface ClusterScoped {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD})\n"
+#~ "@ScopeType\n"
+#~ "public @interface ClusterScoped {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ClusterScoped\n"
+#~ "public class SecondLevelCache { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ClusterScoped\n"
+#~ "public class SecondLevelCache { ... }]]>"
+
+#~ msgid "@RequestScoped"
+#~ msgstr "@RequestScoped"
+
+#~ msgid "@SessionScoped"
+#~ msgstr "@SessionScoped"
+
+#, fuzzy
+#~ msgid "@Inject Conversation conversation;"
+#~ msgstr "@Current Conversation conversation;"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ConversationScoped @Stateful\n"
+#~ "public class OrderBuilder {\n"
+#~ "   private Order order;\n"
+#~ "   private @Inject Conversation conversation;\n"
+#~ "   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
+#~ "   \n"
+#~ "   @Produces public Order getOrder() {\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public Order createOrder() {\n"
+#~ "      order = new Order();\n"
+#~ "      conversation.begin();\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void addLineItem(Product product, int quantity) {\n"
+#~ "      order.add(new LineItem(product, quantity));\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public void saveOrder(Order order) {\n"
+#~ "      em.persist(order);\n"
+#~ "      conversation.end();\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Remove\n"
+#~ "   public void destroy() {}\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@ConversationScoped @Stateful\n"
+#~ "public class OrderBuilder {\n"
+#~ "\n"
+#~ "    private Order order;\n"
+#~ "    private @Current Conversation conversation;\n"
+#~ "    private @PersistenceContext(type=EXTENDED) EntityManager em;\n"
+#~ "    \n"
+#~ "    @Produces public Order getOrder() {\n"
+#~ "        return order;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "    public Order createOrder() {\n"
+#~ "        order = new Order();\n"
+#~ "        conversation.begin();\n"
+#~ "        return order;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void addLineItem(Product product, int quantity) {\n"
+#~ "        order.add( new LineItem(product, quantity) );\n"
+#~ "    }\n"
+#~ "\n"
+#~ "    public void saveOrder(Order order) {\n"
+#~ "        em.persist(order);\n"
+#~ "        conversation.end();\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    @Remove\n"
+#~ "    public void destroy() {}\n"
+#~ "    \n"
+#~ "}"
+
+#~ msgid ""
+#~ "<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</"
+#~ "a>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</"
+#~ "a>]]>"
+
+#~ msgid "conversation.setTimeout(timeoutInMillis);"
+#~ msgstr "conversation.setTimeout(timeoutInMillis);"
+
+#~ msgid "<![CDATA[public class Calculator { ... }]]>"
+#~ msgstr "<![CDATA[public class Calculator { ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
+#~ msgstr "<![CDATA[@New Calculator calculator;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ConversationScoped\n"
+#~ "public class Calculator { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ConversationScoped\n"
+#~ "public class Calculator { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class PaymentCalc {\n"
+#~ "   @Inject Calculator calculator;\n"
+#~ "   @Inject @New Calculator newCalculator;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class PaymentCalc {\n"
+#~ "\n"
+#~ "    @Current Calculator calculator;\n"
+#~ "    @New Calculator newCalculator;\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "holds state associated with a particular web browser tab in a JSF "
 #~ "application."
 #~ msgstr ""

Modified: doc/trunk/reference/ja-JP/specialization.po
===================================================================
--- doc/trunk/reference/ja-JP/specialization.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/specialization.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-06-09 19:23+0900\n"
 "Last-Translator: Keita Higashi <winnie_the_pooh at y3.dion.ne.jp>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: specialization.xml:5
 #, no-c-format
 msgid "Specialization, inheritance and alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:7
 #, no-c-format
 msgid ""
 "When you first start developing with CDI, you'll likely be dealing only with "
@@ -35,7 +33,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:16
 #, no-c-format
 msgid ""
 "The CDI specification recognizes two distinct scenarios in which one bean "
@@ -43,7 +40,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:23
 #, no-c-format
 msgid ""
 "The second bean <emphasis>specializes</emphasis> the first bean in certain "
@@ -52,7 +48,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:29
 #, no-c-format
 msgid ""
 "The second bean is simply reusing the Java implementation, and otherwise "
@@ -61,7 +56,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:37
 #, no-c-format
 msgid ""
 "The second case is the default assumed by CDI. It's possible to have two "
@@ -71,7 +65,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:43
 #, no-c-format
 msgid ""
 "The first case is the exception, and also requires more care. In any given "
@@ -83,13 +76,11 @@
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:51
 #, no-c-format
 msgid "Using alternative stereotypes"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:53
 #, fuzzy, no-c-format
 msgid ""
 "CDI lets you <emphasis>override</emphasis> the implementation of a bean type "
@@ -102,23 +93,7 @@
 "た。たとえば、以下のエンタープライズ Web Bean は、プロダクションにおいて API "
 "<literal>PaymentProcessor</literal> の実装を提供します。"
 
-#. Tag: programlisting
-#: specialization.xml:59
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DefaultPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless\n"
-"public class CreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:61
 #, fuzzy, no-c-format
 msgid ""
 "But in our staging environment, we don't really want to submit payments to "
@@ -128,46 +103,12 @@
 "しかし、ステージング環境で、異なる Web Bean で <literal>PaymentProcessor</"
 "literal> のその実装にオーバーライドします。"
 
-#. Tag: programlisting
-#: specialization.xml:66
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless\n"
-"public class CreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:68
 #, no-c-format
-msgid "<para>or</para>"
+msgid "or"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:70
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      extends DefaultPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@Stateless @Staging @Specializes\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        extends CreditCardPaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:72
 #, no-c-format
 msgid ""
 "We've already seen how we can enable this alternative by listing its class "
@@ -175,7 +116,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:77
 #, no-c-format
 msgid ""
 "But suppose we have many alternatives in the staging environment. It would "
@@ -185,67 +125,21 @@
 "this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:84
-#, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Staging {}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:86
 #, no-c-format
 msgid ""
 "Then we replace the <literal>@Alternative</literal> annotation on our bean "
 "with <literal>@Staging</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:90
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Staging\n"
-"public class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless @Staging\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:92
 #, no-c-format
 msgid ""
 "Finally, we activate the <literal>@Staging</literal> stereotype in the "
 "<literal>beans.xml</literal> descriptor:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:96
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <stereotype>org.mycompany.myapp.Staging</stereotype>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:98
 #, no-c-format
 msgid ""
 "Now, no matter how many staging beans we have, they will all be enabled at "
@@ -253,13 +147,11 @@
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:105
 #, no-c-format
 msgid "A minor problem with alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:107
 #, no-c-format
 msgid ""
 "When we enable an alternative, does that mean the default implementation is "
@@ -268,15 +160,7 @@
 "not, you could still inject the default implementation."
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:113
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @LargeTransaction PaymentProcessor paymentProcessor;]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:115
 #, no-c-format
 msgid ""
 "So we haven't completely replaced the default implementation in this "
@@ -289,7 +173,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "CDI provides a special feature, called <emphasis>specialization</emphasis>, "
@@ -303,13 +186,11 @@
 "性を提供する事に本当に感謝する事でしょう。"
 
 #. Tag: title
-#: specialization.xml:132
 #, no-c-format
 msgid "Using specialization"
 msgstr "特殊化を使用する"
 
 #. Tag: para
-#: specialization.xml:134
 #, no-c-format
 msgid ""
 "When the goal is to replace one bean implementation with a second, to help "
@@ -317,13 +198,11 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:141
 #, no-c-format
 msgid "directly extend the bean class of the second bean, or"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:146
 #, no-c-format
 msgid ""
 "directly override the producer method, in the case that the second bean is a "
@@ -331,7 +210,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:152
 #, fuzzy, no-c-format
 msgid ""
 "explicitly declare that it <emphasis>specializes</emphasis> the second bean:"
@@ -339,24 +217,7 @@
 "これは Web Bean がそのスーパークラスを <emphasis>特殊化</emphasis> すると言"
 "います。"
 
-#. Tag: programlisting
-#: specialization.xml:154
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Specializes\n"
-"public class MockCreditCardPaymentProcessor \n"
-"      extends CreditCardPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@Stateless @Staging @Specializes\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        extends CreditCardPaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:156
 #, no-c-format
 msgid ""
 "When an enabled bean specializes another bean, the other bean is never "
@@ -365,7 +226,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:161
 #, no-c-format
 msgid ""
 "So why does specialization work, and what does it have to do with "
@@ -373,7 +233,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:165
 #, no-c-format
 msgid ""
 "Since we're informing the container that our alternative bean is meant to "
@@ -385,7 +244,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:172
 #, no-c-format
 msgid ""
 "Furthermore, if the default implementation declares a bean EL name using "
@@ -393,6 +251,75 @@
 "alternative bean."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DefaultPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      extends DefaultPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Stateless @Staging @Specializes\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        extends CreditCardPaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Staging\n"
+#~ "public class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless @Staging\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative @Specializes\n"
+#~ "public class MockCreditCardPaymentProcessor \n"
+#~ "      extends CreditCardPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Stateless @Staging @Specializes\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        extends CreditCardPaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
 #~ msgid "Specialization"
 #~ msgstr "特殊化"
 

Modified: doc/trunk/reference/ja-JP/stereotypes.po
===================================================================
--- doc/trunk/reference/ja-JP/stereotypes.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/stereotypes.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-05-21 20:05+0900\n"
 "Last-Translator: Keita Higashi <winnie_the_pooh at y3.dion.ne.jp>\n"
 "Language-Team: none\n"
@@ -14,19 +14,16 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: stereotypes.xml:5
 #, no-c-format
 msgid "Stereotypes"
 msgstr "ステレオタイプ"
 
 #. Tag: para
-#: stereotypes.xml:7
 #, no-c-format
 msgid "The CDI specification defines a stereotype as follows:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:11
 #, fuzzy, no-c-format
 msgid ""
 "In many systems, use of architectural patterns produces a set of recurring "
@@ -40,31 +37,26 @@
 "タを宣言できるようにします。"
 
 #. Tag: para
-#: stereotypes.xml:17
 #, no-c-format
 msgid "A stereotype encapsulates any combination of:"
 msgstr "ステレオタイプは、以下のどんな組み合わせでもカプセル化します。"
 
 #. Tag: para
-#: stereotypes.xml:21
 #, fuzzy, no-c-format
 msgid "a default scope, and"
 msgstr "デフォルトスコープタイプ"
 
 #. Tag: para
-#: stereotypes.xml:24
 #, fuzzy, no-c-format
 msgid "a set of interceptor bindings."
 msgstr "一組のインタセプタバインディングアノテーション"
 
 #. Tag: para
-#: stereotypes.xml:28
 #, no-c-format
 msgid "A stereotype may also specify that:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:34
 #, fuzzy, no-c-format
 msgid "all beans with the stereotype have defaulted bean EL names, or that"
 msgstr ""
@@ -72,13 +64,11 @@
 "つようにステレオタイプを指定する事もありえます。"
 
 #. Tag: para
-#: stereotypes.xml:37
 #, no-c-format
 msgid "all beans with the stereotype are alternatives."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:41
 #, no-c-format
 msgid ""
 "A bean may declare zero, one or multiple stereotypes. Stereotype annotations "
@@ -86,7 +76,6 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype is an annotation, annotated <literal>@Stereotype</literal>, "
@@ -96,41 +85,14 @@
 "ステレオタイプは、Java アノテーションタイプです。このステレオタイプは、いくつ"
 "かの MVC フレームワークでアクションクラスを特定します。"
 
-#. Tag: programlisting
-#: stereotypes.xml:53
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"...\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:55
 #, fuzzy, no-c-format
 msgid "We use the stereotype by applying the annotation to a bean."
 msgstr ""
 "このアノテーションを Web Bean に適用することによって、ステレオタイプを使いま"
 "す。"
 
-#. Tag: programlisting
-#: stereotypes.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-
 #. Tag: para
-#: stereotypes.xml:61
 #, no-c-format
 msgid ""
 "Of course, we need to apply some other annotations to our stereotype or else "
@@ -138,13 +100,11 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:66
 #, fuzzy, no-c-format
 msgid "Default scope for a stereotype"
 msgstr "ステレオタイプのデフォルトスコープとデプロイメントタイプ"
 
 #. Tag: para
-#: stereotypes.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype may specify a default scope for beans annotated with the "
@@ -153,41 +113,14 @@
 "あるステレオタイプを持つすべての Web Beans が、デフォルトの Web Beans 名を持"
 "つようにステレオタイプを指定する事もありえます。"
 
-#. Tag: programlisting
-#: stereotypes.xml:72
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:74
 #, fuzzy, no-c-format
 msgid "A particular action may still override this default if necessary:"
 msgstr ""
 "もちろん、特定の動作は、必要に応じてこれらのデフォルトに今まで通りオーバーラ"
 "イドすることがありえます。"
 
-#. Tag: programlisting
-#: stereotypes.xml:78
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Dependent @Action \n"
-"public class DependentScopedLoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Dependent @Mock @Action \n"
-"public class MockLoginAction { ... }]]>"
-
 #. Tag: para
-#: stereotypes.xml:80
 #, no-c-format
 msgid ""
 "Naturally, overriding a single default isn't much use. But remember, "
@@ -195,13 +128,11 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:88
 #, no-c-format
 msgid "Interceptor bindings for stereotypes"
 msgstr "ステレオタイプのためのインターセプタバインディング"
 
 #. Tag: para
-#: stereotypes.xml:90
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype may specify a set of interceptor bindings to be inherited by "
@@ -210,29 +141,7 @@
 "ステレオタイプは、そのステレオタイプですべての Web Beans によって受け継がれる"
 "ために、一組のインターセプタバインディングを明示することがありえます。"
 
-#. Tag: programlisting
-#: stereotypes.xml:94
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@WebTier\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "This helps us get technical concerns, like transactions and security, even "
@@ -241,13 +150,11 @@
 "これは、ビジネスコードから離れてさらに技術的関心事を理解するのを助けます。"
 
 #. Tag: title
-#: stereotypes.xml:103
 #, no-c-format
 msgid "Name defaulting with stereotypes"
 msgstr "ステレオタイプによる名前のデフォルティング"
 
 #. Tag: para
-#: stereotypes.xml:105
 #, fuzzy, no-c-format
 msgid ""
 "We can specify that all beans with a certain stereotype have a defaulted EL "
@@ -260,31 +167,7 @@
 "スケースとなっています。必要なのは、空の <literal>@Named</literal> アノテー"
 "ションを加えることだけです。"
 
-#. Tag: programlisting
-#: stereotypes.xml:110
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@WebTier\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:112
 #, fuzzy, no-c-format
 msgid ""
 "Now, the <literal>LoginAction</literal> bean will have the defaulted name "
@@ -294,13 +177,11 @@
 "として名前を持つようになります。"
 
 #. Tag: title
-#: stereotypes.xml:119
 #, fuzzy, no-c-format
 msgid "Alternative stereotypes"
 msgstr "標準ステレオタイプ"
 
 #. Tag: para
-#: stereotypes.xml:121
 #, no-c-format
 msgid ""
 "A stereotype can indicate that all beans to which it is applied are "
@@ -308,47 +189,19 @@
 "emphasis> lets us classify beans by deployment scenario."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:126
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Mock {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:128
 #, no-c-format
 msgid ""
 "We can apply an alternative stereotype to a whole set of beans, and activate "
 "them all with one line of code in <literal>beans.xml</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:133
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Mock\n"
-"public class MockLoginAction extends LoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-
 #. Tag: title
-#: stereotypes.xml:141
 #, fuzzy, no-c-format
 msgid "Stereotype stacking"
 msgstr "ステレオタイプ"
 
 #. Tag: para
-#: stereotypes.xml:143
 #, no-c-format
 msgid ""
 "This may blow your mind a bit, but stereotypes may declare other "
@@ -359,39 +212,18 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:150
 #, no-c-format
 msgid ""
 "Here's an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:155
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Auditable\n"
-"@Action\n"
-"@Stereotype\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface AuditableAction {}]]>"
-msgstr ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {} ]]>"
-
 #. Tag: title
-#: stereotypes.xml:160
 #, fuzzy, no-c-format
 msgid "Built-in stereotypes"
 msgstr "標準ステレオタイプ"
 
 #. Tag: para
-#: stereotypes.xml:162
 #, fuzzy, no-c-format
 msgid ""
 "We've already met two standard stereotypes defined by the CDI specification: "
@@ -402,33 +234,13 @@
 "た。"
 
 #. Tag: para
-#: stereotypes.xml:167
 #, no-c-format
 msgid ""
 "CDI defines one further standard stereotype, <literal>@Model</literal>, "
 "which is expected to be used frequently in web applications:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:172
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {}]]>"
-msgstr ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {} ]]>"
-
 #. Tag: para
-#: stereotypes.xml:174
 #, fuzzy, no-c-format
 msgid ""
 "Instead of using JSF managed beans, just annotate a bean <literal>@Model</"
@@ -438,6 +250,140 @@
 "を使うのではなく、ただ Web Bean に <literal>@Model</literal> アノテーションを"
 "付加するだけで、 JSFページで直接それを使えるようになります。"
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "...\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Dependent @Action \n"
+#~ "public class DependentScopedLoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Dependent @Mock @Action \n"
+#~ "public class MockLoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@WebTier\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Named\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Named\n"
+#~ "@WebTier\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Mock {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Mock\n"
+#~ "public class MockLoginAction extends LoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Auditable\n"
+#~ "@Action\n"
+#~ "@Stereotype\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface AuditableAction {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {} ]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {} ]]>"
+
 #~ msgid "According to the Web Beans specification:"
 #~ msgstr "Web Beans の仕様に従って"
 

Modified: doc/trunk/reference/ja-JP/viewlayers.po
===================================================================
--- doc/trunk/reference/ja-JP/viewlayers.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/viewlayers.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-05-22 23:05+0900\n"
 "Last-Translator: TANABE Junnichi <jun at lmns.biz>\n"
 "Language-Team: none\n"
@@ -15,19 +15,16 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: viewlayers.xml:5
 #, no-c-format
 msgid "Alternative view layers"
 msgstr "代替ビューレイヤ"
 
 #. Tag: title
-#: viewlayers.xml:8
 #, no-c-format
 msgid "Wicket CDI integration"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:10
 #, no-c-format
 msgid ""
 "Weld provides integration between the Apache Wicket web framework and CDI. "
@@ -37,7 +34,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:16
 #, no-c-format
 msgid ""
 "This section describes some of the utilities provided by the Wicket "
@@ -45,13 +41,11 @@
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:22
 #, no-c-format
 msgid "The <literal>WebApplication</literal> class"
 msgstr "<literal>WebApplication</literal>クラス"
 
 #. Tag: para
-#: viewlayers.xml:24
 #, fuzzy, no-c-format
 msgid ""
 "Each wicket application must have a <literal>WebApplication</literal> "
@@ -65,7 +59,6 @@
 "webbeans.wicket.WebBeansApplication</literal> のサブクラスを作るべきです。"
 
 #. Tag: para
-#: viewlayers.xml:31
 #, fuzzy, no-c-format
 msgid ""
 "If you would prefer not to subclass <literal>WeldApplication</literal>, you "
@@ -79,37 +72,16 @@
 "<literal>WebBeansApplication</literal> のjavadocがこれに詳しく述べています。"
 
 #. Tag: para
-#: viewlayers.xml:38
 #, no-c-format
 msgid "For example:"
 msgstr "例えば、"
 
-#. Tag: programlisting
-#: viewlayers.xml:41
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class SampleApplication extends WeldApplication {\n"
-"   @Override\n"
-"   public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class SampleApplication extends WebBeansApplication {\n"
-"   @Override\n"
-"   public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-
 #. Tag: title
-#: viewlayers.xml:45
 #, no-c-format
 msgid "Conversations with Wicket"
 msgstr "Wicketを使った対話"
 
 #. Tag: para
-#: viewlayers.xml:46
 #, no-c-format
 msgid ""
 "Wicket can also take advantage of the conversation scope from CDI, provided "
@@ -117,7 +89,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:52
 #, no-c-format
 msgid ""
 "Setting up the conversation context at the beginning of a Wicket request, "
@@ -126,7 +97,6 @@
 "Wicketリクエストの開始時に対話コンテキストを設定し、その後それを破棄すること"
 
 #. Tag: para
-#: viewlayers.xml:58
 #, no-c-format
 msgid ""
 "Storing the id of any long-running conversation in Wicket's metadata when "
@@ -136,7 +106,6 @@
 "こと"
 
 #. Tag: para
-#: viewlayers.xml:64
 #, no-c-format
 msgid ""
 "Activating the correct long-running conversation based upon which page is "
@@ -144,7 +113,6 @@
 msgstr "ページがアクセスされているときに正しい長期対話を活性化すること"
 
 #. Tag: para
-#: viewlayers.xml:69
 #, no-c-format
 msgid ""
 "Propagating the conversation context for any long-running conversation to "
@@ -152,13 +120,11 @@
 msgstr "対話コンテキストを新しいページへの長期対話に対して伝播すること"
 
 #. Tag: title
-#: viewlayers.xml:76
 #, no-c-format
 msgid "Starting and stopping conversations in Wicket"
 msgstr "Wicketでの対話の開始と終了"
 
 #. Tag: para
-#: viewlayers.xml:77
 #, fuzzy, no-c-format
 msgid ""
 "As in JSF applications, a conversation <emphasis>always</emphasis> exists "
@@ -177,27 +143,12 @@
 "の場合と同様に達成されます。同じように、対話は <literal>conversation.end()</"
 "literal> を用いて終了されます。"
 
-#. Tag: programlisting
-#: viewlayers.xml:86
-#, no-c-format
-msgid ""
-"<![CDATA[private @Inject Conversation conversation;\n"
-"...\n"
-"// begin a conversation\n"
-"conversation.begin();\n"
-"...\n"
-"// end a conversation\n"
-"conversation.end();]]>"
-msgstr ""
-
 #. Tag: title
-#: viewlayers.xml:91
 #, no-c-format
 msgid "Long running conversation propagation in Wicket"
 msgstr "Wicketでの長期対話の伝播"
 
 #. Tag: para
-#: viewlayers.xml:92
 #, fuzzy, no-c-format
 msgid ""
 "When a conversation is marked as long-running, the id of that conversation "
@@ -226,6 +177,22 @@
 "ラメータを通して伝播され、そのリダイレクトの後にページメタデータに保存される"
 "ことになります。"
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class SampleApplication extends WeldApplication {\n"
+#~ "   @Override\n"
+#~ "   public Class getHomePage() {\n"
+#~ "      return HomePage.class;\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class SampleApplication extends WebBeansApplication {\n"
+#~ "   @Override\n"
+#~ "   public Class getHomePage() {\n"
+#~ "      return HomePage.class;\n"
+#~ "   }\n"
+#~ "}]]>"
+
 #~ msgid "Using Web Beans with Wicket"
 #~ msgstr "Web BeansをWicketと使用する"
 

Modified: doc/trunk/reference/ja-JP/weldexamples.po
===================================================================
--- doc/trunk/reference/ja-JP/weldexamples.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/weldexamples.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: weldexamples.xml:5
 #, no-c-format
 msgid "Diving into the Weld examples"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:7
 #, no-c-format
 msgid ""
 "It's time to pull the covers back and dive into the internals of Weld "
@@ -29,13 +27,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:13
 #, no-c-format
 msgid "The numberguess example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:15
 #, no-c-format
 msgid ""
 "In the numberguess application you get 10 attempts to guess a number between "
@@ -44,16 +40,14 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:20
 #, no-c-format
 msgid ""
 "The numberguess example is comprised of a number of beans, configuration "
-"files and Facelets (JSF) views, packaged as a WAR module. Let's start by "
+"files and Facelets (JSF) views, packaged as a war module. Let's start by "
 "examining the configuration files."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:25
 #, no-c-format
 msgid ""
 "All the configuration files for this example are located in <literal>WEB-INF/"
@@ -64,21 +58,7 @@
 "to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:33
-#, no-c-format
-msgid ""
-"<![CDATA[<faces-config version=\"2.0\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd\">\n"
-"</faces-config>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:35
 #, no-c-format
 msgid ""
 "There's also an empty <literal>beans.xml</literal> file, which tells the "
@@ -87,212 +67,120 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:40
 #, no-c-format
 msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:42
+#. Tag: para
 #, no-c-format
+msgid "Enable and initialize the JSF servlet"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"faces.servlet\" coords=\"10\"/> "
-"<area id=\"faces.servlet.mapping\" coords=\"16\"/> <area id=\"faces.default."
-"suffix\" coords=\"21\"/> <area id=\"session.timeout\" coords=\"26\"/> </"
-"areaspec> <programlisting role=\"XML\"><![CDATA[<web-app version=\"2.5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n"
-"   \n"
-"   <display-name>weld-jsf-numberguess-war</display-name>\n"
-"   <description>Weld JSF numberguess example (WAR)</description>\n"
-"\n"
-"   <servlet>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>\n"
-"      <load-on-startup>1</load-on-startup>\n"
-"   </servlet>\n"
-"\n"
-"   <servlet-mapping>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <url-pattern>*.jsf</url-pattern>\n"
-"   </servlet-mapping>\n"
-"   \n"
-"   <context-param>\n"
-"      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>\n"
-"      <param-value>.xhtml</param-value>\n"
-"   </context-param>\n"
-"\n"
-"   <session-config>\n"
-"      <session-timeout>10</session-timeout>\n"
-"   </session-config>\n"
-"\n"
-"</web-app>]]></programlisting> <calloutlist> <callout arearefs=\"faces."
-"servlet\"> <para> Enable and initialize the JSF servlet </para> </callout> "
-"<callout arearefs=\"faces.servlet.mapping\"> <para> Configure requests for "
-"URLs ending in <literal>.jsf</literal> to be handled by JSF </para> </"
-"callout> <callout arearefs=\"faces.default.suffix\"> <para> Tell JSF that we "
-"will be giving our JSF views (Facelets templates) an extension of <literal>."
-"xhtml</literal> </para> </callout> <callout arearefs=\"session.timeout\"> "
-"<para> Configure a session timeout of 10 minutes </para> </callout> </"
-"calloutlist> </programlistingco> <note> <para> This demo uses JSF 2 as the "
-"view framework, but you can use Weld with any servlet-based web framework, "
-"such as JSF 1.2 or Wicket. </para> </note> <para> Let's take a look at the "
-"main JSF view, <literal>src/main/webapp/home.xhtml</literal>. </para> "
-"<programlistingco> <areaspec> <area id=\"template\" coords=\"8\"/> <area id="
-"\"statusMessages\" coords=\"12\"/> <area id=\"instructions\" coords=\"20\"/> "
-"<area id=\"guess\" coords=\"27\"/> <area id=\"validator\" coords=\"29\"/> "
-"<area id=\"submit\" coords=\"30\"/> </areaspec> <programlisting role=\"XML"
-"\"><![CDATA[<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN"
-"\"\n"
-"   \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
-"<html xmlns=\"http://www.w3.org/1999/xhtml\"\n"
-"   xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n"
-"   xmlns:h=\"http://java.sun.com/jsf/html\"\n"
-"   xmlns:f=\"http://java.sun.com/jsf/core\">\n"
-"\n"
-"   <ui:composition template=\"/template.xhtml\">\n"
-"      <ui:define name=\"content\">\n"
-"         <h1>Guess a number...</h1>\n"
-"         <h:form id=\"numberGuess\">\n"
-"            <div style=\"color: red\">\n"
-"               <h:messages id=\"messages\" globalOnly=\"false\"/>\n"
-"               <h:outputText id=\"Higher\" value=\"Higher!\"\n"
-"                  rendered=\"#{game.number gt game.guess and game.guess ne 0}"
-"\"/>\n"
-"               <h:outputText id=\"Lower\" value=\"Lower!\"\n"
-"                  rendered=\"#{game.number lt game.guess and game.guess ne 0}"
-"\"/>\n"
-"            </div>\n"
-"    \n"
-"            <div>\n"
-"               I'm thinking of a number between #{game.smallest} and #{game."
-"biggest}.\n"
-"               You have #{game.remainingGuesses} guesses remaining.\n"
-"            </div>\n"
-"       \n"
-"            <div>\n"
-"               Your guess: \n"
-"               <h:inputText id=\"inputGuess\" value=\"#{game.guess}\"\n"
-"                  size=\"3\" required=\"true\" disabled=\"#{game.number eq "
-"game.guess}\"\n"
-"                  validator=\"#{game.validateNumberRange}\"/>\n"
-"               <h:commandButton id=\"guessButton\" value=\"Guess\" \n"
-"                  action=\"#{game.check}\" disabled=\"#{game.number eq game."
-"guess}\"/>\n"
-"            </div>\n"
-"            <div>\n"
-"              <h:commandButton id=\"restartButton\" value=\"Reset\" action="
-"\"#{game.reset}\" immediate=\"true\"/>\n"
-"            </div>\n"
-"         </h:form>\n"
-"      </ui:define>\n"
-"   </ui:composition>\n"
-"</html>]]></programlisting> <calloutlist> <callout arearefs=\"template\"> "
-"<para> Facelets is the built-in templating language for JSF. Here we are "
-"wrapping our page in a template which defines the layout. </para> </callout> "
-"<callout arearefs=\"statusMessages\"> <para> There are a number of messages "
-"which can be sent to the user, \"Higher!\", \"Lower!\" and \"Correct!\" </"
-"para> </callout> <callout arearefs=\"instructions\"> <para> As the user "
-"guesses, the range of numbers they can guess gets smaller - this sentence "
-"changes to make sure they know the number range of a valid guess. </para> </"
-"callout> <callout arearefs=\"guess\"> <para> This input field is bound to a "
-"bean property using a value expression. </para> </callout> <callout arearefs="
-"\"validator\"> <para> A validator binding is used to make sure the user "
-"doesn't accidentally input a number outside of the range in which they can "
-"guess - if the validator wasn't here, the user might use up a guess on an "
-"out of bounds number. </para> </callout> <callout arearefs=\"submit\"> "
-"<para> And, of course, there must be a way for the user to send their guess "
-"to the server. Here we bind to an action method on the bean. </para> </"
-"callout> </calloutlist> </programlistingco>"
+"Configure requests for URLs ending in <literal>.jsf</literal> to be handled "
+"by JSF"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:142
 #, no-c-format
 msgid ""
-"The example exists of 4 classes, the first two of which are qualifiers. "
-"First, there is the <literal>@Random</literal> qualifier, used for injecting "
-"a random number:"
+"Tell JSF that we will be giving our JSF views (Facelets templates) an "
+"extension of <literal>.xhtml</literal>"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:147
+#. Tag: para
 #, no-c-format
+msgid "Configure a session timeout of 10 minutes"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Random {}]]>"
+"This demo uses JSF 2 as the view framework, but you can use Weld with any "
+"servlet-based web framework, such as JSF 1.2 or Wicket."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:149
 #, no-c-format
 msgid ""
-"There is also the <literal>@MaxNumber</literal> qualifier, used for "
-"injecting the maximum number that can be injected:"
+"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
+"literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:154
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface MaxNumber {}\n"
-"]]>"
+"Facelets is the built-in templating language for JSF. Here we are wrapping "
+"our page in a template which defines the layout."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:156
 #, no-c-format
 msgid ""
-"The application-scoped <literal>Generator</literal> class is responsible for "
-"creating the random number, via a producer method. It also exposes the "
-"maximum possible number via a producer method:"
+"There are a number of messages which can be sent to the user, \"Higher!\", "
+"\"Lower!\" and \"Correct!\""
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:161
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class Generator implements Serializable {\n"
-"\n"
-"   private java.util.Random random = new java.util.Random(System."
-"currentTimeMillis());\n"
-"   \n"
-"   private int maxNumber = 100;\n"
-"   \n"
-"   java.util.Random getRandom() {\n"
-"      return random;\n"
-"   }\n"
-"   \n"
-"   @Produces @Random int next() { \n"
-"      return getRandom().nextInt(maxNumber); \n"
-"   }\n"
-"   \n"
-"   @Produces @MaxNumber int getMaxNumber() {\n"
-"      return maxNumber;\n"
-"   }\n"
-"\n"
-"}]]>"
+"As the user guesses, the range of numbers they can guess gets smaller - this "
+"sentence changes to make sure they know the number range of a valid guess."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:163
 #, no-c-format
+msgid "This input field is bound to a bean property using a value expression."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
+"A validator binding is used to make sure the user doesn't accidentally input "
+"a number outside of the range in which they can guess - if the validator "
+"wasn't here, the user might use up a guess on an out of bounds number."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"And, of course, there must be a way for the user to send their guess to the "
+"server. Here we bind to an action method on the bean."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The example exists of 4 classes, the first two of which are qualifiers. "
+"First, there is the <literal>@Random</literal> qualifier, used for injecting "
+"a random number:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"There is also the <literal>@MaxNumber</literal> qualifier, used for "
+"injecting the maximum number that can be injected:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The application-scoped <literal>Generator</literal> class is responsible for "
+"creating the random number, via a producer method. It also exposes the "
+"maximum possible number via a producer method:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The <literal>Generator</literal> is application scoped, so we don't get a "
 "different random each time."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:168
 #, no-c-format
 msgid ""
 "The package declaration and imports have been excluded from these listings. "
@@ -300,7 +188,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:174
 #, no-c-format
 msgid ""
 "The final bean in the application is the session-scoped <literal>Game</"
@@ -313,7 +200,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:182
 #, no-c-format
 msgid ""
 "You'll notice that we've also added the <literal>@Named</literal> annotation "
@@ -321,123 +207,32 @@
 "bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:187
-#, no-c-format
-msgid ""
-"<![CDATA[@Named\n"
-"@SessionScoped\n"
-"public class Game implements Serializable {\n"
-"\n"
-"   private int number;\n"
-"   private int guess;\n"
-"   private int smallest;\n"
-"   private int biggest;\n"
-"   private int remainingGuesses;\n"
-"\n"
-"   @Inject @MaxNumber private int maxNumber;\n"
-"   @Inject @Random Instance<Integer> randomNumber;\n"
-"   \n"
-"   public Game() {}\n"
-"   \n"
-"   public void check() {\n"
-"      if (guess > number) {\n"
-"         biggest = guess - 1;\n"
-"      }\n"
-"      else if (guess < number) {\n"
-"         smallest = guess + 1;\n"
-"      }\n"
-"      else if (guess == number) {\n"
-"         FacesContext.getCurrentInstance().addMessage(null, new FacesMessage"
-"(\"Correct!\"));\n"
-"      }\n"
-"      remainingGuesses--;\n"
-"   }\n"
-"   \n"
-"   @PostConstruct\n"
-"   public void reset() {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = randomNumber.get();\n"
-"   }\n"
-"   \n"
-"   public void validateNumberRange(FacesContext context,  UIComponent "
-"toValidate, Object value) {\n"
-"      if (remainingGuesses <= 0) {\n"
-"         FacesMessage message = new FacesMessage(\"No guesses left!\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"         return;\n"
-"      }\n"
-"      int input = (Integer) value;\n"
-"\n"
-"      if (input < smallest || input > biggest) {\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"\n"
-"         FacesMessage message = new FacesMessage(\"Invalid guess\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"      }\n"
-"   }\n"
-"\n"
-"   public int getNumber() {\n"
-"      return number;\n"
-"   }\n"
-"   \n"
-"   public int getGuess() {\n"
-"      return guess;\n"
-"   }\n"
-"   \n"
-"   public void setGuess(int guess) {\n"
-"      this.guess = guess;\n"
-"   }\n"
-"   \n"
-"   public int getSmallest() {\n"
-"      return smallest;\n"
-"   }\n"
-"   \n"
-"   public int getBiggest() {\n"
-"      return biggest;\n"
-"   }\n"
-"   \n"
-"   public int getRemainingGuesses() {\n"
-"      return remainingGuesses;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: weldexamples.xml:190
 #, no-c-format
 msgid "The numberguess example in Apache Tomcat or Jetty"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:192
 #, no-c-format
 msgid ""
 "A couple of modifications must be made to the numberguess artifact in order "
 "to deploy it to Tomcat or Jetty. First, Weld must be deployed as a Web "
 "Application library under <literal>WEB-INF/lib</literal> since the servlet "
 "container does not provide the CDI services. For your convenience we provide "
-"a single JAR suitable for running Weld in any servlet container (including "
+"a single jar suitable for running Weld in any servlet container (including "
 "Jetty), <literal>weld-servlet.jar</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:200
 #, no-c-format
 msgid ""
-"You must also include the JARs for JSF, EL, and the common annotations "
+"You must also include the jars for JSF, EL, and the common annotations "
 "(<literal>jsr250-api.jar</literal>), all of which are provided by the Java "
 "EE platform (a Java EE application server). Are you starting to appreciate "
 "why a Java EE platform is worth using?"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:207
 #, no-c-format
 msgid ""
 "Second, we need to explicitly specify the servlet listener in <literal>web."
@@ -445,18 +240,7 @@
 "The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:213
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:215
 #, no-c-format
 msgid ""
 "When Weld boots, it places the <literal>javax.enterprise.inject.spi."
@@ -467,13 +251,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:226
 #, no-c-format
 msgid "The numberguess example for Apache Wicket"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:227
 #, no-c-format
 msgid ""
 "Weld includes a number of portable extensions for JSR-299, including an "
@@ -483,7 +265,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:234
 #, no-c-format
 msgid ""
 "You may want to review the Wicket documentation at <ulink url=\"http://"
@@ -492,7 +273,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:241
 #, no-c-format
 msgid ""
 "Wicket is another environment that relies on the Weld servlet extension. The "
@@ -503,7 +283,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:249
 #, no-c-format
 msgid ""
 "We'll also be using the Eclipse IDE in these examples. Instructions are "
@@ -513,13 +292,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:257
 #, no-c-format
 msgid "Creating the Eclipse project"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:259
 #, no-c-format
 msgid ""
 "To use the Wicket example in Eclipse, you have one of two choices. You can "
@@ -531,17 +308,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:267
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -> Import... -> Maven Projects</"
-"emphasis>. Then, browse to the location of the Wicket numberguess example. "
-"You should see that Eclipse recognizes the existence of a Maven project."
+"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
+"Projects</emphasis>. Then, browse to the location of the Wicket numberguess "
+"example. You should see that Eclipse recognizes the existence of a Maven "
+"project."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:279
 #, no-c-format
 msgid ""
 "This will create a project in your workspace called <literal>weld-wicket-"
@@ -549,7 +325,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:283
 #, no-c-format
 msgid ""
 "You'll notice after importing, the project has a build error. That's because "
@@ -557,21 +332,24 @@
 "<emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> "
 "tab in the window that appears. In the form field labeled \"Active Maven "
 "Profiles (comma separated):\", type <literal>jetty</literal>. That will "
-"enable some extra dependencies that allow the project to compile. You're now "
-"ready to develop!"
+"enable some extra dependencies that allow the project to compile. "
+"Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven "
+"compile plugin when processing resources (recommended)\". That solves an "
+"incompatiblity between the m2eclipse plugin and the Maven enforcer plugin "
+"that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:292
 #, no-c-format
 msgid ""
-"You are also advised to uncheck the box \"Skip Maven compiler when "
-"processing resources\" in the Maven properties screen because of conflicts "
-"with the Maven enforcer plugin."
+"Be sure to uncheck the box \"Skip Maven compile plugin when processing "
+"resources (recommended)\" in the Maven properties screen or else the example "
+"might not run in Eclipse because beans.xml will be missing from the "
+"classpath! See the <ulink url=\"https://issues.sonatype.org/browse/"
+"MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:298
 #, no-c-format
 msgid ""
 "If you are not using the m2eclipse plugin, you have to follow different "
@@ -580,38 +358,26 @@
 "activated, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:304
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/wicket/numberguess\n"
-"mvn -Pjetty eclipse:eclipse]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:306
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -> Import... -> General -> "
-"Existing Projects into Workspace</emphasis>, select the root directory of "
-"the numberguess example, and click Finish. This will create a project in "
+"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
+"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
+"of the numberguess example, and click Finish. This will create a project in "
 "your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:318
 #, no-c-format
 msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:325
 #, no-c-format
 msgid "Running the example from Eclipse"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:327
 #, no-c-format
 msgid ""
 "This project follows the <literal>wicket-quickstart</literal> approach of "
@@ -626,13 +392,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:338
 #, no-c-format
 msgid "Running the example from the command line in JBoss AS or Tomcat"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:340
 #, no-c-format
 msgid ""
 "This example can also be deployed from the command line in a (similar to the "
@@ -642,26 +406,12 @@
 "run:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:346
-#, no-c-format
-msgid "<![CDATA[$> ant deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:348
 #, no-c-format
 msgid "to deploy the example to JBoss AS, and:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:350
-#, no-c-format
-msgid "<![CDATA[$> ant tomcat.deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:352
 #, no-c-format
 msgid ""
 "to deploy the example to Tomcat. You can then access application at <ulink "
@@ -670,33 +420,23 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:357
 #, no-c-format
 msgid ""
 "Alternatively, you can run the application in place on an embedded Jetty "
 "container using the following Maven command:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:362
-#, no-c-format
-msgid "<![CDATA[$> mvn jetty:run -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:364
 #, no-c-format
 msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:371
 #, no-c-format
 msgid "Understanding the code"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:373
 #, no-c-format
 msgid ""
 "The code in the wicket numberguess example is very similar to the JSF-based "
@@ -710,7 +450,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:382
 #, no-c-format
 msgid ""
 "The integration of Weld with Wicket takes advantage of the same qualifier "
@@ -720,13 +459,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:388
 #, no-c-format
 msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:394
 #, no-c-format
 msgid ""
 "Each wicket application must have a <literal>WeldApplication</literal> "
@@ -734,19 +471,7 @@
 "<literal>NumberGuessApplication</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:398
-#, no-c-format
-msgid ""
-"<![CDATA[public class NumberGuessApplication extends WeldApplication {\n"
-"   @Override public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:399
 #, no-c-format
 msgid ""
 "This class specifies which page Wicket should treat as our home page, in our "
@@ -754,7 +479,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:405
 #, no-c-format
 msgid ""
 "In <literal>HomePage</literal>, we see typical Wicket code to set up page "
@@ -762,52 +486,14 @@
 "literal> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:410
-#, no-c-format
-msgid "<![CDATA[@Inject Game game;]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:412
 #, no-c-format
 msgid ""
 "The <literal>Game</literal> bean is can then be used, for example, by the "
 "code for submitting a guess:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:417
-#, no-c-format
-msgid ""
-"<![CDATA[final Component guessButton = new AjaxButton(\"GuessButton\") {\n"
-"   protected void onSubmit(AjaxRequestTarget target, Form form) {\n"
-"      if (game.check()) {\n"
-"         info(\"Correct!\");\n"
-"         setVisible(false);\n"
-"         prompt.setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == 0) {\n"
-"         info(\"Sorry, the answer was \" + game.getNumber());\n"
-"         setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getNumber() > game.getGuess()) {\n"
-"         info(\"Higher!\");\n"
-"      }\n"
-"      else if (game.getNumber() < game.getGuess()) {\n"
-"         info(\"Lower\");\n"
-"      }\n"
-"      target.addComponent(form);\n"
-"   } \n"
-"};      ]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:420
 #, no-c-format
 msgid ""
 "All injections may be serialized; actual storage of the bean is managed by "
@@ -816,7 +502,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:425
 #, no-c-format
 msgid ""
 "Wicket components allow injection, but they <emphasis>cannot</emphasis> use "
@@ -826,7 +511,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:433
 #, no-c-format
 msgid ""
 "The example uses AJAX for processing of button events, and dynamically hides "
@@ -835,7 +519,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:440
 #, no-c-format
 msgid ""
 "In order to activate Wicket for this webapp, the Wicket filter is added to "
@@ -843,29 +526,7 @@
 "<literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:445
-#, no-c-format
-msgid ""
-"<![CDATA[<filter>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-"
-"class>\n"
-"   <init-param>\n"
-"      <param-name>applicationClassName</param-name>\n"
-"      <param-value>org.jboss.weld.examples.wicket.NumberGuessApplication</"
-"param-value>\n"
-"   </init-param>\n"
-"</filter>\n"
-"\n"
-"<filter-mapping>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <url-pattern>/*</url-pattern>\n"
-"</filter-mapping>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:447
 #, no-c-format
 msgid ""
 "The servlet listener is still required, as in the Tomcat example, to "
@@ -876,26 +537,12 @@
 "descriptor to be appended to the <literal>web.xml</literal> configuration."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:455
-#, no-c-format
-msgid ""
-"<![CDATA[<web-app version=\"2.4\" ...>\n"
-"   <listener>\n"
-"      <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"   </listener>\n"
-"</web-app>]]>"
-msgstr ""
-
 #. Tag: title
-#: weldexamples.xml:464
 #, no-c-format
 msgid "The numberguess example for Java SE with Swing"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:466
 #, no-c-format
 msgid ""
 "This example shows how to use the Weld SE extension to in a Java SE based "
@@ -905,19 +552,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:473
 #, no-c-format
 msgid "To run the example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:479
 #, no-c-format
 msgid "Ensure that Maven 2 (version 2.0.10+) is installed and in your PATH"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:484
 #, no-c-format
 msgid ""
 "Ensure that the <literal>JAVA_HOME</literal> environment variable is "
@@ -925,7 +569,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:490
 #, no-c-format
 msgid ""
 "Open a command line or terminal window in the <literal>examples/se/"
@@ -933,19 +576,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:496
 #, no-c-format
 msgid "Execute the following command"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:499
-#, no-c-format
-msgid "mvn -Drun"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:503
 #, no-c-format
 msgid ""
 "Let's have a look at the significant code and configuration files that make "
@@ -953,7 +588,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:508
 #, no-c-format
 msgid ""
 "As usual, there is an empty <literal>beans.xml</literal> file in the root "
@@ -962,7 +596,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:514
 #, no-c-format
 msgid ""
 "The game's main logic is located in <literal>Game.java</literal>. Here is "
@@ -970,293 +603,170 @@
 "the web application version:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:518
+#. Tag: para
 #, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"scope\" coords=\"1\"/> <area id="
-"\"name\" coords=\"2\"/> <area id=\"messages1\" coords=\"26\"/> <area id="
-"\"validation\" coords=\"41\"/> <area id=\"reset\" coords=\"73\"/> </"
-"areaspec> <programlisting role=\"JAVA\"><![CDATA[@ApplicationScoped\n"
-"public class Game\n"
-"{\n"
-"\n"
-"   public static final int MAX_NUM_GUESSES = 10;\n"
-"\n"
-"   private Integer number;\n"
-"   private int guess = 0;\n"
-"   private int smallest = 0;\n"
-"\n"
-"   @Inject\n"
-"   @MaxNumber\n"
-"   private int maxNumber;\n"
-"\n"
-"   private int biggest;\n"
-"   private int remainingGuesses = MAX_NUM_GUESSES;\n"
-"   private boolean validNumberRange = true;\n"
-"\n"
-"   @Inject\n"
-"   Generator rndGenerator;\n"
-"\n"
-"   public Game()\n"
-"   {\n"
-"   }\n"
-"\n"
-"   ...\n"
-"\n"
-"   public boolean isValidNumberRange()\n"
-"   {\n"
-"      return validNumberRange;\n"
-"   }\n"
-"\n"
-"   public boolean isGameWon()\n"
-"   {\n"
-"      return guess == number;\n"
-"   }\n"
-"\n"
-"   public boolean isGameLost()\n"
-"   {\n"
-"      return guess != number && remainingGuesses <= 0;\n"
-"   }\n"
-"\n"
-"   public boolean check()\n"
-"   {\n"
-"      boolean result = false;\n"
-"\n"
-"      if (checkNewNumberRangeIsValid())\n"
-"      {\n"
-"         if (guess > number)\n"
-"         {\n"
-"            biggest = guess - 1;\n"
-"         }\n"
-"\n"
-"         if (guess < number)\n"
-"         {\n"
-"            smallest = guess + 1;\n"
-"         }\n"
-"\n"
-"         if (guess == number)\n"
-"         {\n"
-"            result = true;\n"
-"         }\n"
-"\n"
-"         remainingGuesses--;\n"
-"      }\n"
-"\n"
-"      return result;\n"
-"   }\n"
-"\n"
-"   private boolean checkNewNumberRangeIsValid()\n"
-"   {\n"
-"      return validNumberRange = ((guess >= smallest) && (guess <= "
-"biggest));\n"
-"   }\n"
-"\n"
-"   @PostConstruct\n"
-"   public void reset()\n"
-"   {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = rndGenerator.next();\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"scope\"> <para> The "
-"bean is application scoped rather than session scoped, since an instance of "
-"a Swing application typically represents a single 'session'. </para> </"
-"callout> <callout arearefs=\"name\"> <para> Notice that the bean is not "
-"named, since it doesn't need to be accessed via EL. </para> </callout> "
-"<callout arearefs=\"messages1\"> <para> In Java SE there is no JSF "
-"<literal>FacesContext</literal> to which messages can be added. Instead the "
-"<literal>Game</literal> class provides additional information about the "
-"state of the current game including: </para> <itemizedlist> <listitem> "
-"<para> If the game has been won or lost </para> </listitem> <listitem> "
-"<para> If the most recent guess was invalid </para> </listitem> </"
-"itemizedlist> <para> This allows the Swing UI to query the state of the "
-"game, which it does indirectly via a class called <literal>MessageGenerator</"
-"literal>, in order to determine the appropriate messages to display to the "
-"user during the game. </para> </callout> <callout arearefs=\"validation\"> "
-"<para> Since there is no dedicated validation phase, validation of user "
-"input is performed during the <literal>check()</literal> method. </para> </"
-"callout> <callout arearefs=\"reset\"> <para> The <literal>reset()</literal> "
-"method makes a call to the injected <literal>rndGenerator</literal> in order "
-"to get the random number at the start of each game. Note that it can't use "
-"<literal>Instance.get()</literal> like the JSF example does because there "
-"will not be any active contexts like there are during a JSF request. </para> "
-"</callout> </calloutlist> </programlistingco> <para> The "
-"<literal>MessageGenerator</literal> class depends on the current instance of "
-"<literal>Game</literal> and queries its state in order to determine the "
-"appropriate messages to provide as the prompt for the user's next guess and "
-"the response to the previous guess. The code for <literal>MessageGenerator</"
-"literal> is as follows: </para> <programlistingco> <areaspec> <area id=\"game"
-"\" coords=\"3\"/> <area id=\"challenge\" coords=\"6\"/> <area id=\"result\" "
-"coords=\"17\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA[public "
-"class MessageGenerator\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   public String getChallengeMessage()\n"
-"   {\n"
-"      StringBuilder challengeMsg = new StringBuilder(\"I'm thinking of a "
-"number between \");\n"
-"      challengeMsg.append(game.getSmallest());\n"
-"      challengeMsg.append(\" and \");\n"
-"      challengeMsg.append(game.getBiggest());\n"
-"      challengeMsg.append(\". Can you guess what it is?\");\n"
-"\n"
-"      return challengeMsg.toString();\n"
-"   }\n"
-"\n"
-"   public String getResultMessage()\n"
-"   {\n"
-"      if (game.isGameWon())\n"
-"      {\n"
-"         return \"You guessed it! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (game.isGameLost())\n"
-"      {\n"
-"         return \"You are fail! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (!game.isValidNumberRange())\n"
-"      {\n"
-"         return \"Invalid number range!\";\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == Game.MAX_NUM_GUESSES)\n"
-"      {\n"
-"         return \"What is your first guess?\";\n"
-"      }\n"
-"      else\n"
-"      {\n"
-"         String direction = null;\n"
-"\n"
-"         if (game.getGuess() < game.getNumber())\n"
-"         {\n"
-"            direction = \"Higher\";\n"
-"         }\n"
-"         else\n"
-"         {\n"
-"            direction = \"Lower\";\n"
-"         }\n"
-"\n"
-"         return direction + \"! You have \" + game.getRemainingGuesses() + "
-"\" guesses left.\";\n"
-"      }\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"game\"> <para> The "
-"instance of <literal>Game</literal> for the application is injected here. </"
-"para> </callout> <callout arearefs=\"challenge\"> <para> The <literal>Game</"
-"literal>'s state is interrogated to determine the appropriate challenge "
-"message ... </para> </callout> <callout arearefs=\"result\"> <para> ... and "
-"again to determine whether to congratulate, console or encourage the user to "
-"continue. </para> </callout> </calloutlist> </programlistingco> <para> "
+"The bean is application scoped rather than session scoped, since an instance "
+"of a Swing application typically represents a single 'session'."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Notice that the bean is not named, since it doesn't need to be accessed via "
+"EL."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"In Java SE there is no JSF <literal>FacesContext</literal> to which messages "
+"can be added. Instead the <literal>Game</literal> class provides additional "
+"information about the state of the current game including:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the game has been won or lost"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the most recent guess was invalid"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This allows the Swing UI to query the state of the game, which it does "
+"indirectly via a class called <literal>MessageGenerator</literal>, in order "
+"to determine the appropriate messages to display to the user during the game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Since there is no dedicated validation phase, validation of user input is "
+"performed during the <literal>check()</literal> method."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>reset()</literal> method makes a call to the injected "
+"<literal>rndGenerator</literal> in order to get the random number at the "
+"start of each game. Note that it can't use <literal>Instance.get()</literal> "
+"like the JSF example does because there will not be any active contexts like "
+"there are during a JSF request."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>MessageGenerator</literal> class depends on the current "
+"instance of <literal>Game</literal> and queries its state in order to "
+"determine the appropriate messages to provide as the prompt for the user's "
+"next guess and the response to the previous guess. The code for "
+"<literal>MessageGenerator</literal> is as follows:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The instance of <literal>Game</literal> for the application is injected here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>Game</literal>'s state is interrogated to determine the "
+"appropriate challenge message ..."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"... and again to determine whether to congratulate, console or encourage the "
+"user to continue."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "Finally we come to the <literal>NumberGuessFrame</literal> class which "
-"provides the Swing front end to our guessing game. </para> "
-"<programlistingco> <areaspec> <area id=\"gameIn\" coords=\"3\"/> <area id="
-"\"messagesIn\" coords=\"6\"/> <area id=\"start\" coords=\"9\"/> <area id="
-"\"init\" coords=\"21\"/> <area id=\"guess1\" coords=\"38\"/> <area id="
-"\"replay\" coords=\"48\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA"
-"[public class NumberGuessFrame extends javax.swing.JFrame\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   @Inject\n"
-"   private MessageGenerator msgGenerator;\n"
-"\n"
-"   public void start(@Observes ContainerInitialized event)\n"
-"   {\n"
-"      java.awt.EventQueue.invokeLater(new Runnable()\n"
-"      {\n"
-"         public void run()\n"
-"         {\n"
-"            initComponents();\n"
-"            setVisible(true);\n"
-"         }\n"
-"      });\n"
-"   }\n"
-"\n"
-"   private void initComponents()\n"
-"   {\n"
-"\n"
-"      buttonPanel = new javax.swing.JPanel();\n"
-"      mainMsgPanel = new javax.swing.JPanel();\n"
-"      mainLabel = new javax.swing.JLabel();\n"
-"      messageLabel = new javax.swing.JLabel();\n"
-"      guessText = new javax.swing.JTextField();\n"
-"      ...\n"
-"      mainLabel.setText(msgGenerator.getChallengeMessage());\n"
-"      mainMsgPanel.add(mainLabel);\n"
-"\n"
-"      messageLabel.setText(msgGenerator.getResultMessage());\n"
-"      mainMsgPanel.add(messageLabel);\n"
-"      ...\n"
-"   }\n"
-"\n"
-"   private void guessButtonActionPerformed( java.awt.event.ActionEvent "
-"evt )\n"
-"   {\n"
-"      int guess =  Integer.parseInt(guessText.getText());\n"
-"      game.setGuess( guess );\n"
-"      game.check();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void replayBtnActionPerformed(java.awt.event.ActionEvent evt)\n"
-"   {\n"
-"      game.reset();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void refreshUI() {\n"
-"      mainLabel.setText( msgGenerator.getChallengeMessage() );\n"
-"      messageLabel.setText( msgGenerator.getResultMessage() );\n"
-"      guessText.setText( \"\" );\n"
-"      guessesLeftBar.setValue( game.getRemainingGuesses() );\n"
-"      guessText.requestFocus();\n"
-"   }\n"
-"\n"
-"   // swing components\n"
-"   private javax.swing.JPanel borderPanel;\n"
-"   ...\n"
-"   private javax.swing.JButton replayBtn;\n"
-"\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"gameIn\"> <para> The "
-"injected instance of the game (logic and state). </para> </callout> <callout "
-"arearefs=\"messagesIn\"> <para> The injected message generator for UI "
-"messages. </para> </callout> <callout arearefs=\"start\"> <para> This "
-"application is started in the prescribed Weld SE way, by observing the "
-"<literal>ContainerInitialized</literal> event. </para> </callout> <callout "
-"arearefs=\"init\"> <para> This method initializes all of the Swing "
-"components. Note the use of the <literal>msgGenerator</literal> here. </"
-"para> </callout> <callout arearefs=\"guess1\"> <para> "
+"provides the Swing front end to our guessing game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected instance of the game (logic and state)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected message generator for UI messages."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This application is started in the prescribed Weld SE way, by observing the "
+"<literal>ContainerInitialized</literal> event."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This method initializes all of the Swing components. Note the use of the "
+"<literal>msgGenerator</literal> here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
-"button is clicked, and it does the following: </para> <itemizedlist> "
-"<listitem> <para> Gets the guess entered by the user and sets it as the "
-"current guess in the <literal>Game</literal> </para> </listitem> <listitem> "
-"<para> Calls <literal>game.check()</literal> to validate and perform one "
-"'turn' of the game </para> </listitem> <listitem> <para> Calls "
-"<literal>refreshUI</literal>. If there were validation errors with the "
+"button is clicked, and it does the following:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Gets the guess entered by the user and sets it as the current guess in the "
+"<literal>Game</literal>"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
+"the game"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>refreshUI</literal>. If there were validation errors with the "
 "input, this will have been captured during <literal>game.check()</literal> "
 "and as such will be reflected in the messages returned by "
 "<literal>MessageGenerator</literal> and subsequently presented to the user. "
 "If there are no validation errors then the user will be told to guess again "
 "(higher or lower) or that the game has ended either in a win (correct guess) "
-"or a loss (ran out of guesses). </para> </listitem> </itemizedlist> </"
-"callout> <callout arearefs=\"replay\"> <para> "
+"or a loss (ran out of guesses)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>replayBtnActionPerformed</literal> simply calls <literal>game.reset"
-"()</literal> to start a new game and refreshes the messages in the UI. </"
-"para> </callout> </calloutlist> </programlistingco>"
+"()</literal> to start a new game and refreshes the messages in the UI."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:716
 #, no-c-format
 msgid "The translator example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:718
 #, no-c-format
 msgid ""
 "The translator example will take any sentences you enter, and translate them "
@@ -1265,52 +775,29 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:723
 #, no-c-format
 msgid ""
-"The translator example is built as an EAR and contains EJBs. As a result, "
+"The translator example is built as an ear and contains EJBs. As a result, "
 "it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:729
 #, no-c-format
 msgid ""
-"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a WAR, which "
+"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a war, which "
 "will make this structure much simpler! Still, there are other advantages of "
-"using an EAR."
+"using an ear."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:735
 #, no-c-format
 msgid ""
-"First, let's take a look at the EAR aggregator, which is located in the "
+"First, let's take a look at the ear aggregator, which is located in the "
 "example's <literal>ear</literal> directory. Maven automatically generates "
 "the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:740
-#, no-c-format
-msgid ""
-"<![CDATA[<plugin>\n"
-"   <groupId>org.apache.maven.plugins</groupId>\n"
-"   <artifactId>maven-ear-plugin</artifactId>\n"
-"   <configuration>\n"
-"      <modules>\n"
-"         <webModule>\n"
-"            <groupId>org.jboss.weld.examples.jsf.translator</groupId>\n"
-"            <artifactId>weld-jsf-translator-war</artifactId>\n"
-"            <contextRoot>/weld-translator</contextRoot>\n"
-"         </webModule>\n"
-"      </modules>\n"
-"   </configuration>\n"
-"</plugin>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:742
 #, no-c-format
 msgid ""
 "This configuration overrides the web context path, resulting in this "
@@ -1319,44 +806,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:748
 #, no-c-format
 msgid ""
 "If you weren't using Maven to generate these files, you would need "
 "<literal>META-INF/application.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:753
-#, no-c-format
-msgid ""
-"<![CDATA[<application version=\"5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/application_5.xsd\">\n"
-"\n"
-"  <display-name>weld-jsf-translator-ear</display-name>\n"
-"  <description>The Weld JSF translator example (EAR)</description>\n"
-"  \n"
-"  <module>\n"
-"    <web>\n"
-"      <web-uri>weld-translator.war</web-uri>\n"
-"      <context-root>/weld-translator</context-root>\n"
-"    </web>\n"
-"  </module>\n"
-"  <module>\n"
-"    <ejb>weld-translator.jar</ejb>\n"
-"  </module>\n"
-"</application>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:756
 #, no-c-format
 msgid ""
-"Next, lets look at the WAR, which is located in the example's <literal>war</"
+"Next, lets look at the war, which is located in the example's <literal>war</"
 "literal> directory. Just as in the numberguess example, we have a "
 "<literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</"
 "literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/"
@@ -1364,7 +823,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:762
 #, no-c-format
 msgid ""
 "More interesting is the JSF view used to translate text. Just as in the "
@@ -1372,41 +830,7 @@
 "here for brevity):"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:767
-#, no-c-format
-msgid ""
-"<![CDATA[<h:form id=\"translator\">\n"
-"\n"
-"   <table>\n"
-"      <tr align=\"center\" style=\"font-weight: bold\">\n"
-"         <td>\n"
-"            Your text\n"
-"         </td>\n"
-"         <td>\n"
-"            Translation\n"
-"         </td>\n"
-"      </tr>\n"
-"      <tr>\n"
-"         <td>\n"
-"            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
-"required=\"true\" rows=\"5\" cols=\"80\"/>\n"
-"         </td>\n"
-"         <td>\n"
-"            <h:outputText value=\"#{translator.translatedText}\"/>\n"
-"         </td>\n"
-"      </tr>\n"
-"   </table>\n"
-"   <div>\n"
-"      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
-"{translator.translate}\"/>\n"
-"   </div>\n"
-"   \n"
-"</h:form>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:769
 #, no-c-format
 msgid ""
 "The user can enter some text in the left-hand textarea, and hit the "
@@ -1414,7 +838,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:774
 #, no-c-format
 msgid ""
 "Finally, let's look at the EJB module, which is located in the example's "
@@ -1424,7 +847,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:780
 #, no-c-format
 msgid ""
 "We've saved the most interesting bit to last, the code! The project has two "
@@ -1436,7 +858,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:787
 #, no-c-format
 msgid ""
 "Both <literal>SentenceParser</literal> and <literal>TextTranslator</literal> "
@@ -1444,33 +865,7 @@
 "injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:792
-#, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator implements Serializable { \n"
-"\n"
-"   private SentenceParser sentenceParser; \n"
-"\n"
-"   @EJB private Translator translator; \n"
-"   \n"
-"   @Inject public TextTranslator(SentenceParser sentenceParser) { \n"
-"      this.sentenceParser = sentenceParser; \n"
-"   }\n"
-"   \n"
-"   public String translate(String text) { \n"
-"      StringBuilder sb = new StringBuilder(); \n"
-"      for (String sentence: sentenceParser.parse(text)) { \n"
-"         sb.append(translator.translate(sentence)).append(\". \"); \n"
-"      } \n"
-"      return sb.toString().trim(); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:794
 #, no-c-format
 msgid ""
 "<literal>TextTranslator</literal> uses the simple bean (really just a plain "
@@ -1481,22 +876,7 @@
 "convincing enough to anyone who doesn't understand Latin!"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:802
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator { \n"
-"\n"
-"   public String translate(String sentence) { \n"
-"      return \"Lorem ipsum dolor sit amet\"; \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:804
 #, no-c-format
 msgid ""
 "Finally, there is UI orientated controller. This is a request scoped, named, "
@@ -1505,44 +885,7 @@
 "and setters for all the fields on the page."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:810
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"@RequestScoped\n"
-"@Named(\"translator\")\n"
-"public class TranslatorControllerBean implements TranslatorController {\n"
-"\n"
-"   @Inject private TextTranslator translator;\n"
-"   \n"
-"   private String inputText;\n"
-"   \n"
-"   private String translatedText;\n"
-"   \n"
-"   public void translate() {\n"
-"      translatedText = translator.translate(inputText);\n"
-"   }\n"
-"   \n"
-"   public String getText() {\n"
-"      return inputText;\n"
-"   }\n"
-"   \n"
-"   public void setText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"   \n"
-"   public String getTranslatedText() {\n"
-"      return translatedText;\n"
-"   }\n"
-"   \n"
-"   @Remove public void remove() {}\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:814
 #, no-c-format
 msgid ""
 "That concludes our short tour of the Weld starter examples. For more "

Modified: doc/trunk/reference/ja-JP/xml.po
===================================================================
--- doc/trunk/reference/ja-JP/xml.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ja-JP/xml.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-06-09 19:24+0900\n"
 "Last-Translator: Keita Higashi <winnie_the_pooh at y3.dion.ne.jp>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: xml.xml:5
 #, fuzzy, no-c-format
 msgid "Defining beans using XML"
 msgstr "XML を使っている Web Beans を定める"
 
 #. Tag: para
-#: xml.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "So far, we've seen plenty of examples of beans declared using annotations. "
@@ -32,20 +30,17 @@
 "ます。"
 
 #. Tag: para
-#: xml.xml:14
 #, no-c-format
 msgid "when the implementation class comes from some preexisting library, or"
 msgstr "インプリメンテーションクラスがいくつかの既存のライブラリからなるとき"
 
 #. Tag: para
-#: xml.xml:19
 #, fuzzy, no-c-format
 msgid "when there should be multiple beans with the same implementation class."
 msgstr ""
 "複数の Web Beans が同じインプリメンテーションクラスでなければならないとき"
 
 #. Tag: para
-#: xml.xml:25
 #, no-c-format
 msgid ""
 "One way to address these problems is to write a producer method. Weld offers "
@@ -55,7 +50,6 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:31
 #, fuzzy, no-c-format
 msgid ""
 "Many frameworks use XML to provide metadata relating to Java classes. "
@@ -71,7 +65,6 @@
 "クラスまたはメンバー名を XML 要素の名前として使うことができます。"
 
 #. Tag: para
-#: xml.xml:38
 #, no-c-format
 msgid ""
 "The advantage of this approach is that you can write an XML schema that "
@@ -87,13 +80,11 @@
 "す。"
 
 #. Tag: title
-#: xml.xml:46
 #, fuzzy, no-c-format
 msgid "Declaring beans"
 msgstr "Web Bean クラスを宣言する"
 
 #. Tag: para
-#: xml.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "For each Java package, Weld defines a corresponding XML namespace. The "
@@ -107,7 +98,6 @@
 "XML 名前空間は、 <literal>urn:java:com.mydomain.myapp</literal> となります。"
 
 #. Tag: para
-#: xml.xml:54
 #, no-c-format
 msgid ""
 "Java types belonging to a package are referred to using an XML element in "
@@ -122,7 +112,6 @@
 "るならば、メンバーは要素の特質によって明示されます。"
 
 #. Tag: para
-#: xml.xml:61
 #, no-c-format
 msgid ""
 "For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
@@ -131,24 +120,7 @@
 "たとえば、以下の XML 断片の要素 <literal>&lt;util:Date/&gt;</literal> は、ク"
 "ラス <literal>java.util.Date</literal> を参照します。"
 
-#. Tag: programlisting
-#: xml.xml:66
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:util=\"urn:java:java.util\">\n"
-"   <util:Date/>\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
-"          xmlns:util=\"urn:java:java.util\">\n"
-"\n"
-"    <util:Date/>\n"
-"\n"
-"</WebBeans>]]>"
-
 #. Tag: para
-#: xml.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "And this is all the code we need to declare that <literal>Date</literal> is "
@@ -159,20 +131,12 @@
 "のすべてのコードです。<literal>Date</literal> のインスタンスは、現在他のどの "
 "Web Bean にも導入されることがありえます。"
 
-#. Tag: programlisting
-#: xml.xml:73
-#, fuzzy, no-c-format
-msgid "<![CDATA[private @Inject Date date;]]>"
-msgstr "<![CDATA[@Current Date date]]>"
-
 #. Tag: title
-#: xml.xml:78
 #, fuzzy, no-c-format
 msgid "Declaring bean metadata"
 msgstr "Web Bean メタデータを宣言する"
 
 #. Tag: para
-#: xml.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "We can declare the scope, deployment type and interceptor binding types "
@@ -181,67 +145,13 @@
 "バインディングタイプが Web Bean 宣言の直接の子要素を使用して型を検査するス"
 "コープ、デプロイメントタイプとインタセプターを宣言することができます。"
 
-#. Tag: programlisting
-#: xml.xml:85
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"   <SessionScoped/>\n"
-"   <myfwk:Transactional requiresNew=\"true\"/>\n"
-"   <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
-msgstr ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"    <SessionScoped/>\n"
-"    <myfwk:Transactional requiresNew=\"true\"/>\n"
-"    <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
-
 #. Tag: para
-#: xml.xml:87
 #, fuzzy, no-c-format
 msgid "We use exactly the same approach to specify names and qualifiers:"
 msgstr ""
 "名前とバインディングタイプを明示するために、正確に同じアプローチを使います。"
 
-#. Tag: programlisting
-#: xml.xml:89
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<util:Date>\n"
-"   <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <SessionScoped/>\n"
-"   <myapp:Login/>\n"
-"   <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:SystemStart/>\n"
-"   <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
-msgstr ""
-"<![CDATA[<util:Date>\n"
-"    <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"    <SessionScoped/>\n"
-"    <myapp:Login/>\n"
-"    <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"    <ApplicationScoped/>\n"
-"    <myapp:SystemStart/>\n"
-"    <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
-
 #. Tag: para
-#: xml.xml:91
 #, fuzzy, no-c-format
 msgid ""
 "Where <literal>@Login</literal> and <literal>@SystemStart</literal> are "
@@ -250,42 +160,14 @@
 "<literal>@Login</literal> と <literal>@SystemStart</literal> アノテーションタ"
 "イプを結びつけているところ。"
 
-#. Tag: programlisting
-#: xml.xml:95
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[private @Inject Date currentTime;\n"
-"private @Login Date loginTime;\n"
-"private @SystemStart Date systemStartTime;]]>"
-msgstr ""
-"<![CDATA[@Current Date currentTime;\n"
-"@Login Date loginTime;\n"
-"@SystemStart Date systemStartTime;]]>"
-
 #. Tag: para
-#: xml.xml:97
 #, fuzzy, no-c-format
 msgid "As usual, a bean may support multiple qualifier types:"
 msgstr ""
 "通常通り、 Web Bean は複数のバインディングタイプをサポートすることがありえま"
 "す。"
 
-#. Tag: programlisting
-#: xml.xml:99
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"   <myapp:PayByCheque/>\n"
-"   <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
-msgstr ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"    <myapp:PayByCheque/>\n"
-"    <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
-
 #. Tag: para
-#: xml.xml:101
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors and decorators are beans as well, so they may be declared just "
@@ -294,74 +176,29 @@
 "インタセプタとデコレータは単なるシンプル Web Beans であるので、それらはまるで"
 "他のシンプル Web Bean のように宣言されることがありえます。"
 
-#. Tag: programlisting
-#: xml.xml:105
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"   <Interceptor/>\n"
-"   <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
-msgstr ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"    <Interceptor/>\n"
-"    <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
-
 #. Tag: title
-#: xml.xml:110
 #, fuzzy, no-c-format
 msgid "Declaring bean members"
 msgstr "Web Bean メンバーを宣言する"
 
 #. Tag: para
-#: xml.xml:112
 #, no-c-format
 msgid "TODO!"
 msgstr "やるべきこと。"
 
 #. Tag: title
-#: xml.xml:119
 #, fuzzy, no-c-format
 msgid "Declaring inline beans"
 msgstr "インライン Web Beans を宣言する"
 
 #. Tag: para
-#: xml.xml:121
 #, fuzzy, no-c-format
 msgid "Weld lets us define a bean at an injection point. For example:"
 msgstr ""
 "Web Beans は、依存性注入ポイントで Web Bean を定義できます。例を以下に示しま"
 "す。"
 
-#. Tag: programlisting
-#: xml.xml:123
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:System>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:admin>\n"
-"      <myapp:Name>\n"
-"         <myapp:firstname>Gavin</myapp:firstname>\n"
-"         <myapp:lastname>King</myapp:lastname>\n"
-"         <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"      </myapp:Name>\n"
-"   </myapp:admin>\n"
-"</myapp:System>]]>"
-msgstr ""
-"<![CDATA[<myapp:System>\n"
-"    <ApplicationScoped/>\n"
-"    <myapp:admin>\n"
-"        <myapp:Name>\n"
-"            <myapp:firstname>Gavin</myapp:firstname>\n"
-"            <myapp:lastname>King</myapp:lastname>\n"
-"            <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"        </myapp:Name>\n"
-"    </myapp:admin>\n"
-"</myapp:System>]]>"
-
 #. Tag: para
-#: xml.xml:125
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
@@ -375,7 +212,6 @@
 "な Web Bean を宣言します。"
 
 #. Tag: para
-#: xml.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "This simple but powerful feature allows the Weld XML format to be used to "
@@ -387,13 +223,11 @@
 "バインディングの解決案とは言えませんが、それにほとんど近いものです。"
 
 #. Tag: title
-#: xml.xml:139
 #, no-c-format
 msgid "Using a schema"
 msgstr "スキーマを使用する"
 
 #. Tag: para
-#: xml.xml:141
 #, fuzzy, no-c-format
 msgid ""
 "If we want our XML document format to be authored by people who aren't Java "
@@ -404,39 +238,7 @@
 "によって記述して欲しいならば、スキーマを提供する必要があります。 Web Beans に"
 "特有のスキーマを記述するか、記述する必要はありません。"
 
-#. Tag: programlisting
-#: xml.xml:147
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/beans-"
-"1.0.xsd\n"
-"   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"   <myapp:System>\n"
-"      ...\n"
-"   </myapp:System>\n"
-"\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
-"          xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"          xsi:schemaLocation=\"urn:java:javax.webbeans http://java.sun.com/"
-"jee/web-beans-1.0.xsd\n"
-"                              urn:java:com.mydomain.myapp http://mydomain."
-"com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"    <myapp:System>\n"
-"        ...\n"
-"    </myapp:System>\n"
-"\n"
-"</WebBeans>]]>"
-
 #. Tag: para
-#: xml.xml:149
 #, fuzzy, no-c-format
 msgid ""
 "Writing an XML schema is quite tedious. Therefore, the Weld project will "
@@ -447,6 +249,159 @@
 "ジェクトは、コンパイルされた Java コードから自動的に XML スキーマを生み出す"
 "ツールを提供します。"
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:util=\"urn:java:java.util\">\n"
+#~ "   <util:Date/>\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
+#~ "          xmlns:util=\"urn:java:java.util\">\n"
+#~ "\n"
+#~ "    <util:Date/>\n"
+#~ "\n"
+#~ "</WebBeans>]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[private @Inject Date date;]]>"
+#~ msgstr "<![CDATA[@Current Date date]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "   <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "    <SessionScoped/>\n"
+#~ "    <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "    <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "   <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myapp:Login/>\n"
+#~ "   <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:SystemStart/>\n"
+#~ "   <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "    <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "    <SessionScoped/>\n"
+#~ "    <myapp:Login/>\n"
+#~ "    <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "    <ApplicationScoped/>\n"
+#~ "    <myapp:SystemStart/>\n"
+#~ "    <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[private @Inject Date currentTime;\n"
+#~ "private @Login Date loginTime;\n"
+#~ "private @SystemStart Date systemStartTime;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Current Date currentTime;\n"
+#~ "@Login Date loginTime;\n"
+#~ "@SystemStart Date systemStartTime;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "   <myapp:PayByCheque/>\n"
+#~ "   <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "    <myapp:PayByCheque/>\n"
+#~ "    <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "   <Interceptor/>\n"
+#~ "   <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "    <Interceptor/>\n"
+#~ "    <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:admin>\n"
+#~ "      <myapp:Name>\n"
+#~ "         <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "         <myapp:lastname>King</myapp:lastname>\n"
+#~ "         <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "      </myapp:Name>\n"
+#~ "   </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "    <ApplicationScoped/>\n"
+#~ "    <myapp:admin>\n"
+#~ "        <myapp:Name>\n"
+#~ "            <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "            <myapp:lastname>King</myapp:lastname>\n"
+#~ "            <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "        </myapp:Name>\n"
+#~ "    </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/"
+#~ "beans-1.0.xsd\n"
+#~ "   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "   <myapp:System>\n"
+#~ "      ...\n"
+#~ "   </myapp:System>\n"
+#~ "\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
+#~ "          xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "          xsi:schemaLocation=\"urn:java:javax.webbeans http://java.sun."
+#~ "com/jee/web-beans-1.0.xsd\n"
+#~ "                              urn:java:com.mydomain.myapp http://mydomain."
+#~ "com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "    <myapp:System>\n"
+#~ "        ...\n"
+#~ "    </myapp:System>\n"
+#~ "\n"
+#~ "</WebBeans>]]>"
+
 #~ msgid "In either of these cases, Web Beans gives us two options:"
 #~ msgstr ""
 #~ "これらのケースのどちらででも、 Web Beans は二つのオプションを与えます。"

Modified: doc/trunk/reference/ko-KR/Author_Group.po
===================================================================
--- doc/trunk/reference/ko-KR/Author_Group.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/Author_Group.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Author_Group\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-08 10:32+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -19,109 +19,128 @@
 "\n"
 "\n"
 
-#. Tag: author
-#: Author_Group.xml:5
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Gavin</firstname> <surname>King</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+msgid "Gavin"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:8
 #, no-c-format
 msgid "JSR-299: Contexts and Dependency Injection Lead"
 msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:14
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+msgid "Pete"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:17
 #, no-c-format
 msgid "Weld (JSR-299 RI) Lead"
 msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:24
-#, fuzzy, no-c-format
-msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Dan"
+msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:31
-#, fuzzy, no-c-format
-msgid "<firstname>David</firstname> <surname>Allen</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "David"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:35
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
-msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+msgid "Nicola"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:38 Author_Group.xml:67
 #, no-c-format
 msgid "Italian Translation"
 msgstr "이탈리아어 번역 "
 
-#. Tag: othercredit
-#: Author_Group.xml:40
-#, fuzzy, no-c-format
-msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Gladys"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:43
 #, fuzzy, no-c-format
 msgid "Spanish Translation"
 msgstr "이탈리아어 번역 "
 
-#. Tag: othercredit
-#: Author_Group.xml:48
-#, fuzzy, no-c-format
-msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Eun-Ju"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:51
 #, fuzzy, no-c-format
 msgid "Korean Translation"
 msgstr "이탈리아어 번역 "
 
-#. Tag: othercredit
-#: Author_Group.xml:56
-#, fuzzy, no-c-format
-msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Terry"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:59
 #, fuzzy, no-c-format
 msgid "Traditional Chinese Translation"
 msgstr "이탈리아어 번역 "
 
-#. Tag: othercredit
-#: Author_Group.xml:64
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
-msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+msgid "Francesco"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:69
-#, fuzzy, no-c-format
-msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Sean"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:72
 #, fuzzy, no-c-format
 msgid "Simplified Chinese Translation"
 msgstr "이탈리아어 번역 "
 
+#~ msgid "<firstname>Gavin</firstname> <surname>King</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#~ msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
 #, fuzzy
+#~ msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>David</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#~ msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+#~ msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
+#~ msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+#~ msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
+#, fuzzy
 #~ msgid ""
 #~ "<jobtitle>JSR-299 specification lead</jobtitle> <orgname>Red Hat "
 #~ "Middleware LLC</orgname>"

Modified: doc/trunk/reference/ko-KR/Book_Info.po
===================================================================
--- doc/trunk/reference/ko-KR/Book_Info.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/Book_Info.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Book_Info\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-08 16:25+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -21,13 +21,11 @@
 "\n"
 
 #. Tag: title
-#: Book_Info.xml:4
 #, no-c-format
 msgid "Weld - JSR-299 Reference Implementation"
 msgstr ""
 
 #. Tag: subtitle
-#: Book_Info.xml:5
 #, fuzzy, no-c-format
 msgid ""
 "JSR-299: The new Java standard for dependency injection and contextual "

Modified: doc/trunk/reference/ko-KR/beans.po
===================================================================
--- doc/trunk/reference/ko-KR/beans.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/beans.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: beans.xml:4
 #, no-c-format
 msgid "More about beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:6
 #, no-c-format
 msgid ""
 "A bean is usually an application class that contains business logic. It may "
@@ -32,7 +30,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:13
 #, no-c-format
 msgid ""
 "Let's back up a second. What does it really mean to be <emphasis>contextual</"
@@ -45,7 +42,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:21
 #, no-c-format
 msgid ""
 "However, like a stateless or singleton model, but <emphasis>unlike</"
@@ -55,19 +51,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:29
 #, no-c-format
 msgid "the lifecycle of each instance of the bean and"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:32
 #, no-c-format
 msgid "which clients share a reference to a particular instance of the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:36
 #, no-c-format
 msgid ""
 "For a given thread in a CDI application, there may be an <emphasis>active "
@@ -78,7 +71,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:43
 #, no-c-format
 msgid ""
 "Clients (for example, other beans) executing in the same context will see "
@@ -87,7 +79,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:49
 #, no-c-format
 msgid ""
 "One great advantage of the contextual model is that it allows stateful beans "
@@ -99,46 +90,39 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:58
 #, no-c-format
 msgid "they interact via well-defined public APIs"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:61
 #, no-c-format
 msgid "their lifecycles are completely decoupled"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:65
 #, no-c-format
 msgid ""
 "We can replace one bean with another different bean that implements the same "
 "interface and has a different lifecycle (a different scope) without "
 "affecting the other bean implementation. In fact, CDI defines a simple "
 "facility for overriding bean implementations at deployment time, as we will "
-"see in <xref linkend=\"alternatives\"/>."
+"see in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:71
 #, no-c-format
 msgid ""
 "Note that not all clients of a bean are beans themselves. Other objects such "
-"as servlets or message-driven beans&#8212;which are by nature not "
-"injectable, contextual objects&#8212;may also obtain references to beans by "
-"injection."
+"as servlets or message-driven beans—which are by nature not injectable, "
+"contextual objects—may also obtain references to beans by injection."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:78
 #, no-c-format
 msgid "The anatomy of a bean"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:80
 #, no-c-format
 msgid ""
 "Enough hand-waving. More formally, the anatomy of a bean, according to the "
@@ -146,67 +130,56 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:84
 #, no-c-format
 msgid "A bean comprises the following attributes:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:87
 #, no-c-format
 msgid "A (nonempty) set of bean types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:88
 #, no-c-format
 msgid "A (nonempty) set of qualifiers"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:89
 #, no-c-format
 msgid "A scope"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:90
 #, no-c-format
 msgid "Optionally, a bean EL name"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:91
 #, no-c-format
 msgid "A set of interceptor bindings"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:92
 #, no-c-format
 msgid "A bean implementation"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:95
 #, no-c-format
 msgid "Furthermore, a bean may or may not be an alternative."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:99
 #, no-c-format
 msgid "Let's see what all this new terminology means."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:102
 #, no-c-format
 msgid "Bean types, qualifiers and dependency injection"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:104
 #, no-c-format
 msgid ""
 "Beans usually acquire references to other beans via dependency injection. "
@@ -215,19 +188,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:110
 #, no-c-format
 msgid "a bean type, together with"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:111
 #, no-c-format
 msgid "a set of qualifiers."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:114
 #, no-c-format
 msgid ""
 "A bean type is a user-defined class or interface; a type that is client-"
@@ -237,19 +207,7 @@
 "types:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:120
-#, no-c-format
-msgid ""
-"<![CDATA[public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:122
 #, no-c-format
 msgid ""
 "The bean types are <literal>BookShop</literal>, <literal>Business</literal> "
@@ -259,7 +217,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:128
 #, no-c-format
 msgid ""
 "Meanwhile, this session bean has only the local interfaces "
@@ -268,29 +225,17 @@
 "<literal>BookShopBean</literal> is not a client-visible type."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"public class BookShopBean \n"
-"      extends Business \n"
-"      implements BookShop, Auditable {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:137
 #, no-c-format
 msgid ""
-"Most bean types you can probably figure out. One gotcha is primitive types. "
-"All primitive types are assumed to be identical to their corresponding "
-"wrapper types in <literal>java.lang</literal>."
+"The bean types of a session bean include local interfaces and the bean class "
+"local view (if any). EJB remote interfaces are not considered bean types of "
+"a session bean. You can't inject an EJB using its remote interface unless "
+"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
+"linkend=\"resources\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:143
 #, no-c-format
 msgid ""
 "Bean types may be restricted to an explicit set by annotating the bean with "
@@ -300,20 +245,7 @@
 "<literal>java.lang.Object</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:149
-#, no-c-format
-msgid ""
-"<![CDATA[@Typed(Shop.class)\n"
-"public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:151
 #, no-c-format
 msgid ""
 "Sometimes, a bean type alone does not provide enough information for the "
@@ -328,7 +260,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:160
 #, no-c-format
 msgid ""
 "A qualifier is a user-defined annotation that is itself annotated "
@@ -337,18 +268,7 @@
 "string-based names. Here's an example of a qualifier annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:166
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface CreditCard {}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:168
 #, no-c-format
 msgid ""
 "You may not be used to seeing the definition of an annotation. In fact, this "
@@ -358,7 +278,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:175
 #, no-c-format
 msgid ""
 "Pay attention to the names of the built-in annotations in CDI and EJB. "
@@ -368,7 +287,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:182
 #, no-c-format
 msgid ""
 "Now that we have defined a qualifier annotation, we can use it to "
@@ -377,14 +295,7 @@
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:188
-#, no-c-format
-msgid "<![CDATA[@Inject @CreditCard PaymentProcessor paymentProcessor]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:191
 #, no-c-format
 msgid ""
 "If an injection point does not explicitly specify a qualifier, it has the "
@@ -392,7 +303,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:197
 #, no-c-format
 msgid ""
 "For each injection point, the container searches for a bean which satisfies "
@@ -402,7 +312,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:203
 #, no-c-format
 msgid ""
 "How do we specify that qualifiers of a bean? By annotating the bean class, "
@@ -411,17 +320,7 @@
 "Therefore, it satisfies our qualified injection point:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:209
-#, no-c-format
-msgid ""
-"<![CDATA[@CreditCard\n"
-"public class CreditCardPaymentProcessor \n"
-"    implements PaymentProcessor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:212
 #, no-c-format
 msgid ""
 "If a bean does not explicitly specify a qualifier, it has the default "
@@ -429,23 +328,20 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:225
 #, no-c-format
 msgid ""
 "That's not quite the end of the story. CDI also defines a simple "
 "<emphasis>resolution rule</emphasis> that helps the container decide what to "
 "do if there is more than one bean that satisfies a particular contract. "
-"We'll get into the details in <xref linkend=\"injection\"/>."
+"We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:245
 #, no-c-format
 msgid "Scope"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:248
 #, no-c-format
 msgid ""
 "The <emphasis>scope</emphasis> of a bean defines the lifecycle and "
@@ -456,23 +352,13 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:255
 #, no-c-format
 msgid ""
 "For example, any web application may have <emphasis>session scoped</"
 "emphasis> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:259
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:261
 #, no-c-format
 msgid ""
 "An instance of a session-scoped bean is bound to a user session and is "
@@ -480,7 +366,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:265
 #, no-c-format
 msgid ""
 "Keep in mind that once a bean is bound to a context, it remains in that "
@@ -491,7 +376,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:273
 #, no-c-format
 msgid ""
 "If a scope is not explicitly specified, then the bean belongs to a special "
@@ -501,19 +385,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:279
 #, no-c-format
-msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\"/>."
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:284
 #, no-c-format
 msgid "EL name"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:286
 #, no-c-format
 msgid ""
 "If you want to reference a bean in non-Java code that supports Unified EL "
@@ -522,38 +403,18 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:291
 #, no-c-format
 msgid ""
 "The EL name is specified using the <literal>@Named</literal> annotation, as "
 "shown here:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:295
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named(\"cart\")\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:297
 #, no-c-format
 msgid "Now we can easily use the bean in any JSF or JSP page:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:299
-#, no-c-format
-msgid ""
-"<![CDATA[<h:dataTable value=\"#{cart.lineItems}\" var=\"item\">\n"
-"   ...\n"
-"</h:dataTable>]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:302
 #, no-c-format
 msgid ""
 "The <literal>@Named</literal> annotation is not what makes the class a bean. "
@@ -563,23 +424,13 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:309
 #, no-c-format
 msgid ""
 "We can let CDI choose a name for us by leaving off the value of the "
 "<literal>@Named</literal> annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:313
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:315
 #, no-c-format
 msgid ""
 "The name defaults to the unqualified class name, decapitalized; in this "
@@ -587,13 +438,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:325
 #, no-c-format
 msgid "Alternatives"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:327
 #, no-c-format
 msgid ""
 "We've already seen how qualifiers let us choose between multiple "
@@ -605,42 +454,30 @@
 "literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:335
-#, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class MockPaymentProcessor extends PaymentProcessorImpl { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:337
 #, no-c-format
 msgid ""
 "We normally annotate a bean <literal>@Alternative</literal> only when there "
 "is some other implementation of an interface it implements (or of any of its "
 "bean types). We can choose between alternatives at deployment time by "
 "<emphasis>selecting</emphasis> an alternative in the CDI deployment "
-"descriptor <literal>META-INF/beans.xml</literal> of the JAR or Java EE "
+"descriptor <literal>META-INF/beans.xml</literal> of the jar or Java EE "
 "module that uses it. Different modules can specify that they use different "
 "alternatives."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:345
 #, no-c-format
 msgid ""
-"We cover alternatives in more detail in <xref linkend=\"alternatives\"/>."
+"We cover alternatives in more detail in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:352
 #, no-c-format
 msgid "Interceptor binding types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:354
 #, no-c-format
 msgid ""
 "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, "
@@ -651,7 +488,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:361
 #, no-c-format
 msgid ""
 "The way that interceptors were defined in Java EE 5 was counter-intuitive. "
@@ -668,7 +504,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:372
 #, no-c-format
 msgid ""
 "CDI provides a new approach to binding interceptors to beans that introduces "
@@ -678,7 +513,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:378
 #, no-c-format
 msgid ""
 "An interceptor binding type is a user-defined annotation that is itself "
@@ -687,51 +521,21 @@
 "two classes."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:383
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Inherited\n"
-"@Target( { TYPE, METHOD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:385
 #, no-c-format
 msgid ""
 "The interceptor that implements transaction management declares this "
 "annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[public @Transactional @Interceptor\n"
-"class TransactionInterceptor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:391
 #, no-c-format
 msgid ""
 "We can apply the interceptor to a bean by annotating the bean class with the "
 "same interceptor binding type:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:395
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Transactional\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:397
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
@@ -740,32 +544,28 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:402
 #, no-c-format
 msgid ""
 "Interceptors are deployment-specific. (We don't need a "
 "<literal>TransactionInterceptor</literal> in our unit tests!) By default, an "
 "interceptor is disabled. We can enable an interceptor using the CDI "
-"deployment descriptor <literal>META-INF/beans.xml</literal> of the JAR or "
+"deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or "
 "Java EE module. This is also where we specify the interceptor ordering."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:409
 #, no-c-format
 msgid ""
 "We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
-"\"interceptors\"/> and <xref linkend=\"decorators\"/>."
+"\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:419
 #, no-c-format
 msgid "What kinds of classes are beans?"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:421
 #, no-c-format
 msgid ""
 "We've already seen two types of beans: JavaBeans and EJB session beans. Is "
@@ -774,13 +574,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:428
 #, no-c-format
 msgid "Managed beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:430
 #, no-c-format
 msgid ""
 "A managed bean is a Java class. The basic lifecycle and semantics of a "
@@ -792,19 +590,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:441
 #, no-c-format
 msgid "It is not a non-static inner class."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:444
 #, no-c-format
 msgid "It is a concrete class, or is annotated <literal>@Decorator</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:447
 #, no-c-format
 msgid ""
 "It is not annotated with an EJB component-defining annotation or declared as "
@@ -812,7 +607,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:453
 #, no-c-format
 msgid ""
 "It does not implement <literal>javax.enterprise.inject.spi.Extension</"
@@ -820,34 +614,41 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:456
 #, no-c-format
-msgid "It has an appropriate constructor&#8212;either:"
+msgid "It has an appropriate constructor—either:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:461
 #, no-c-format
 msgid "the class has a constructor with no parameters, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:464
 #, no-c-format
 msgid "the class declares a constructor annotated <literal>@Inject</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:472
 #, no-c-format
 msgid ""
+"According to this definition, JPA entities are technically managed beans. "
+"However, entities have their own special lifecycle, state and identity model "
+"and are usually instantiated by JPA or using <literal>new</literal>. "
+"Therefore we don't recommend directly injecting an entity class. We "
+"especially recommend against assigning a scope other than "
+"<literal>@Dependent</literal> to an entity class, since JPA is not able to "
+"persist injected CDI proxies."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The unrestricted set of bean types for a managed bean contains the bean "
 "class, every superclass and all interfaces it implements directly or "
 "indirectly."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:475
 #, no-c-format
 msgid ""
 "If a managed bean has a public field, it must have the default scope "
@@ -855,7 +656,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:477
 #, no-c-format
 msgid ""
 "Managed beans support the <literal>@PostConstruct</literal> and "
@@ -863,7 +663,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:480
 #, no-c-format
 msgid ""
 "Session beans are also, technically, managed beans. However, since they have "
@@ -873,13 +672,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:489
 #, no-c-format
 msgid "Session beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:491
 #, no-c-format
 msgid ""
 "Session beans belong to the EJB specification. They have a special "
@@ -892,7 +689,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:500
 #, no-c-format
 msgid ""
 "Message-driven and entity beans are by nature non-contextual objects and may "
@@ -904,7 +700,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:508
 #, no-c-format
 msgid ""
 "The unrestricted set of bean types for a session bean contains all local "
@@ -916,7 +711,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:516
 #, no-c-format
 msgid ""
 "There's no reason to explicitly declare the scope of a stateless session "
@@ -927,20 +721,18 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:520
 #, no-c-format
 msgid ""
 "Stateful session beans may define a <emphasis>remove method</emphasis>, "
 "annotated <literal>@Remove</literal>, that is used by the application to "
 "indicate that an instance should be destroyed. However, for a contextual "
-"instance of the bean&#8212;an instance under the control of CDI&#8212;this "
-"method may only be called by the application if the bean has scope "
-"<literal>@Dependent</literal>. For beans with other scopes, the application "
-"must let the container destroy the bean."
+"instance of the bean—an instance under the control of CDI—this method may "
+"only be called by the application if the bean has scope <literal>@Dependent</"
+"literal>. For beans with other scopes, the application must let the "
+"container destroy the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:528
 #, no-c-format
 msgid ""
 "So, when should we use a session bean instead of a plain managed bean? "
@@ -948,19 +740,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:535
 #, no-c-format
 msgid "method-level transaction management and security,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:538
 #, no-c-format
 msgid "concurrency management,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:541
 #, no-c-format
 msgid ""
 "instance-level passivation for stateful session beans and instance-pooling "
@@ -968,19 +757,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:545
 #, no-c-format
 msgid "remote or web service invocation, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:548
 #, no-c-format
 msgid "timers and asynchronous methods,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:552
 #, no-c-format
 msgid ""
 "When we don't need any of these things, an ordinary managed bean will serve "
@@ -988,7 +774,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:554
 #, no-c-format
 msgid ""
 "Many beans (including any <literal>@SessionScoped</literal> or "
@@ -998,7 +783,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:560
 #, no-c-format
 msgid ""
 "Beans which hold references to heavy-weight resources, or hold a lot of "
@@ -1008,7 +792,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:566
 #, no-c-format
 msgid ""
 "Finally, it's usually obvious when method-level transaction management, "
@@ -1017,7 +800,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:571
 #, no-c-format
 msgid ""
 "The point we're trying to make is: use a session bean when you need the "
@@ -1030,7 +812,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:579
 #, no-c-format
 msgid ""
 "On the other hand, don't be scared to use session beans just because you've "
@@ -1043,13 +824,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:590
 #, no-c-format
 msgid "Producer methods"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:592
 #, no-c-format
 msgid ""
 "Not everything that needs to be injected can be boiled down to a bean class "
@@ -1061,7 +840,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:600
 #, no-c-format
 msgid ""
 "A <emphasis>producer method</emphasis> is a method that acts as a source of "
@@ -1072,64 +850,31 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:607
 #, no-c-format
 msgid ""
 "A producer method is declared by annotating a method of a bean class with "
 "the <literal>@Produces</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:612
-#, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class RandomNumberGenerator {\n"
-"   \n"
-"   private Random random = new Random(System.currentTimeMillis());\n"
-"       \n"
-"   @Produces @Named @Random int getRandomNumber() {\n"
-"      return random.nextInt(100);\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:614
 #, no-c-format
 msgid ""
 "We can't write a bean class that is itself a random number. But we can "
 "certainly write a method that returns a random number. By making the method "
-"a producer method, we allow the return value of the method&#8212;in this "
-"case an <literal>Integer</literal>&#8212;to be injected. We can even specify "
-"a qualifier&#8212;in this case <literal>@Random</literal>, a scope&#8212;"
-"which in this case defaults to <literal>@Dependent</literal>, and an EL "
-"name&#8212;which in this case defaults to <literal>randomNumber</literal> "
-"according to the JavaBeans property name convention. Now we can get a random "
-"number anywhere:"
+"a producer method, we allow the return value of the method—in this case an "
+"<literal>Integer</literal>—to be injected. We can even specify a qualifier—"
+"in this case <literal>@Random</literal>, a scope—which in this case defaults "
+"to <literal>@Dependent</literal>, and an EL name—which in this case defaults "
+"to <literal>randomNumber</literal> according to the JavaBeans property name "
+"convention. Now we can get a random number anywhere:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:623
-#, no-c-format
-msgid "<![CDATA[@Inject @Random int randomNumber;]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:625
 #, no-c-format
 msgid "Even in a Unified EL expression:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:629
-#, no-c-format
-msgid "<![CDATA[<p>Your raffle number is #{randomNumber}.</p>]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:631
 #, no-c-format
 msgid ""
 "A producer method must be a non-abstract method of a managed bean class or "
@@ -1139,13 +884,11 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:637
 #, no-c-format
 msgid "The bean types of a producer method depend upon the method return type:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:643
 #, no-c-format
 msgid ""
 "If the return type is an interface, the unrestricted set of bean types "
@@ -1154,7 +897,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:649
 #, no-c-format
 msgid ""
 "If a return type is primitive or is a Java array type, the unrestricted set "
@@ -1163,7 +905,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:655
 #, no-c-format
 msgid ""
 "If the return type is a class, the unrestricted set of bean types contains "
@@ -1172,59 +913,43 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:662
 #, no-c-format
 msgid ""
-"If the producer method has method parameters, the container will look for a "
-"bean that satisfies the type and qualifiers of each parameter and pass it to "
-"the method automatically&#8212;another form of dependency injection."
+"Producer methods and fields may have a primitive bean type. For the purpose "
+"of resolving dependencies, primitive types are considered to be identical to "
+"their corresponding wrapper types in <literal>java.lang</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:668
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Produces Set<Roles> getRoles(User user) {\n"
-"   return user.getRoles();\n"
-"}]]>"
+"If the producer method has method parameters, the container will look for a "
+"bean that satisfies the type and qualifiers of each parameter and pass it to "
+"the method automatically—another form of dependency injection."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:670
 #, no-c-format
 msgid ""
 "We'll talk much more about producer methods in <xref linkend="
-"\"producermethods\"/>."
+"\"producermethods\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:675
 #, no-c-format
 msgid "Producer fields"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:677
 #, no-c-format
 msgid ""
 "A <emphasis>producer field</emphasis> is a simpler alternative to a producer "
 "method. A producer field is declared by annotating a field of a bean class "
-"with the <literal>@Produces</literal> annotation&#8212;the same annotation "
-"used for producer methods."
+"with the <literal>@Produces</literal> annotation—the same annotation used "
+"for producer methods."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:683
-#, no-c-format
-msgid ""
-"<![CDATA[public class Shop {\n"
-"   @Produces PaymentProcessor paymentProcessor = ....;\n"
-"   @Produces @Catalog List<Product> products = ....;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:685
 #, no-c-format
 msgid ""
 "The rules for determining the bean types of a producer field parallel the "
@@ -1232,415 +957,12 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:689
 #, no-c-format
 msgid ""
 "A producer field is really just a shortcut that lets us avoid writing a "
 "useless getter method. However, in addition to convenience, producer fields "
 "serve a specific purpose as an adaptor for Java EE component environment "
 "injection, but to learn more about that, you'll have to wait until <xref "
-"linkend=\"resources\"/>. Because we can't wait to get to work on some "
+"linkend=\"resources\" />. Because we can't wait to get to work on some "
 "examples."
 msgstr ""
-
-#. Tag: title
-#: beans.xml:701
-#, no-c-format
-msgid "The (minimal) bean descriptor"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:703
-#, no-c-format
-msgid ""
-"First, it's important to understand that the XML bean descriptor in CDI "
-"(beans.xml) is not there to define beans in XML, like in other popular bean "
-"containers. Rather, you use this file to enable CDI services for the current "
-"bean archive that is difficult to define consistently in Java or which you "
-"don't want to define in Java (e.g., to accomodate testing)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:710
-#, no-c-format
-msgid ""
-"For example, the XML is used to enable interceptors (which are disabled by "
-"default) and define interceptor ordering. So the bean descriptor "
-"<emphasis>complements</emphasis> the metadata that is provided in the Java "
-"language syntax. (You may still want to define beans in XML for other "
-"reasons, but that is the concern of an extension)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:717
-#, no-c-format
-msgid ""
-"Let's first ask why the beans.xml is required, then look at what services it "
-"is used used to enable."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:722
-#, no-c-format
-msgid "Why is beans.xml required?"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:724
-#, no-c-format
-msgid ""
-"You may be wondering, if beans are not described using XML, why do we need "
-"beans.xml at all, particularly if you don't have anything that you would "
-"need the bean descriptor to enable (alternatives, interceptors or "
-"decorators)?"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:730
-#, no-c-format
-msgid "There are two things about CDI that we need to keep in mind:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:736
-#, no-c-format
-msgid ""
-"CDI does not require any special declaration for a Java class to be injected "
-"- that's right, no annotation or XML declaration at all!"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:742
-#, no-c-format
-msgid ""
-"CDI does not define any special kind of module - CDI beans can be deployed "
-"in a library JAR, EJB JAR, WAR, RAR, or JVM classpath directory."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:749
-#, no-c-format
-msgid ""
-"The CDI specification calls the process of identifying beans in modules "
-"<emphasis>bean discovery</emphasis>."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:753
-#, no-c-format
-msgid ""
-"So there are potentially a lot of classes in the classpath which might be "
-"beans! We don't want to force the container to scan every one of those "
-"classes at startup and build its internal metamodel for each of them. This "
-"really could make bean discovery very slow."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:759
-#, no-c-format
-msgid ""
-"But there's another reason we need to give the user some control over which "
-"classes are available for injection. We don't want every class in the "
-"classpath to potentially match an injection point, including classes that "
-"were never intended to be injected into things. This would force the "
-"developer to have to use qualifiers much more often to disambiguate "
-"injection points."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:766
-#, no-c-format
-msgid "So we have two choices. We could have the developer:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:772
-#, no-c-format
-msgid "explicitly exclude modules which do not contain beans, or"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:775
-#, no-c-format
-msgid "explicitly declare modules which do contain beans."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:779
-#, no-c-format
-msgid ""
-"It should be clear that the second option is a much better way to go. Thus, "
-"CDI has the notion of a bean archive. A bean archive is just a module that "
-"has a file named beans.xml in the META-INF directory. The container looks "
-"for beans in bean archives. It ignores other modules."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:785
-#, no-c-format
-msgid ""
-"Now, you might be wondering if we've got the granularity wrong here. Why "
-"should module be the right criteria to use for including/excluding a class. "
-"Why not consider:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:792
-#, no-c-format
-msgid "a class-level annotation,"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:795
-#, no-c-format
-msgid "the package,"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:798
-#, no-c-format
-msgid "some type it implements or extends, or"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:801
-#, no-c-format
-msgid "some naming convention."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:805
-#, no-c-format
-msgid ""
-"We've got the first option covered. Annotate a bean <literal>@Alternative</"
-"literal>, or with an alternative stereotype, and it will be considered "
-"disabled by CDI, as long as you don't explicitly enable it in beans.xml. "
-"That's not quite the same thing as excluding the class from scanning "
-"altogether, but it's close. (One difference is that a portable extension "
-"with still get a <literal>ProcessAnnotatedType</literal> event for that "
-"class)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:813
-#, no-c-format
-msgid ""
-"A future version of CDI might allow you to declare excluded packages in "
-"beans.xml. Excluding a bean by type or naming convention isn't really that "
-"appealing. In the world of CDI, we use stereotypes for identifying "
-"architectural roles. We don't use marker interfaces or naming conventions. "
-"Names really shouldn't affect functionality as it is too fragile."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:820
-#, no-c-format
-msgid "Enough theory, what elements are available in beans.xml?"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:826
-#, no-c-format
-msgid "Bean descriptor schema"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:828
-#, no-c-format
-msgid ""
-"If you don't need to activate any interceptors, decorators or alternatives "
-"(you just have plain beans that you need to use in an archive), the beans."
-"xml file can be <emphasis>empty</emphasis>. If you do have one of these "
-"requirements, then you need to start popularing the descriptor."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:834
-#, no-c-format
-msgid ""
-"The root element of a beans.xml file is <literal>beans</literal>, with the "
-"following <ulink url=\"http://anonsvn.jboss.org/repos/weld/api/trunk/cdi/src/"
-"main/resources/beans.xsd\">schema</ulink>:"
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:839
-#, no-c-format
-msgid ""
-"<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<beans xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee \n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"</beans>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:841
-#, no-c-format
-msgid ""
-"The <literal>beans</literal> element can have one or more of each of the "
-"following children:"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:847
-#, no-c-format
-msgid "interceptors"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:850
-#, no-c-format
-msgid "decorators"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:853
-#, no-c-format
-msgid "alternatives"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:857
-#, no-c-format
-msgid "Let's look at each element in detail."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:862
-#, no-c-format
-msgid "&lt;interceptors&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:864
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled interceptors bound via interceptor "
-"bindings. An interceptor must be explicitly enabled by listing the fully "
-"qualified class name in a child &lt;class&gt; element of &lt;"
-"interceptors&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:870
-#, no-c-format
-msgid ""
-"There may be zero or more interceptor class elements. The order of the class "
-"declarations determines the interceptor ordering. Interceptors which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an interceptor "
-"class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:877
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.intercept.SecurityInterceptor</class>\n"
-"   <class>com.acme.intercept.TransactionInterceptor</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:883
-#, no-c-format
-msgid "&lt;decorators&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:885
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled decorators. A decorator must be "
-"explicitly enabled by listing the fully qualified class name in a child &lt;"
-"class&gt; element of &lt;decorators&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:891
-#, no-c-format
-msgid ""
-"There may be zero or more decorator class elements. The order of the class "
-"declarations determines the decorator ordering. Decorators which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an decorator class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:898
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.decorate.BigAccountDecorator</class>\n"
-"   <class>com.acme.decorate.SpecialGiftDecorator</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:903
-#, no-c-format
-msgid "&lt;alternatives&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:905
-#, no-c-format
-msgid ""
-"An alternative is a bean that must be explicitly declared in the beans.xml "
-"file if it should be available for lookup, injection or EL resolution. By "
-"default, a bean archive has no active alternatives. An alternative must be "
-"explicitly declared using the fully qualified bean class name or stereotype "
-"class name in either a child &lt;class&gt; or &lt;stereotype&gt; element of "
-"&lt;alternatives&gt;, respectively."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:913
-#, no-c-format
-msgid ""
-"An alternative is selected for the bean archive if either: the alternative "
-"is a managed bean or session bean and the bean class of the bean is listed, "
-"or the alternative is a producer method, field or resource, and the bean "
-"class that declares the method or field is listed, or any "
-"<literal>@Alternative</literal> stereotype of the alternative is listed."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:920
-#, no-c-format
-msgid ""
-"There may be zero or more alternative bean class elements. The same class "
-"may not be listed twice. And of course, the class must exist and it must be "
-"an alternative bean class."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:925
-#, no-c-format
-msgid ""
-"There may also be zero or more <literal>@Alternative</literal> stereotype "
-"elements. The same stereotype may not be listed twice. And of course, the "
-"stereotype class must exist and it must be an stereotype annotation."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:931
-#, no-c-format
-msgid ""
-"<![CDATA[<stereotypes>\n"
-"   <class>com.acme.business.MockPaymentProcessor</class>\n"
-"   <stereotype>com.acme.stereotype.Mock</stereotype>\n"
-"</stereotypes>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:935
-#, no-c-format
-msgid ""
-"And that's it! A very simple schema, used only to activate and order CDI "
-"services."
-msgstr ""

Modified: doc/trunk/reference/ko-KR/decorators.po
===================================================================
--- doc/trunk/reference/ko-KR/decorators.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/decorators.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: decorators\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-23 11:19+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -25,13 +25,11 @@
 "\n"
 
 #. Tag: title
-#: decorators.xml:5
 #, no-c-format
 msgid "Decorators"
 msgstr "데코레이터 "
 
 #. Tag: para
-#: decorators.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors are a powerful way to capture and separate concerns which are "
@@ -50,7 +48,6 @@
 "다.  "
 
 #. Tag: para
-#: decorators.xml:15
 #, fuzzy, no-c-format
 msgid ""
 "The reverse is true of <emphasis>decorators</emphasis>. A decorator "
@@ -71,31 +68,11 @@
 "다. "
 
 #. Tag: para
-#: decorators.xml:24
 #, no-c-format
 msgid "Suppose we have an interface that represents accounts:"
 msgstr "어카운트를 나타내는 인터페이스가 있다고 가정합니다: "
 
-#. Tag: programlisting
-#: decorators.xml:26
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface Account {\n"
-"   public BigDecimal getBalance();\n"
-"   public User getOwner();\n"
-"   public void withdraw(BigDecimal amount);\n"
-"   public void deposit(BigDecimal amount);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface Account {\n"
-"    public BigDecimal getBalance();\n"
-"    public User getOwner();\n"
-"    public void withdraw(BigDecimal amount);\n"
-"    public void deposit(BigDecimal amount);\n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:28
 #, fuzzy, no-c-format
 msgid ""
 "Several different beans in our system implement the <literal>Account</"
@@ -109,7 +86,6 @@
 "레이터의 뛰어난 작업 기능입니다.  "
 
 #. Tag: para
-#: decorators.xml:34
 #, fuzzy, no-c-format
 msgid ""
 "A decorator is a bean (possibly even an abstract class) that implements the "
@@ -118,74 +94,14 @@
 "데코레이터는 심플 Web Bean으로 유형을 구현하고 <literal>@Decorator</literal>"
 "를 어노테이션합니다.   "
 
-#. Tag: programlisting
-#: decorators.xml:39
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[<Decorators>\n"
-"    <myapp:LargeTransactionDecorator/>\n"
-"</Decorators>]]>"
-
 #. Tag: para
-#: decorators.xml:41
 #, no-c-format
 msgid ""
 "The decorator implements the methods of the decorated type that it wants to "
 "intercept."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:45
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      ...\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator \n"
-"        implements Account {\n"
-"    \n"
-"    @Decorates Account account;\n"
-"    \n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    public void withdraw(BigDecimal amount) {\n"
-"        account.withdraw(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedWithdrawl(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"    public void deposit(BigDecimal amount);\n"
-"        account.deposit(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedDeposit(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "Unlike other beans, a decorator may be an abstract class. Therefore, if "
@@ -197,7 +113,6 @@
 "을 경우, 이 방식을 구현하실 필요가 없습니다.     "
 
 #. Tag: para
-#: decorators.xml:52
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors for a method are called before decorators that apply to the "
@@ -205,13 +120,11 @@
 msgstr "데코레이터를 적용하기 전 해당 방식의 인터셉터를 호출합니다. "
 
 #. Tag: title
-#: decorators.xml:57
 #, fuzzy, no-c-format
 msgid "Delegate object"
 msgstr "위임 속성 "
 
 #. Tag: para
-#: decorators.xml:59
 #, no-c-format
 msgid ""
 "Decorators have a special injection point, called the <emphasis>delegate "
@@ -221,38 +134,22 @@
 "method parameter or injected field."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:67
 #, fuzzy, no-c-format
 msgid "A decorator is bound to any bean which:"
 msgstr "데코레이터는 다음과 같은 사항이 있는 Web Bean으로 바인딩됩니다: "
 
 #. Tag: para
-#: decorators.xml:71
 #, fuzzy, no-c-format
 msgid "has the type of the delegate injection point as a bean type, and"
 msgstr "API 유형과 같은 위임 속성 유형 "
 
 #. Tag: para
-#: decorators.xml:74
 #, fuzzy, no-c-format
 msgid "has all qualifiers that are declared at the delegate injection point."
 msgstr "위임 속성에 의해 명시된 모든 바인딩 유형     "
 
 #. Tag: para
-#: decorators.xml:78
 #, fuzzy, no-c-format
 msgid ""
 "This delegate injection point specifies that the decorator is bound to all "
@@ -261,14 +158,7 @@
 "이러한 위임 속성은 <literal>Account</literal>를 구현하는 모든 Web Beans로 바"
 "인딩하는 데코레이터를 지정합니다. "
 
-#. Tag: programlisting
-#: decorators.xml:83
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
-msgstr "<![CDATA[@Decorates Account account;]]>"
-
 #. Tag: para
-#: decorators.xml:85
 #, fuzzy, no-c-format
 msgid ""
 "A delegate injection point may specify any number of qualifier annotations. "
@@ -277,14 +167,7 @@
 "위임 속성은 바인딩 어노테이션을 지정할 수 도 있습니다. 그 후 데코레이터는 동"
 "일한 바인딩을 사용하여 Web Beans로 바운딩되게 됩니다. "
 
-#. Tag: programlisting
-#: decorators.xml:90
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
-msgstr "<![CDATA[@Decorates @Foreign Account account;]]>"
-
 #. Tag: para
-#: decorators.xml:92
 #, fuzzy, no-c-format
 msgid ""
 "The decorator may invoke the delegate object, which has much the same effect "
@@ -296,64 +179,12 @@
 "<literal>InvocationContext.proceed()</literal>를 호출하는 것과 동일한 영향을 "
 "미칩니다. "
 
-#. Tag: programlisting
-#: decorators.xml:98
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      account.withdraw(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedWithdrawl(amount) );\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      account.deposit(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedDeposit(amount) );\n"
-"      }\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator \n"
-"        implements Account {\n"
-"    \n"
-"    @Decorates Account account;\n"
-"    \n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    public void withdraw(BigDecimal amount) {\n"
-"        account.withdraw(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedWithdrawl(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"    public void deposit(BigDecimal amount);\n"
-"        account.deposit(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedDeposit(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: title
-#: decorators.xml:103
 #, no-c-format
 msgid "Enabling decorators"
 msgstr "데코레이터 활성화 "
 
 #. Tag: para
-#: decorators.xml:105
 #, no-c-format
 msgid ""
 "By default, all decorators are disabled. We need to <emphasis>enable</"
@@ -361,24 +192,7 @@
 "bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:111
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <decorators>\n"
-"         <class>org.mycompany.myapp.LargeTransactionDecorator</class>\n"
-"   </decorators>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:113
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
@@ -388,7 +202,6 @@
 "명시가 인터셉터에 대해 실행하는 것과 동일한 목적을 실행합니다:  "
 
 #. Tag: para
-#: decorators.xml:120
 #, no-c-format
 msgid ""
 "it enables us to specify a total ordering for all decorators in our system, "
@@ -398,12 +211,137 @@
 "화하며, 결정적인 작업를 확인합니다 "
 
 #. Tag: para
-#: decorators.xml:126
 #, no-c-format
 msgid "it lets us enable or disable decorator classes at deployment time."
 msgstr "배치시 데코레이터 클래스를 활성화 또는 비활성화하게 합니다.   "
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "   public BigDecimal getBalance();\n"
+#~ "   public User getOwner();\n"
+#~ "   public void withdraw(BigDecimal amount);\n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "    public BigDecimal getBalance();\n"
+#~ "    public User getOwner();\n"
+#~ "    public void withdraw(BigDecimal amount);\n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[<Decorators>\n"
+#~ "    <myapp:LargeTransactionDecorator/>\n"
+#~ "</Decorators>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator \n"
+#~ "        implements Account {\n"
+#~ "    \n"
+#~ "    @Decorates Account account;\n"
+#~ "    \n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    public void withdraw(BigDecimal amount) {\n"
+#~ "        account.withdraw(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "        account.deposit(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedDeposit(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
+#~ msgstr "<![CDATA[@Decorates Account account;]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
+#~ msgstr "<![CDATA[@Decorates @Foreign Account account;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      account.withdraw(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      account.deposit(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedDeposit(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator \n"
+#~ "        implements Account {\n"
+#~ "    \n"
+#~ "    @Decorates Account account;\n"
+#~ "    \n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    public void withdraw(BigDecimal amount) {\n"
+#~ "        account.withdraw(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "        account.deposit(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedDeposit(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "All decorators have a <emphasis>delegate attribute</emphasis>. The type "
 #~ "and binding types of the delegate attribute determine which Web Beans the "
 #~ "decorator is bound to. The delegate attribute type must implement or "

Modified: doc/trunk/reference/ko-KR/dependencies.po
===================================================================
--- doc/trunk/reference/ko-KR/dependencies.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/dependencies.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: dependencies.xml:5
 #, no-c-format
 msgid "Weld project dependencies"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:7
 #, no-c-format
 msgid ""
 "This section lists compile-time and runtime dependencies for Weld. This list "
@@ -30,105 +28,88 @@
 msgstr ""
 
 #. Tag: title
-#: dependencies.xml:13
 #, no-c-format
 msgid "Artifacts coming from Sun"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:21 dependencies.xml:110
 #, no-c-format
 msgid "Artifact"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:24 dependencies.xml:113
 #, no-c-format
 msgid "Scope"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:33
+#. Tag: para
 #, no-c-format
-msgid "javax.ejb:ejb-api:3.1"
+msgid "<literal>javax.ejb:ejb-api:3.1</literal>"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:36 dependencies.xml:44 dependencies.xml:52
-#: dependencies.xml:60 dependencies.xml:68 dependencies.xml:76
-#: dependencies.xml:128
 #, no-c-format
 msgid "compile"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:41
+#. Tag: para
 #, no-c-format
-msgid "javax.faces:jsf-api:2.0"
+msgid "<literal>javax.faces:jsf-api:2.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:49
+#. Tag: para
 #, no-c-format
-msgid "javax.el:el-api:2.1"
+msgid "<literal>javax.el:el-api:2.1</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:57
+#. Tag: para
 #, no-c-format
-msgid "javax.persistence:persistence-api:2.0"
+msgid "<literal>javax.persistence:persistence-api:2.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:65
+#. Tag: para
 #, no-c-format
-msgid "javax.servlet:servlet-api:3.0"
+msgid "<literal>javax.servlet:servlet-api:3.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:73
+#. Tag: para
 #, no-c-format
-msgid "javax.interceptor:interceptor-api:1.1"
+msgid "<literal>javax.interceptor:interceptor-api:1.1</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:81
+#. Tag: para
 #, no-c-format
-msgid "org.glasfish.web:el-impl:2.1.2"
+msgid "<literal>org.glasfish.web:el-impl:2.1.2</literal>"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:84 dependencies.xml:92
 #, no-c-format
 msgid "runtime"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:89
+#. Tag: para
 #, no-c-format
-msgid "javax.faces:jsf-impl:2.0.x"
+msgid "<literal>javax.faces:jsf-impl:2.0.x</literal>"
 msgstr ""
 
 #. Tag: title
-#: dependencies.xml:101
 #, no-c-format
 msgid "Artifacts coming from Hibernate"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:116
 #, no-c-format
 msgid "Notes"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:125
+#. Tag: para
 #, no-c-format
-msgid "javax.validation:validation-api"
+msgid "<literal>javax.validation:validation-api</literal>"
 msgstr ""
 
-#. Tag: ulink
-#: dependencies.xml:131
+#. Tag: para
 #, no-c-format
-msgid "BVAL-193"
+msgid ""
+"<ulink url=\"http://opensource.atlassian.com/projects/hibernate/browse/BVAL-"
+"193\">BVAL-193</ulink>"
 msgstr ""

Modified: doc/trunk/reference/ko-KR/ee.po
===================================================================
--- doc/trunk/reference/ko-KR/ee.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/ee.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ee\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-15 02:17+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -22,13 +22,11 @@
 "\n"
 
 #. Tag: title
-#: ee.xml:4
 #, no-c-format
 msgid "Java EE integration"
 msgstr "Java EE 통합 "
 
 #. Tag: para
-#: ee.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "CDI is fully integrated into the Java EE environment. Beans have access to "
@@ -43,13 +41,11 @@
 "Driven Beans와 같은 일부 객체로 삽입될 수 도 있습니다. "
 
 #. Tag: title
-#: ee.xml:13
 #, no-c-format
 msgid "Built-in beans"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:15
 #, no-c-format
 msgid ""
 "In the Java EE environment, the container provides the following built-in "
@@ -57,20 +53,17 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:22
 #, no-c-format
 msgid "the current JTA <literal>UserTransaction</literal>,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:27
 #, no-c-format
 msgid ""
 "a <literal>Principal</literal> representing the current caller identity,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:32
 #, no-c-format
 msgid ""
 "the default <ulink url=\"http://jcp.org/en/jsr/detail?id=303\">Bean "
@@ -78,7 +71,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:38
 #, no-c-format
 msgid ""
 "a <literal>Validator</literal> for the default <literal>ValidationFactory</"
@@ -86,7 +78,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:45
 #, no-c-format
 msgid ""
 "The CDI specification does not require the servlet context objects, "
@@ -102,32 +93,18 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:57
 #, no-c-format
 msgid ""
 "Oh, you <emphasis>really</emphasis> want to inject the "
 "<literal>FacesContext</literal>? Alright then, try this producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[class FacesContextProducer {\n"
-"   @Produces @RequestScoped FacesContext getFacesContext() {\n"
-"      return FacesContext.getCurrentInstance();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: ee.xml:67
 #, fuzzy, no-c-format
 msgid "Injecting Java EE resources into a bean"
 msgstr "Java EE 리소스를 Web Bean으로 삽입 "
 
 #. Tag: para
-#: ee.xml:69
 #, fuzzy, no-c-format
 msgid ""
 "All managed beans may take advantage of Java EE component environment "
@@ -140,51 +117,7 @@
 "literal>, <literal>@PersistenceContext</literal>를 사용하여 Java EE 의존성 삽"
 "입의 장점을 취할 수 있습니다. 이미 이에 대한 몇몇 예를 살펴보았습니다: "
 
-#. Tag: programlisting
-#: ee.xml:76
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @Resource UserTransaction transaction;\n"
-"\n"
-"   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"throws Exception { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource Transaction transaction;\n"
-"\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"    \n"
-"}]]>"
-
-#. Tag: programlisting
-#: ee.xml:78
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Login implements Serializable {\n"
-"   @Inject Credentials credentials;\n"
-"   @PersistenceContext EntityManager userDatabase;\n"
-"    ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped\n"
-"public class Login {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @PersistenceContext EntityManager userDatabase;\n"
-"    \n"
-"    ...\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: ee.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "The Java EE <literal>@PostConstruct</literal> and <literal>@PreDestroy</"
@@ -198,7 +131,6 @@
 "다. "
 
 #. Tag: para
-#: ee.xml:86
 #, no-c-format
 msgid ""
 "Of course, we advise that component environment injection be used to define "
@@ -206,13 +138,11 @@
 msgstr ""
 
 #. Tag: title
-#: ee.xml:94
 #, fuzzy, no-c-format
 msgid "Calling a bean from a servlet"
 msgstr "Servlet에서 Web Bean 호출 "
 
 #. Tag: para
-#: ee.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
@@ -221,55 +151,7 @@
 "Java EE 6에 있는 Servlet에서 Web Bean을 사용하기가 쉽습니다. Web Beans 영역 "
 "또는 초기화 방식 삽입을 사용하여 Web Bean을 삽입합니다. "
 
-#. Tag: programlisting
-#: ee.xml:101
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Login extends HttpServlet {\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject Login login;\n"
-"\n"
-"   @Override\n"
-"   public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"      throws ServletException, IOException {\n"
-"      credentials.setUsername(request.getParameter(\"username\")):\n"
-"      credentials.setPassword(request.getParameter(\"password\")):\n"
-"      login.login();\n"
-"      if ( login.isLoggedIn() ) {\n"
-"         response.sendRedirect(\"/home.jsp\");\n"
-"      }\n"
-"      else {\n"
-"         response.sendRedirect(\"/loginError.jsp\");\n"
-"      }\n"
-"   }\n"
-"            \n"
-"}]]>"
-msgstr ""
-"public class Login extends HttpServlet {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @Current Login login;\n"
-"\n"
-"    @Override\n"
-"    public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"        throws ServletException, IOException {\n"
-"        credentials.setUsername( request.getAttribute(\"username\") ):\n"
-"        credentials.setPassword( request.getAttribute(\"password\") ):\n"
-"        login.login();\n"
-"        if ( login.isLoggedIn() ) {\n"
-"            response.sendRedirect(\"/home.jsp\");\n"
-"        }\n"
-"        else {\n"
-"            response.sendRedirect(\"/loginError.jsp\");\n"
-"        }\n"
-"    }\n"
-"            \n"
-"}"
-
 #. Tag: para
-#: ee.xml:103
 #, fuzzy, no-c-format
 msgid ""
 "Since instances of servlets are shared across all incoming threads, the bean "
@@ -282,13 +164,11 @@
 "출을 라우팅을 처리합니다.  "
 
 #. Tag: title
-#: ee.xml:112
 #, fuzzy, no-c-format
 msgid "Calling a bean from a message-driven bean"
 msgstr "Message-Driven Bean에서 Web Bean 호출 "
 
 #. Tag: para
-#: ee.xml:114
 #, no-c-format
 msgid ""
 "CDI injection applies to all EJBs, even when they aren't managed beans. In "
@@ -297,40 +177,12 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:119
 #, fuzzy, no-c-format
 msgid "You can even use CDI interceptor bindings for message-driven Beans."
 msgstr ""
 "Message-Driven Beans에 대한 Web Beans 인터셉터 바인딩을 사용할 수 있습니다.  "
 
-#. Tag: programlisting
-#: ee.xml:121
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"   @Inject Inventory inventory;\n"
-"   @PersistenceContext EntityManager em;\n"
-"\n"
-"   public void onMessage(Message message) {\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"\n"
-"    @Current Inventory inventory;\n"
-"    @PersistenceContext EntityManager em;\n"
-"\n"
-"    public void onMessage(Message message) {\n"
-"        ...\n"
-"    }\n"
-"            \n"
-"}"
-
 #. Tag: para
-#: ee.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "Please note that there is no session or conversation context available when "
@@ -344,19 +196,16 @@
 "<literal>@ApplicationScoped</literal> Web Beans 만을 사용할 수 있습니다. "
 
 #. Tag: para
-#: ee.xml:129
 #, no-c-format
 msgid "But how about beans which <emphasis>send</emphasis> JMS messages?"
 msgstr ""
 
 #. Tag: title
-#: ee.xml:136
 #, no-c-format
 msgid "JMS endpoints"
 msgstr "JMS 엔드포인트  "
 
 #. Tag: para
-#: ee.xml:138
 #, no-c-format
 msgid ""
 "Sending messages using JMS can be quite complex, because of the number of "
@@ -380,96 +229,20 @@
 "있습니다.   "
 
 #. Tag: para
-#: ee.xml:147
 #, no-c-format
 msgid ""
 "You can use producer fields and methods to prepare all of these resources "
 "for injection into a bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[public class OrderResources {\n"
-"   @Resource(name=\"jms/ConnectionFactory\")\n"
-"   private ConnectionFactory connectionFactory;\n"
-"  \n"
-"   @Resource(name=\"jms/OrderQueue\")\n"
-"   private Queue orderQueue;\n"
-"  \n"
-"   @Produces @OrderConnection\n"
-"   public Connection createOrderConnection() throws JMSException {\n"
-"    return connectionFactory.createConnection();\n"
-"   }\n"
-"  \n"
-"   public void closeOrderConnection(@Disposes @OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      connection.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderSession\n"
-"   public Session createOrderSession(@OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      return connection.createSession(true, Session.AUTO_ACKNOWLEDGE);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderSession(@Disposes @OrderSession Session session)\n"
-"         throws JMSException {\n"
-"      session.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderMessageProducer\n"
-"   public MessageProducer createOrderMessageProducer(@OrderSession Session "
-"session)\n"
-"         throws JMSException {\n"
-"      return session.createProducer(orderQueue);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderMessageProducer(@Disposes @OrderMessageProducer "
-"MessageProducer producer)\n"
-"         throws JMSException {\n"
-"      producer.close();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: ee.xml:153
 #, no-c-format
 msgid ""
 "In this example, we can just inject the prepared <literal>MessageProducer</"
 "literal>, <literal>Connection</literal> or <literal>QueueSession</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:158
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject Order order;\n"
-"@Inject @OrderMessageProducer MessageProducer producer;\n"
-"@Inject @OrderSession QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"   MapMessage msg = orderSession.createMapMessage();\n"
-"   msg.setLong(\"orderId\", order.getId());\n"
-"   ...\n"
-"   producer.send(msg);\n"
-"}]]>"
-msgstr ""
-"@OrderProcessor QueueSender orderSender;\n"
-"@OrderProcessor QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"    MapMessage msg = orderSession.createMapMessage();\n"
-"    ...\n"
-"    orderSender.send(msg);\n"
-"}"
-
 #. Tag: para
-#: ee.xml:164
 #, fuzzy, no-c-format
 msgid ""
 "The lifecycle of the injected JMS objects is completely controlled by the "
@@ -478,22 +251,20 @@
 "삽입된 JMS 객체의 수명주기는 Web Bean 관리자에 의해 전적으로 관리됩니다. "
 
 #. Tag: title
-#: ee.xml:171
 #, no-c-format
 msgid "Packaging and deployment"
 msgstr "패키징 및 배포 "
 
 #. Tag: para
-#: ee.xml:173
 #, fuzzy, no-c-format
 msgid ""
 "CDI doesn't define any special deployment archive. You can package beans in "
-"JARs, EJB-JARs or WARs&#8212;any deployment location in the application "
-"classpath. However, the archive must be a \"bean archive\". That means each "
-"archive that contains beans <emphasis>must</emphasis> include a file named "
+"jars, ejb jars or wars—any deployment location in the application classpath. "
+"However, the archive must be a \"bean archive\". That means each archive "
+"that contains beans <emphasis>must</emphasis> include a file named "
 "<literal>beans.xml</literal> in the <literal>META-INF</literal> directory of "
 "the classpath or <literal>WEB-INF</literal> directory of the web root (for "
-"WAR archives). The file may be empty. Beans deployed in archives that do not "
+"war archives). The file may be empty. Beans deployed in archives that do not "
 "have a <literal>beans.xml</literal> file will not be available for use in "
 "the application."
 msgstr ""
@@ -506,7 +277,6 @@
 "는 애플리케이션에서 사용할 수 없습니다. "
 
 #. Tag: para
-#: ee.xml:182
 #, fuzzy, no-c-format
 msgid ""
 "In an embeddable EJB container, beans may be deployed in any location in "
@@ -517,7 +287,137 @@
 "할 수 있는 위치에 Web Beans를 배포할 수 있습니다. 각 위치에서는 <literal>web-"
 "beans.xml</literal> 파일이 들어 있어야 합니다.     "
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "throws Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource Transaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login implements Serializable {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @PersistenceContext EntityManager userDatabase;\n"
+#~ "    ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @PersistenceContext EntityManager userDatabase;\n"
+#~ "    \n"
+#~ "    ...\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Login extends HttpServlet {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject Login login;\n"
+#~ "\n"
+#~ "   @Override\n"
+#~ "   public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "      throws ServletException, IOException {\n"
+#~ "      credentials.setUsername(request.getParameter(\"username\")):\n"
+#~ "      credentials.setPassword(request.getParameter(\"password\")):\n"
+#~ "      login.login();\n"
+#~ "      if ( login.isLoggedIn() ) {\n"
+#~ "         response.sendRedirect(\"/home.jsp\");\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "            \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "public class Login extends HttpServlet {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @Current Login login;\n"
+#~ "\n"
+#~ "    @Override\n"
+#~ "    public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "        throws ServletException, IOException {\n"
+#~ "        credentials.setUsername( request.getAttribute(\"username\") ):\n"
+#~ "        credentials.setPassword( request.getAttribute(\"password\") ):\n"
+#~ "        login.login();\n"
+#~ "        if ( login.isLoggedIn() ) {\n"
+#~ "            response.sendRedirect(\"/home.jsp\");\n"
+#~ "        }\n"
+#~ "        else {\n"
+#~ "            response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "            \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "   @Inject Inventory inventory;\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "   public void onMessage(Message message) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "\n"
+#~ "    @Current Inventory inventory;\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "    public void onMessage(Message message) {\n"
+#~ "        ...\n"
+#~ "    }\n"
+#~ "            \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Order order;\n"
+#~ "@Inject @OrderMessageProducer MessageProducer producer;\n"
+#~ "@Inject @OrderSession QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "   MapMessage msg = orderSession.createMapMessage();\n"
+#~ "   msg.setLong(\"orderId\", order.getId());\n"
+#~ "   ...\n"
+#~ "   producer.send(msg);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@OrderProcessor QueueSender orderSender;\n"
+#~ "@OrderProcessor QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "    MapMessage msg = orderSession.createMapMessage();\n"
+#~ "    ...\n"
+#~ "    orderSender.send(msg);\n"
+#~ "}"
+
+#~ msgid ""
 #~ "There is one restriction to be aware of here: <literal>@PersistenceContext"
 #~ "(type=EXTENDED)</literal> is not supported for simple Web Beans."
 #~ msgstr ""

Modified: doc/trunk/reference/ko-KR/environments.po
===================================================================
--- doc/trunk/reference/ko-KR/environments.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/environments.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,22 +15,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: environments.xml:4
 #, no-c-format
 msgid "Application servers and environments supported by Weld"
 msgstr ""
 
 #. Tag: title
-#: environments.xml:7
 #, no-c-format
 msgid "Using Weld with JBoss AS"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:9
 #, no-c-format
 msgid ""
-"If you are using JBoss AS 5.2, no additional configuration is required to "
+"If you are using JBoss AS 6.0, no additional configuration is required to "
 "use Weld (or CDI for that matter). All you need to do is make your "
 "application a bean bean archive by adding <literal>META-INF/beans.xml</"
 "literal> to the classpath or <literal>WEB-INF/beans.xml</literal> to the web "
@@ -38,50 +35,39 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:15
 #, no-c-format
 msgid ""
 "Unfortunately, you can't use Weld with earlier versions of JBoss AS since "
 "they are missing key libraries. If you want to learn how to upgrade the "
-"built-in support on JBoss AS 5.2, then read on."
+"built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:20
 #, no-c-format
 msgid ""
-"Upgrading the Weld add-on is easy. The Weld distribution has a build that "
-"can take care of this task for you in a single command. First, we need to "
-"tell Weld where JBoss AS is located. Create a new file named <literal>local."
-"build.properties</literal> in the examples directory of the Weld "
-"distribution and assign the path of your JBoss AS installation to the "
-"property key <literal>jboss.home</literal>, as follows:"
+"If there is a newer release of Weld than what is included in the latest "
+"JBoss AS 6 release, upgrading the Weld add-on is easy. The Weld distribution "
+"includes a build script that can take care of this task for you in a single "
+"command."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:27
+#. Tag: para
 #, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"
+msgid ""
+"First, we need to tell Weld where JBoss AS is located. This information is "
+"communicated by assigning the <literal>JBOSS_HOME</literal> environment "
+"variable. In a bash shell, you can assign the environment variable as "
+"follows:"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:29
 #, no-c-format
 msgid ""
 "Now we can install the Weld deployer from the <literal>jboss-as</literal> "
 "directory of the Weld distribution:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:33
-#, no-c-format
-msgid ""
-"$> cd jboss-as\n"
-"$> ant update"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:36
 #, no-c-format
 msgid ""
 "A new deployer, <literal>weld.deployer</literal> is added to JBoss AS. This "
@@ -92,13 +78,11 @@
 msgstr ""
 
 #. Tag: title
-#: environments.xml:46
 #, no-c-format
 msgid "GlassFish"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:48
 #, no-c-format
 msgid ""
 "Weld is also built into GlassFish from V3 onwards. Since GlassFish V3 is the "
@@ -109,13 +93,11 @@
 msgstr ""
 
 #. Tag: title
-#: environments.xml:56
 #, no-c-format
 msgid "Servlet containers (such as Tomcat or Jetty)"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:58
 #, no-c-format
 msgid ""
 "While JSR-299 does not require support for servlet environments, Weld can be "
@@ -123,7 +105,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:64
 #, no-c-format
 msgid ""
 "There is a major limitation to using a servlet container. Weld doesn't "
@@ -134,7 +115,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:72
 #, no-c-format
 msgid ""
 "Weld should be used as a web application library in a servlet container. You "
@@ -145,62 +125,52 @@
 "could use its component jars:"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:84
+#. Tag: para
 #, no-c-format
-msgid "jsr299-api.jar"
+msgid "<literal>jsr299-api.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:89
+#. Tag: para
 #, no-c-format
-msgid "weld-api.jar"
+msgid "<literal>weld-api.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:94
+#. Tag: para
 #, no-c-format
-msgid "weld-spi.jar"
+msgid "<literal>weld-spi.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:99
+#. Tag: para
 #, no-c-format
-msgid "weld-core.jar"
+msgid "<literal>weld-core.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:104
+#. Tag: para
 #, no-c-format
-msgid "weld-logging.jar"
+msgid "<literal>weld-logging.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:109
+#. Tag: para
 #, no-c-format
-msgid "weld-servlet-int.jar"
+msgid "<literal>weld-servlet-int.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:114
+#. Tag: para
 #, no-c-format
-msgid "javassist.jar"
+msgid "<literal>javassist.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:119
+#. Tag: para
 #, no-c-format
-msgid "dom4j.jar"
+msgid "<literal>dom4j.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:124
+#. Tag: para
 #, no-c-format
-msgid "google-collections.jar"
+msgid "<literal>google-collections.jar</literal>"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:129
 #, no-c-format
 msgid ""
 "You also need to explicitly specify the servlet listener (used to boot Weld, "
@@ -208,24 +178,12 @@
 "literal> in the web root:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:137
 #, no-c-format
 msgid "Tomcat"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:139
 #, no-c-format
 msgid ""
 "Tomcat has a read-only JNDI, so Weld can't automatically bind the "
@@ -234,40 +192,14 @@
 "following contents:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:145
-#, no-c-format
-msgid ""
-"<![CDATA[<Context>\n"
-"   <Resource name=\"BeanManager\" \n"
-"      auth=\"Container\"\n"
-"      type=\"javax.enterprise.inject.spi.BeanManager\"\n"
-"      factory=\"org.jboss.weld.resources.ManagerObjectFactory\"/>\n"
-"</Context>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:147
 #, no-c-format
 msgid ""
 "and make it available to your deployment by adding this to the bottom of "
 "<literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[<resource-env-ref>\n"
-"   <resource-env-ref-name>BeanManager</resource-env-ref-name>\n"
-"   <resource-env-ref-type>\n"
-"      javax.enterprise.inject.spi.BeanManager\n"
-"   </resource-env-ref-type>\n"
-"</resource-env-ref>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:153
 #, no-c-format
 msgid ""
 "Tomcat only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -276,7 +208,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:158
 #, no-c-format
 msgid ""
 "Weld also supports Servlet injection in Tomcat. To enable this, place the "
@@ -284,22 +215,12 @@
 "literal>, and add the following to <literal>META-INF/context.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:164
-#, no-c-format
-msgid ""
-"<![CDATA[<Listener className=\"org.jboss.weld.environment.tomcat."
-"WeldLifecycleListener\"/>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:169
 #, no-c-format
 msgid "Jetty"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:171
 #, no-c-format
 msgid ""
 "Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind "
@@ -307,32 +228,7 @@
 "INF/jetty-env.xml</literal> with the following contents:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:176
-#, no-c-format
-msgid ""
-"<![CDATA[<!DOCTYPE Configure PUBLIC \"-//Mort Bay Consulting//DTD Configure//"
-"EN\"\n"
-"   \"http://jetty.mortbay.org/configure.dtd\">\n"
-"<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext"
-"\">\n"
-"   <New id=\"BeanManager\" class=\"org.mortbay.jetty.plus.naming.Resource"
-"\">\n"
-"      <Arg><Ref id=\"webAppCtx\"/></Arg> \n"
-"      <Arg>BeanManager</Arg>\n"
-"      <Arg>\n"
-"         <New class=\"javax.naming.Reference\">\n"
-"            <Arg>javax.enterprise.inject.spi.BeanManager</Arg> \n"
-"            <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>\n"
-"            <Arg/>\n"
-"         </New>\n"
-"      </Arg>\n"
-"   </New>\n"
-"</Configure>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:178
 #, no-c-format
 msgid ""
 "Notice that Jetty doesn't not have built-in support for an <literal>javax."
@@ -342,7 +238,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:184
 #, no-c-format
 msgid ""
 "Jetty only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -351,19 +246,16 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:189
 #, no-c-format
 msgid "Weld does not currently support Servlet injection in Jetty."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:198
 #, no-c-format
 msgid "Java SE"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:200
 #, no-c-format
 msgid ""
 "In addition to improved integration of the Enterprise Java stack, the "
@@ -376,7 +268,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:208
 #, no-c-format
 msgid ""
 "When executing in the SE environment the following features of Weld are "
@@ -384,7 +275,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:214
 #, no-c-format
 msgid ""
 "Managed beans with <literal>@PostConstruct</literal> and "
@@ -392,13 +282,11 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:220
 #, no-c-format
 msgid "Dependency injection with qualifiers and alternatives"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:225
 #, no-c-format
 msgid ""
 "<literal>@Application</literal>, <literal>@Dependent</literal> and "
@@ -406,43 +294,36 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:231
 #, no-c-format
 msgid "Interceptors and decorators"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:236
 #, no-c-format
 msgid "Stereotypes"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:241
 #, no-c-format
 msgid "Events"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:246
 #, no-c-format
 msgid "Portable extension support"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:252
 #, no-c-format
 msgid "EJB beans are not supported."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:257
 #, no-c-format
 msgid "CDI SE Module"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:259
 #, no-c-format
 msgid ""
 "Weld provides an extension which will boot a CDI bean manager in Java SE, "
@@ -450,26 +331,12 @@
 "command line parameters can be injected using either of the following:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:264
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters List<String> params;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: environments.xml:266
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters String[] paramsArray;]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:268
 #, no-c-format
 msgid "The second form is useful for compatibility with existing classes."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:273
 #, no-c-format
 msgid ""
 "The command line parameters do not become available for injection until the "
@@ -480,45 +347,26 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:282
 #, no-c-format
 msgid "Here's an example of a simple CDI SE application:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:286
-#, no-c-format
-msgid ""
-"<![CDATA[@Singleton\n"
-"public class HelloWorld\n"
-"{\n"
-"   public void printHello(@Observes ContainerInitialized event, @Parameters "
-"List<String> parameters) {\n"
-"       System.out.println(\"Hello \" + parameters.get(0));\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:292
 #, no-c-format
 msgid "Bootstrapping CDI SE"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:294
 #, no-c-format
 msgid "CDI SE applications can be bootstrapped in the following ways."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:300
 #, no-c-format
 msgid "The ContainerInitialized Event"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:302
 #, no-c-format
 msgid ""
 "Thanks to the power of CDI's typesafe event model, application developers "
@@ -530,27 +378,18 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:310
 #, no-c-format
 msgid ""
 "In this case your application can be started by calling the provided main "
 "method like so:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:313
-#, no-c-format
-msgid "<![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:319
 #, no-c-format
 msgid "Programatic Bootstrap API"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:321
 #, no-c-format
 msgid ""
 "For added flexibility, CDI SE also comes with a bootstrap API which can be "
@@ -559,90 +398,65 @@
 "classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:327
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class Weld\n"
-"{\n"
-"\n"
-"   /** Boots Weld and creates and returns a WeldContainer instance, through "
-"which\n"
-"    * beans and events can be accesed. */\n"
-"   public WeldContainer initialize() {...}\n"
-"\n"
-"   /** Convenience method for shutting down the container. */\n"
-"   public void shutdown() {...}\n"
-"\n"
-"}]]>"
+"Here's an example application main method which uses this API to initialize "
+"a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:329
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class WeldContainer\n"
-"{\n"
-"\n"
-"   /** Provides access to all beans within the application. */\n"
-"   public Instance<Object> instance() {...}\n"
-"\n"
-"   /** Provides access to all events within the application. */\n"
-"   public Event<Object> event() {...}\n"
-"\n"
-"   /** Provides direct access to the BeanManager. */\n"
-"   public BeanManager getBeanManager() {...}\n"
-"\n"
-"}]]>"
+"Alternatively the application could be started by firing a custom event "
+"which would then be observed by another simple bean. The following example "
+"fires <literal>MyEvent</literal> on startup."
 msgstr ""
 
-#. Tag: para
-#: environments.xml:331
+#. Tag: title
 #, no-c-format
-msgid ""
-"Here's an example application main method which uses this API to initialize "
-"a bean of type <literal>MyApplicationBean</literal>."
+msgid "Thread Context"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:334
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.instance().select(MyApplicationBean.class).get();\n"
-"   weld.shutdown();\n"
-"}]]>"
+"In contrast to Java EE applications, Java SE applications place no "
+"restrictions on developers regarding the creation and usage of threads. "
+"Therefore Weld SE provides a custom scope annotation, "
+"<literal>@ThreadScoped</literal>, and corresponding context implementation "
+"which can be used to bind bean instances to the current thread. It is "
+"intended to be used in scenarios where you might otherwise use "
+"<literal>ThreadLocal</literal>, and does in fact use <literal>ThreadLocal</"
+"literal> under the hood."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:336
 #, no-c-format
 msgid ""
-"Alternatively the application could be started by firing a custom event "
-"which would then be observed by another simple bean. The following example "
-"fires <literal>MyEvent</literal> on startup."
+"To use the @ThreadScoped annotation you need to enable the "
+"<literal>RunnableDecorator</literal> which 'listens' for all executions of "
+"<literal>Runnable.run()</literal> and decorates them by setting up the "
+"thread context beforehand, bound to the current thread, and destroying the "
+"context afterwards."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:340
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.event().select(MyEvent.class).fire( new MyEvent() );\n"
-"   weld.shutdown();\n"
-"}]]>"
+"It is not necessary to use @ThreadScoped in all multithreaded applications. "
+"The thread context is not intended as a replacement for defining your own "
+"application-specific contexts. It is generally only useful in situtations "
+"where you would otherwise have used ThreadLocal directly, which are "
+"typically rare."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:348
 #, no-c-format
 msgid "Setting the Classpath"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:350
 #, no-c-format
 msgid ""
 "Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld "

Modified: doc/trunk/reference/ko-KR/events.po
===================================================================
--- doc/trunk/reference/ko-KR/events.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/events.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: events\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-23 11:16+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -30,13 +30,11 @@
 "\n"
 
 #. Tag: title
-#: events.xml:4
 #, no-c-format
 msgid "Events"
 msgstr "이벤트 "
 
 #. Tag: para
-#: events.xml:6
 #, no-c-format
 msgid ""
 "Dependency injection enables loose-coupling by allowing the implementation "
@@ -47,7 +45,6 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:13
 #, no-c-format
 msgid ""
 "This basic schema might sound like the familiar observer/observable pattern, "
@@ -55,7 +52,6 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:18
 #, no-c-format
 msgid ""
 "not only are event producers decoupled from observers; observers are "
@@ -65,7 +61,6 @@
 "전하게 연결 해제됩니다. "
 
 #. Tag: para
-#: events.xml:22
 #, no-c-format
 msgid ""
 "observers can specify a combination of \"selectors\" to narrow the set of "
@@ -74,7 +69,6 @@
 "옵저버는 \"선택자\" 조합을 지정하여 이벤트 통지 모음의 범위를 좁힙니다. "
 
 #. Tag: para
-#: events.xml:28
 #, fuzzy, no-c-format
 msgid ""
 "observers can be notified immediately, or can specify that delivery of the "
@@ -84,7 +78,6 @@
 "되도록 지정할 수 있습니다.  "
 
 #. Tag: para
-#: events.xml:35
 #, no-c-format
 msgid ""
 "The CDI event notification facility uses more or less the same typesafe "
@@ -92,13 +85,11 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:39
 #, fuzzy, no-c-format
 msgid "Event payload"
 msgstr "이벤트 생산자 "
 
 #. Tag: para
-#: events.xml:41
 #, no-c-format
 msgid ""
 "The event object carries state from producer to consumer. The event object "
@@ -110,35 +101,18 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:48
 #, no-c-format
 msgid ""
 "An event qualifier is just a normal qualifier, defined using "
 "<literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({FIELD, PARAMETER})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated {}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated { ... }]]>"
-
 #. Tag: title
-#: events.xml:57
 #, no-c-format
 msgid "Event observers"
 msgstr "이벤트 옵저버 "
 
 #. Tag: para
-#: events.xml:59
 #, fuzzy, no-c-format
 msgid ""
 "An <emphasis>observer method</emphasis> is a method of a bean with a "
@@ -147,18 +121,7 @@
 "<emphasis>옵저버 방식</emphasis>은 매개변수 어노테이션 <literal>@Observes</"
 "literal>를 사용하는 Web Bean 방식입니다. "
 
-#. Tag: programlisting
-#: events.xml:64
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }]]>"
-
 #. Tag: para
-#: events.xml:66
 #, fuzzy, no-c-format
 msgid ""
 "The annotated parameter is called the <emphasis>event parameter</emphasis>. "
@@ -172,23 +135,12 @@
 "다. 바인딩 유형이 이벤트 선택자로 사용될 경우, 이를 <emphasis>이벤트 바인딩 "
 "유형</emphasis>이라고 부릅니다.  "
 
-#. Tag: programlisting
-#: events.xml:72 events.xml:240
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:74
 #, fuzzy, no-c-format
 msgid ""
-"An observer method need not specify any event qualifiers&#8212;in this case "
-"it is interested in <emphasis>all</emphasis> events of a particular type. If "
-"it does specify qualifiers, it's only interested in events which have those "
+"An observer method need not specify any event qualifiers—in this case it is "
+"interested in <emphasis>all</emphasis> events of a particular type. If it "
+"does specify qualifiers, it's only interested in events which have those "
 "qualifiers."
 msgstr ""
 "옵저버 방식은 어떤 이벤트 바인딩도 지정할 필요가 없습니다 &#151; 이러한 경우 "
@@ -197,7 +149,6 @@
 "게 됩니다.  "
 
 #. Tag: para
-#: events.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "The observer method may have additional parameters, which are injection "
@@ -206,24 +157,12 @@
 "옵저버 방식은 추가 매개 변수를 갖을 수 있으며, 이는 일반적인 Web Beans 방식 "
 "매개 변수 삽입 시멘틱에 따라 삽입됩니다: "
 
-#. Tag: programlisting
-#: events.xml:84
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document, User user) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document, User user) { ... }]]>"
-
 #. Tag: title
-#: events.xml:89
 #, no-c-format
 msgid "Event producers"
 msgstr "이벤트 생산자 "
 
 #. Tag: para
-#: events.xml:91
 #, no-c-format
 msgid ""
 "Event producers fire events using an instance of the parameterized "
@@ -231,14 +170,7 @@
 "obtained by injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:96
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
-msgstr "<![CDATA[@Observable Event<Document> documentEvent]]>"
-
 #. Tag: para
-#: events.xml:98
 #, fuzzy, no-c-format
 msgid ""
 "A producer raises events by calling the <literal>fire()</literal> method of "
@@ -248,20 +180,12 @@
 "을 호출하여 이벤트를 제기하고, <emphasis>이벤트 객체</emphasis>를 전달합니"
 "다: "
 
-#. Tag: programlisting
-#: events.xml:103
-#, no-c-format
-msgid "<![CDATA[documentEvent.fire(document);]]>"
-msgstr "<![CDATA[documentEvent.fire(document);]]>"
-
 #. Tag: para
-#: events.xml:105
 #, fuzzy, no-c-format
 msgid "This particular event will be delivered to every observer method that:"
 msgstr "이벤트는 모든 옵저버 방식으로 전달됩니다: "
 
 #. Tag: para
-#: events.xml:111
 #, fuzzy, no-c-format
 msgid ""
 "has an event parameter to which the event object (the <literal>Document</"
@@ -269,13 +193,11 @@
 msgstr "이벤트 객체를 할당할 수 있는 이벤트 매개 변수를 갖습니다, "
 
 #. Tag: para
-#: events.xml:115
 #, fuzzy, no-c-format
 msgid "specifies no qualifiers."
 msgstr "이벤트 바인딩 없음을 지정합니다. "
 
 #. Tag: para
-#: events.xml:119
 #, fuzzy, no-c-format
 msgid ""
 "The container simply calls all the observer methods, passing the event "
@@ -289,19 +211,16 @@
 "에 의해 다시 넘기게 됩니다. "
 
 #. Tag: para
-#: events.xml:125
 #, no-c-format
 msgid "Qualifiers can be applied to an event in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: events.xml:131
 #, no-c-format
 msgid "by annotating the <literal>Event</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: events.xml:134
 #, no-c-format
 msgid ""
 "by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
@@ -309,19 +228,11 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:138
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is far simpler:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:142
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
-msgstr "<![CDATA[@Observable @Updated Event<Document> documentUpdatedEvent]]>"
-
 #. Tag: para
-#: events.xml:144
 #, fuzzy, no-c-format
 msgid ""
 "Then, every event fired via this instance of <literal>Event</literal> has "
@@ -332,13 +243,11 @@
 "션된 이벤트 바인딩을 갖습니다. 이벤트는 모든 옵저버 방식에 전달됩니다:   "
 
 #. Tag: para
-#: events.xml:151
 #, no-c-format
 msgid "has an event parameter to which the event object is assignable, and"
 msgstr "이벤트 객체를 할당할 수 있는 이벤트 매개 변수를 갖습니다, "
 
 #. Tag: para
-#: events.xml:154
 #, fuzzy, no-c-format
 msgid ""
 "does not have any event qualifier <emphasis>except</emphasis> for the event "
@@ -349,7 +258,6 @@
 "딩 <emphasis>예외 사항</emphasis>을 지정하지 않습니다. "
 
 #. Tag: para
-#: events.xml:161
 #, no-c-format
 msgid ""
 "The downside of annotating the injection point is that we can't specify the "
@@ -359,18 +267,7 @@
 "<literal>Event</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:167
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
-"(document);]]>"
-msgstr ""
-"<![CDATA[documentEvent.fire( document, new AnnotationLiteral<Updated>()"
-"{} );]]>"
-
 #. Tag: para
-#: events.xml:169
 #, no-c-format
 msgid ""
 "Events can have multiple event qualifiers, assembled using any combination "
@@ -379,13 +276,11 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:178
 #, fuzzy, no-c-format
 msgid "Conditional observer methods"
 msgstr "트랜잭션 옵저버 "
 
 #. Tag: para
-#: events.xml:180
 #, no-c-format
 msgid ""
 "By default, if there is no instance of an observer in the current context, "
@@ -395,25 +290,13 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:186
 #, no-c-format
 msgid ""
 "A conditional observer is specified by adding <literal>receive = IF_EXISTS</"
 "literal> to the <literal>@Observes</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = IF_EXISTS) "
-"@Updated Document d) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:193
 #, no-c-format
 msgid ""
 "A bean with scope <literal>@Dependent</literal> cannot be a conditional "
@@ -421,54 +304,22 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:200
 #, fuzzy, no-c-format
 msgid "Event qualifiers with members"
 msgstr "멤버와 이벤트 바인딩    "
 
 #. Tag: para
-#: events.xml:202
 #, fuzzy, no-c-format
 msgid "An event qualifier type may have annotation members:"
 msgstr "이벤트 바인딩 유형은 어노테이션 멤버를 갖을 수 있습니다:  "
 
-#. Tag: programlisting
-#: events.xml:204
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"   RoleType value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"    RoleType value();\n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:206
 #, no-c-format
 msgid ""
 "The member value is used to narrow the messages delivered to the observer:"
 msgstr "멤버 값은 옵저버에게 전달되는 메세지의 범위를 좁히는데 사용됩니다:  "
 
-#. Tag: programlisting
-#: events.xml:208
-#, no-c-format
-msgid ""
-"<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
-"{ ... }]]>"
-
 #. Tag: para
-#: events.xml:210
 #, fuzzy, no-c-format
 msgid ""
 "Event qualifier type members may be specified statically by the event "
@@ -477,14 +328,7 @@
 "이벤트 바인딩 유형 멤버는 이벤트 통지 삽입 지점에 있는 어노테이션을 통해 이벤"
 "트 생산자에의해 정적으로 지정될 수 있습니다:  "
 
-#. Tag: programlisting
-#: events.xml:215
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
-msgstr "<![CDATA[@Observable @Role(ADMIN) Event<LoggedIn> LoggedInEvent;}}]]>"
-
 #. Tag: para
-#: events.xml:217
 #, fuzzy, no-c-format
 msgid ""
 "Alternatively, the value of the event qualifier type member may be "
@@ -495,20 +339,7 @@
 "정될 수 있습니다. <literal>AnnotationLiteral</literal>의 추상화 하부클래스를 "
 "작성하여 시작합니다: "
 
-#. Tag: programlisting
-#: events.xml:222
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[abstract class RoleBinding \n"
-"   extends AnnotationLiteral<Role> \n"
-"   implements Role {}]]>"
-msgstr ""
-"<![CDATA[abstract class RoleBinding \n"
-"    extends AnnotationLiteral<Role> \n"
-"    implements Role {}]]>"
-
 #. Tag: para
-#: events.xml:224
 #, fuzzy, no-c-format
 msgid ""
 "The event producer passes an instance of this class to <literal>select()</"
@@ -517,45 +348,17 @@
 "이벤트 생산자는 이러한 클래스의 인스턴스를 <literal>fire()</literal>로 전달합"
 "니다:  "
 
-#. Tag: programlisting
-#: events.xml:226
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[documentEvent.select(new RoleBinding() {\n"
-"   public void value() { return user.getRole(); }\n"
-"}).fire(document);]]>"
-msgstr ""
-"<![CDATA[documentEvent.fire( document, new RoleBinding() { public void value"
-"() { return user.getRole(); } } );]]>"
-
 #. Tag: title
-#: events.xml:231
 #, fuzzy, no-c-format
 msgid "Multiple event qualifiers"
 msgstr "여러 이벤트 바인딩 "
 
 #. Tag: para
-#: events.xml:233
 #, fuzzy, no-c-format
 msgid "Event qualifier types may be combined, for example:"
 msgstr "이벤트 바인딩 유형은 통합할 수 있습니다, 예: "
 
-#. Tag: programlisting
-#: events.xml:235
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>(){})."
-"fire(document);]]>"
-msgstr ""
-"<![CDATA[@Observable @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.fire(document, new "
-"AnnotationLiteral<Updated>(){});]]>"
-
 #. Tag: para
-#: events.xml:237
 #, no-c-format
 msgid ""
 "When this event occurs, all of the following observer methods will be "
@@ -563,44 +366,12 @@
 msgstr ""
 "이러한 이벤트가 발생하면, 다음과 같은 옵저버 방식 모두가 통지되게 됩니다: "
 
-#. Tag: programlisting
-#: events.xml:239
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
-"document) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
-"document) { ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:241
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
-"{ ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:242
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }}}]]>"
-msgstr ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }}}]]>"
-
 #. Tag: title
-#: events.xml:247
 #, no-c-format
 msgid "Transactional observers"
 msgstr "트랜잭션 옵저버 "
 
 #. Tag: para
-#: events.xml:249
 #, no-c-format
 msgid ""
 "Transactional observers receive their event notifications during the before "
@@ -614,31 +385,18 @@
 "<literal>Category</literal> 크리를 성공적으로 업데이트했을 경우에만 애플리케"
 "이션 컨텍스트에서 캐시된 쿼리 결과 모음을 새로고침해야 합니다:  "
 
-#. Tag: programlisting
-#: events.xml:256
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public void refreshCategoryTree(@Observes(during = AFTER_SUCCESS) "
-"CategoryUpdateEvent event) { ... }]]>"
-msgstr ""
-"<![CDATA[public void refreshCategoryTree(@AfterTransactionSuccess @Observes "
-"CategoryUpdateEvent event) { ... }]]>"
-
 #. Tag: para
-#: events.xml:258
 #, fuzzy, no-c-format
 msgid "There are five kinds of transactional observers:"
 msgstr "세 가지 종류의 트랜잭션 옵저버가 있습니다:  "
 
 #. Tag: para
-#: events.xml:262
 #, no-c-format
 msgid ""
 "<literal>IN_PROGESS</literal> observers are called immediately (default)"
 msgstr ""
 
 #. Tag: para
-#: events.xml:265
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_SUCCESS</literal> observers are called during the after "
@@ -649,7 +407,6 @@
 "<literal>@AfterTransactionSuccess</literal> 옵저버를 호출합니다.        "
 
 #. Tag: para
-#: events.xml:271
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_FAILURE</literal> observers are called during the after "
@@ -660,7 +417,6 @@
 "<literal>@AfterTransactionFailure</literal> 옵저버를 호출합니다.   "
 
 #. Tag: para
-#: events.xml:277
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_COMPLETION</literal> observers are called during the after "
@@ -670,7 +426,6 @@
 "literal> 옵저버를 호출합니다  "
 
 #. Tag: para
-#: events.xml:283
 #, fuzzy, no-c-format
 msgid ""
 "<literal>BEFORE_COMPLETION</literal> observers are called during the before "
@@ -680,7 +435,6 @@
 "literal> 옵저버를 호출합니다 "
 
 #. Tag: para
-#: events.xml:290
 #, fuzzy, no-c-format
 msgid ""
 "Transactional observers are very important in a stateful object model "
@@ -690,56 +444,12 @@
 "이는 단일 원자성 트랜잭션보다 오래 지속되기 때문입니다.    "
 
 #. Tag: para
-#: events.xml:295
 #, no-c-format
 msgid ""
 "Imagine that we have cached a JPA query result set in the application scope:"
 msgstr "애플리케이션 범위에 있는 JPA 쿼리 결과 모음을 캐시했다고 가정합니다:  "
 
-#. Tag: programlisting
-#: events.xml:297
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   List<Product> products;\n"
-"\n"
-"   @Produces @Catalog \n"
-"   List<Product> getCatalog() {\n"
-"      if (products==null) {\n"
-"         products = em.createQuery(\"select p from Product p where p.deleted "
-"= false\")\n"
-"            .getResultList();\n"
-"      }\n"
-"      return products;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    List<Product> products;\n"
-"\n"
-"    @Produces @Catalog \n"
-"    List<Product> getCatalog() {\n"
-"        if (products==null) {\n"
-"            products = em.createQuery(\"select p from Product p where p."
-"deleted = false\")\n"
-"                .getResultList();\n"
-"        }\n"
-"        return products;\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:299
 #, no-c-format
 msgid ""
 "From time to time, a <literal>Product</literal> is created or deleted. When "
@@ -753,7 +463,6 @@
 "emphasis> 까지 기다리셔야 합니다! "
 
 #. Tag: para
-#: events.xml:305
 #, fuzzy, no-c-format
 msgid ""
 "The bean that creates and deletes <literal>Product</literal>s could raise "
@@ -762,51 +471,7 @@
 "<literal>Product</literal>를 생성 및 삭제하는 Web Bean은 이벤트를 제기할 수 "
 "있습니다, 예:  "
 
-#. Tag: programlisting
-#: events.xml:309
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"   @PersistenceContext EntityManager em;\n"
-"   @Inject @Any Event<Product> productEvent;\n"
-"\n"
-"   public void delete(Product product) {\n"
-"      em.delete(product);\n"
-"      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
-"(product);\n"
-"   }\n"
-"    \n"
-"   public void persist(Product product) {\n"
-"      em.persist(product);\n"
-"      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
-"(product);\n"
-"   }\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"\n"
-"    @PersistenceContext EntityManager em;\n"
-"    @Observable Event<Product> productEvent;\n"
-"\n"
-"    public void delete(Product product) {\n"
-"        em.delete(product);\n"
-"        productEvent.fire(product, new AnnotationLiteral<Deleted>(){});\n"
-"    }\n"
-"    \n"
-"    public void persist(Product product) {\n"
-"        em.persist(product);\n"
-"        productEvent.fire(product, new AnnotationLiteral<Created>(){});\n"
-"    }\n"
-"    \n"
-"    ...\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:311
 #, no-c-format
 msgid ""
 "And now <literal>Catalog</literal> can observe the events after successful "
@@ -815,42 +480,270 @@
 "<literal>Catalog</literal>는 트랜잭션을 성공적으로 완료한 후에 이벤트를 옵저"
 "버할 수 있습니다: "
 
-#. Tag: programlisting
-#: events.xml:315
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"   ...\n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
-"product) {\n"
-"      products.add(product);\n"
-"   }\n"
-"    \n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
-"product) {\n"
-"      products.remove(product);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"    ...\n"
-"    \n"
-"    void addProduct(@AfterTransactionSuccess @Observes @Created Product "
-"product) {\n"
-"        products.add(product);\n"
-"    }\n"
-"    \n"
-"    void addProduct(@AfterTransactionSuccess @Observes @Deleted Product "
-"product) {\n"
-"        products.remove(product);\n"
-"    }\n"
-"    \n"
-"}]]>"
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({FIELD, PARAMETER})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated { ... }]]>"
 
 #~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
+#~ msgstr "<![CDATA[@Observable Event<Document> documentEvent]]>"
+
+#~ msgid "<![CDATA[documentEvent.fire(document);]]>"
+#~ msgstr "<![CDATA[documentEvent.fire(document);]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Updated Event<Document> documentUpdatedEvent]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
+#~ "(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.fire( document, new AnnotationLiteral<Updated>()"
+#~ "{} );]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = "
+#~ "IF_EXISTS) @Updated Document d) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "   RoleType value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "    RoleType value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Role(ADMIN) Event<LoggedIn> LoggedInEvent;}}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "   extends AnnotationLiteral<Role> \n"
+#~ "   implements Role {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "    extends AnnotationLiteral<Role> \n"
+#~ "    implements Role {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new RoleBinding() {\n"
+#~ "   public void value() { return user.getRole(); }\n"
+#~ "}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.fire( document, new RoleBinding() { public void "
+#~ "value() { return user.getRole(); } } );]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>()"
+#~ "{}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.fire(document, new "
+#~ "AnnotationLiteral<Updated>(){});]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public void refreshCategoryTree(@Observes(during = "
+#~ "AFTER_SUCCESS) CategoryUpdateEvent event) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void refreshCategoryTree(@AfterTransactionSuccess "
+#~ "@Observes CategoryUpdateEvent event) { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   List<Product> products;\n"
+#~ "\n"
+#~ "   @Produces @Catalog \n"
+#~ "   List<Product> getCatalog() {\n"
+#~ "      if (products==null) {\n"
+#~ "         products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "            .getResultList();\n"
+#~ "      }\n"
+#~ "      return products;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    List<Product> products;\n"
+#~ "\n"
+#~ "    @Produces @Catalog \n"
+#~ "    List<Product> getCatalog() {\n"
+#~ "        if (products==null) {\n"
+#~ "            products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "                .getResultList();\n"
+#~ "        }\n"
+#~ "        return products;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "   @Inject @Any Event<Product> productEvent;\n"
+#~ "\n"
+#~ "   public void delete(Product product) {\n"
+#~ "      em.delete(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void persist(Product product) {\n"
+#~ "      em.persist(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    @Observable Event<Product> productEvent;\n"
+#~ "\n"
+#~ "    public void delete(Product product) {\n"
+#~ "        em.delete(product);\n"
+#~ "        productEvent.fire(product, new AnnotationLiteral<Deleted>(){});\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void persist(Product product) {\n"
+#~ "        em.persist(product);\n"
+#~ "        productEvent.fire(product, new AnnotationLiteral<Created>(){});\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    ...\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "   ...\n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
+#~ "product) {\n"
+#~ "      products.add(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
+#~ "product) {\n"
+#~ "      products.remove(product);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "    ...\n"
+#~ "    \n"
+#~ "    void addProduct(@AfterTransactionSuccess @Observes @Created Product "
+#~ "product) {\n"
+#~ "        products.add(product);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    void addProduct(@AfterTransactionSuccess @Observes @Deleted Product "
+#~ "product) {\n"
+#~ "        products.remove(product);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "The Web Beans event notification facility allows Web Beans to interact in "
 #~ "a totally decoupled manner. Event <emphasis>producers</emphasis> raise "
 #~ "events that are then delivered to event <emphasis>observers</emphasis> by "

Modified: doc/trunk/reference/ko-KR/example.po
===================================================================
--- doc/trunk/reference/ko-KR/example.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/example.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: example\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-14 15:00+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -23,13 +23,11 @@
 "\n"
 
 #. Tag: title
-#: example.xml:4
 #, no-c-format
 msgid "JSF web application example"
 msgstr "JSF 웹 애플리케이션 예 "
 
 #. Tag: para
-#: example.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "Let's illustrate these ideas with a full example. We're going to implement "
@@ -42,112 +40,17 @@
 "자 로그인/로그아웃을 구현할 것입니다. 먼저, 로그인시 입력한 사용자 이름 및 암"
 "호를 보유하기 위해 Web Bean을 정의합니다: "
 
-#. Tag: programlisting
-#: example.xml:12
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    @NotNull @Length(min=3, max=25)\n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    @NotNull @Length(min=6, max=20)\n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"        \n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:14
 #, fuzzy, no-c-format
 msgid "This bean is bound to the login prompt in the following JSF form:"
 msgstr "Web Bean은 다음과 같은 JSF 형식에서 로그인 프롬프트로 바운딩됩니다: "
 
-#. Tag: programlisting
-#: example.xml:16
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<h:form>\n"
-"   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"      <f:validateBean>\n"
-"         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"         <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"         <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"      </f:validateBean>\n"
-"   </h:panelGrid>\n"
-"   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-msgstr ""
-"<![CDATA[<h:form>\n"
-"    <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"        <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"        <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"        <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"        <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"    </h:panelGrid>\n"
-"    <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"    <h:commandButton value=\"Logout\" acion=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-
 #. Tag: para
-#: example.xml:18
 #, no-c-format
 msgid "Users are represented by a JPA entity:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:22
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Entity\n"
-"public class User {\n"
-"   private @NotNull @Length(min=3, max=25) @Id String username;\n"
-"   private @NotNull @Length(min=6, max=20) String password;\n"
-"   \n"
-"   public String getUsername() { return username; }\n"
-"   public void setUsername(String username) { this.username = username; }\n"
-"   public String setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"        \n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:24
 #, no-c-format
 msgid ""
 "(Note that we're also going to need a <literal>persistence.xml</literal> "
@@ -156,7 +59,6 @@
 msgstr ""
 
 #. Tag: para
-#: example.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "The actual work is done by a session-scoped bean that maintains information "
@@ -166,192 +68,33 @@
 "현재 로그인 사용자에 관한 정보를 관리하는 Web Bean 세션 범위에 의해 실제 작업"
 "이 완료되어 다른 Web Beans에 <literal>User</literal> 엔티티를 노출시킵니다:  "
 
-#. Tag: programlisting
-#: example.xml:34
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login implements Serializable {\n"
-"\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject @UserDatabase EntityManager userDatabase;\n"
-"\n"
-"   private User user;\n"
-"    \n"
-"   public void login() {\n"
-"      List<User> results = userDatabase.createQuery(\n"
-"         \"select u from User u where u.username = :username and u.password "
-"= :password\")\n"
-"         .setParameter(\"username\", credentials.getUsername())\n"
-"         .setParameter(\"password\", credentials.getPassword())\n"
-"         .getResultList();\n"
-"        \n"
-"      if (!results.isEmpty()) {\n"
-"         user = results.get(0);\n"
-"      }\n"
-"      else {\n"
-"         // perhaps add code here to report a failed login\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void logout() {\n"
-"      user = null;\n"
-"   }\n"
-"    \n"
-"   public boolean isLoggedIn() {\n"
-"      return user != null;\n"
-"   }\n"
-"    \n"
-"   @Produces @LoggedIn User getCurrentUser() {\n"
-"      return user;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @PersistenceContext EntityManager userDatabase;\n"
-"\n"
-"    private User user;\n"
-"    \n"
-"    public void login() {\n"
-"            \n"
-"        List<User> results = userDatabase.createQuery(\n"
-"           \"select u from User u where u.username=:username and u.password=:"
-"password\")\n"
-"           .setParameter(\"username\", credentials.getUsername())\n"
-"           .setParameter(\"password\", credentials.getPassword())\n"
-"           .getResultList();\n"
-"        \n"
-"        if ( !results.isEmpty() ) {\n"
-"           user = results.get(0);\n"
-"        }\n"
-"        \n"
-"    }\n"
-"    \n"
-"    public void logout() {\n"
-"        user = null;\n"
-"    }\n"
-"    \n"
-"    public boolean isLoggedIn() {\n"
-"       return user!=null;\n"
-"    }\n"
-"    \n"
-"    @Produces @LoggedIn User getCurrentUser() {\n"
-"        return user;\n"
-"    }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:36
 #, no-c-format
 msgid ""
 "<literal>@LoggedIn</literal> and <literal>@UserDatabase</literal> are custom "
 "qualifier annotations:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:38
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"public @interface LoggedIn {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD})\n"
-"@BindingType\n"
-"public @interface LoggedIn {}]]>"
-
-#. Tag: programlisting
-#: example.xml:40
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, PARAMETER, FIELD})\n"
-"public @interface UserDatabase {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD})\n"
-"@BindingType\n"
-"public @interface LoggedIn {}]]>"
-
 #. Tag: para
-#: example.xml:42
 #, no-c-format
 msgid ""
 "We need an adaptor bean to expose our typesafe <literal>EntityManager</"
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:46
-#, no-c-format
-msgid ""
-"<![CDATA[class UserDatabaseProducer {\n"
-"   @Produces @UserDatabase @PersistenceContext \n"
-"   static EntityManager userDatabase;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "Now <literal>DocumentEditor</literal>, or any other bean, can easily inject "
 "the current user:"
 msgstr "기타 다른 Web Bean은 현재 사용자를 쉽게 삽입할 수 있습니다:  "
 
-#. Tag: programlisting
-#: example.xml:50
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DocumentEditor {\n"
-"   @Inject Document document;\n"
-"   @Inject @LoggedIn User currentUser;\n"
-"   @Inject @DocumentDatabase EntityManager docDatabase;\n"
-"    \n"
-"   public void save() {\n"
-"      document.setCreatedBy(currentUser);\n"
-"      docDatabase.persist(document);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class DocumentEditor {\n"
-"\n"
-"    @Current Document document;\n"
-"    @LoggedIn User currentUser;\n"
-"    @PersistenceContext EntityManager docDatabase;\n"
-"    \n"
-"    public void save() {\n"
-"        document.setCreatedBy(currentUser);\n"
-"        docDatabase.persist(document);\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:52
 #, no-c-format
 msgid "Or we can reference the current user in a JSF view:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:54
-#, no-c-format
-msgid ""
-"<![CDATA[<h:panelGroup rendered=\"#{login.loggedIn}\">\n"
-"   signed in as #{currentUser.username}\n"
-"</h:panelGroup>]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:56
 #, fuzzy, no-c-format
 msgid ""
 "Hopefully, this example gave you a taste of the CDI programming model. In "
@@ -360,5 +103,228 @@
 "이러한 예가 Web Bean 프로그래밍 모델의 맛을 보는 계기가 되었으면 합니다. 다"
 "음 부분에서는 Web Beans 의존성 삽입에 대해 자세히 살펴보겠습니다. "
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=3, max=25)\n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=6, max=20)\n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "        \n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<h:form>\n"
+#~ "   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "      <f:validateBean>\n"
+#~ "         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"username\" value=\"#{credentials.username}\"/"
+#~ ">\n"
+#~ "         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"password\" value=\"#{credentials.password}\"/"
+#~ ">\n"
+#~ "      </f:validateBean>\n"
+#~ "   </h:panelGrid>\n"
+#~ "   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#"
+#~ "{!login.loggedIn}\"/>\n"
+#~ "   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</h:form>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<h:form>\n"
+#~ "    <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "        <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "        <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
+#~ "        <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "        <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
+#~ "    </h:panelGrid>\n"
+#~ "    <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered="
+#~ "\"#{!login.loggedIn}\"/>\n"
+#~ "    <h:commandButton value=\"Logout\" acion=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</h:form>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Entity\n"
+#~ "public class User {\n"
+#~ "   private @NotNull @Length(min=3, max=25) @Id String username;\n"
+#~ "   private @NotNull @Length(min=6, max=20) String password;\n"
+#~ "   \n"
+#~ "   public String getUsername() { return username; }\n"
+#~ "   public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "   public String setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "        \n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login implements Serializable {\n"
+#~ "\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject @UserDatabase EntityManager userDatabase;\n"
+#~ "\n"
+#~ "   private User user;\n"
+#~ "    \n"
+#~ "   public void login() {\n"
+#~ "      List<User> results = userDatabase.createQuery(\n"
+#~ "         \"select u from User u where u.username = :username and u."
+#~ "password = :password\")\n"
+#~ "         .setParameter(\"username\", credentials.getUsername())\n"
+#~ "         .setParameter(\"password\", credentials.getPassword())\n"
+#~ "         .getResultList();\n"
+#~ "        \n"
+#~ "      if (!results.isEmpty()) {\n"
+#~ "         user = results.get(0);\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         // perhaps add code here to report a failed login\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void logout() {\n"
+#~ "      user = null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public boolean isLoggedIn() {\n"
+#~ "      return user != null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "      return user;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @PersistenceContext EntityManager userDatabase;\n"
+#~ "\n"
+#~ "    private User user;\n"
+#~ "    \n"
+#~ "    public void login() {\n"
+#~ "            \n"
+#~ "        List<User> results = userDatabase.createQuery(\n"
+#~ "           \"select u from User u where u.username=:username and u."
+#~ "password=:password\")\n"
+#~ "           .setParameter(\"username\", credentials.getUsername())\n"
+#~ "           .setParameter(\"password\", credentials.getPassword())\n"
+#~ "           .getResultList();\n"
+#~ "        \n"
+#~ "        if ( !results.isEmpty() ) {\n"
+#~ "           user = results.get(0);\n"
+#~ "        }\n"
+#~ "        \n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void logout() {\n"
+#~ "        user = null;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public boolean isLoggedIn() {\n"
+#~ "       return user!=null;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "        return user;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface LoggedIn {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD})\n"
+#~ "@BindingType\n"
+#~ "public @interface LoggedIn {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface UserDatabase {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD})\n"
+#~ "@BindingType\n"
+#~ "public @interface LoggedIn {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "   @Inject Document document;\n"
+#~ "   @Inject @LoggedIn User currentUser;\n"
+#~ "   @Inject @DocumentDatabase EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "   public void save() {\n"
+#~ "      document.setCreatedBy(currentUser);\n"
+#~ "      docDatabase.persist(document);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "\n"
+#~ "    @Current Document document;\n"
+#~ "    @LoggedIn User currentUser;\n"
+#~ "    @PersistenceContext EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "    public void save() {\n"
+#~ "        document.setCreatedBy(currentUser);\n"
+#~ "        docDatabase.persist(document);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
 #~ msgid "Of course, <literal>@LoggedIn</literal> is a binding annotation:"
 #~ msgstr "<literal>@LoggedIn</literal>은 바인딩 어노테이션입니다: "

Modified: doc/trunk/reference/ko-KR/extend.po
===================================================================
--- doc/trunk/reference/ko-KR/extend.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/extend.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: extend\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-23 11:05+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -24,13 +24,11 @@
 "\n"
 
 #. Tag: title
-#: extend.xml:5
 #, no-c-format
 msgid "Portable extensions"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "CDI is intended to be a foundation for frameworks, extensions and "
@@ -44,13 +42,11 @@
 "발자에 의해 구상되었습니다. "
 
 #. Tag: para
-#: extend.xml:15
 #, no-c-format
 msgid "integration with Business Process Management engines,"
 msgstr "비지니스 프로세스 관리 엔진과의 통합 "
 
 #. Tag: para
-#: extend.xml:18
 #, no-c-format
 msgid ""
 "integration with third-party frameworks such as Spring, Seam, GWT or Wicket, "
@@ -58,31 +54,26 @@
 msgstr " Spring, Seam, GWT, Wicket과 같은 제삼자 프레임워크와의 통합 "
 
 #. Tag: para
-#: extend.xml:23
 #, fuzzy, no-c-format
 msgid "new technology based upon the CDI programming model."
 msgstr "Web Beans 프로그래밍 모델을 기반으로 하는 새로운 기술 "
 
 #. Tag: para
-#: extend.xml:27
 #, no-c-format
 msgid "More formally, according to the spec:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:32
 #, no-c-format
 msgid "A portable extension may integrate with the container by:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:35
 #, no-c-format
 msgid "Providing its own beans, interceptors and decorators to the container"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:40
 #, no-c-format
 msgid ""
 "Injecting dependencies into its own objects using the dependency injection "
@@ -90,13 +81,11 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:45
 #, no-c-format
 msgid "Providing a context implementation for a custom scope"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:50
 #, no-c-format
 msgid ""
 "Augmenting or overriding the annotation-based metadata with metadata from "
@@ -104,13 +93,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:58
 #, fuzzy, no-c-format
 msgid "Creating an <literal>Extension</literal>"
 msgstr "<literal>Bean</literal> 클래스 "
 
 #. Tag: para
-#: extend.xml:60
 #, no-c-format
 msgid ""
 "The first step in creating a portable extension is to write a class that "
@@ -119,14 +106,7 @@
 "service provider architecture."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:66
-#, no-c-format
-msgid "class MyExtension implements Extension { ... }"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:68
 #, no-c-format
 msgid ""
 "Next, we need to register our extension as a service provider by creating a "
@@ -134,14 +114,7 @@
 "literal>, which contains the name of our extension class:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:74
-#, no-c-format
-msgid "org.mydomain.extension.MyExtension"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:76
 #, no-c-format
 msgid ""
 "An extension is not a bean, exactly, since it is instantiated by the "
@@ -150,18 +123,7 @@
 "process is complete."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:82
-#, no-c-format
-msgid ""
-"@Inject \n"
-"MyBean(MyExtension myExtension) {\n"
-"   myExtension.doSomething();\n"
-"}"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:84
 #, no-c-format
 msgid ""
 "And, like beans, extensions can have observer methods. Usually, the observer "
@@ -169,33 +131,28 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:92
 #, no-c-format
 msgid "Container lifecycle events"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:94
 #, no-c-format
 msgid ""
 "During the initialization process, the container fires a series of events, "
 "including:"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:101
-#, no-c-format
-msgid "BeforeBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>BeforeBeanDiscovery</literal>"
+msgstr "<literal>Manager</literal> 객체 "
 
-#. Tag: literal
-#: extend.xml:106
-#, no-c-format
-msgid "ProcessAnnotatedType"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>ProcessAnnotatedType</literal>"
+msgstr "<literal>Manager</literal> 객체 "
 
 #. Tag: para
-#: extend.xml:110
 #, no-c-format
 msgid ""
 "<literal>ProcessInjectionTarget</literal> and <literal>ProcessProducer</"
@@ -203,54 +160,27 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:115
 #, no-c-format
 msgid ""
 "<literal>ProcessBean</literal> and <literal>ProcessObserverMethod</literal>"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:121
-#, no-c-format
-msgid "AfterBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>AfterBeanDiscovery</literal>"
+msgstr "<literal>Manager</literal> 객체 "
 
-#. Tag: literal
-#: extend.xml:126
+#. Tag: para
 #, no-c-format
-msgid "AfterDeploymentValidation"
+msgid "<literal>AfterDeploymentValidation</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:131
 #, no-c-format
 msgid "Extensions may observe these events:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:135
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"   \n"
-"   void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bbd) {\n"
-"      Logger.global.debug(\"beginning the scanning process\");\n"
-"   }\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      Logger.global.debug(\"scanning type: \" + pat.getAnnotatedType()."
-"getJavaClass().getName());\n"
-"   } \n"
-"\n"
-"   void afterBeanDiscovery(@Observes AfterBeanDiscovery abd) {\n"
-"      Logger.global.debug(\"finished the scanning process\");\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:137
 #, no-c-format
 msgid ""
 "In fact, the extension can do a lot more than just observe. The extension is "
@@ -258,43 +188,17 @@
 "example:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:142
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      //tell the container to ignore the type if it is annotated @Ignore\n"
-"      if ( pat.getAnnotatedType().isAnnotionPresent(Ignore.class) ) pat.veto"
-"();   \n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:144
 #, fuzzy, no-c-format
 msgid "The observer method may inject a <literal>BeanManager</literal>"
 msgstr "Web Beans 확장의 중심은 <literal>Manager</literal> 객체입니다.  "
 
-#. Tag: programlisting
-#: extend.xml:148
-#, no-c-format
-msgid ""
-"<![CDATA[<T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> "
-"pat, BeanManager beanManager) { ... }]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:153
 #, fuzzy, no-c-format
 msgid "The <literal>BeanManager</literal> object"
 msgstr "<literal>Manager</literal> 객체 "
 
 #. Tag: para
-#: extend.xml:155
 #, fuzzy, no-c-format
 msgid ""
 "The nerve center for extending CDI is the <literal>BeanManager</literal> "
@@ -304,68 +208,14 @@
 "<literal>Manager</literal> 인터페이스는 Web Beans, 인터셉터, 데코레이터, 옵저"
 "버 및 컨텍스트를 프로그램적으로 획득하여 등록할 수 있게 합니다. "
 
-#. Tag: programlisting
-#: extend.xml:161
-#, no-c-format
-msgid ""
-"<![CDATA[public interface BeanManager {\n"
-"   public Object getReference(Bean<?> bean, Type beanType, "
-"CreationalContext<?> ctx);\n"
-"   public Object getInjectableReference(InjectionPoint ij, "
-"CreationalContext<?> ctx);\n"
-"   public <T> CreationalContext<T> createCreationalContext(Contextual<T> "
-"contextual);\n"
-"   public Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers);\n"
-"   public Set<Bean<?>> getBeans(String name);\n"
-"   public Bean<?> getPassivationCapableBean(String id);\n"
-"   public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);\n"
-"   public void validate(InjectionPoint injectionPoint);\n"
-"   public void fireEvent(Object event, Annotation... qualifiers);\n"
-"   public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, "
-"Annotation... qualifiers);\n"
-"   public List<Decorator<?>> resolveDecorators(Set<Type> types, "
-"Annotation... qualifiers);\n"
-"   public List<Interceptor<?>> resolveInterceptors(InterceptionType type, "
-"Annotation... interceptorBindings);\n"
-"   public boolean isScope(Class<? extends Annotation> annotationType);\n"
-"   public boolean isNormalScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isPassivatingScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isQualifier(Class<? extends Annotation> annotationType);\n"
-"   public boolean isInterceptorBinding(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isStereotype(Class<? extends Annotation> annotationType);\n"
-"   public Set<Annotation> getInterceptorBindingDefinition(Class<? extends "
-"Annotation> bindingType);\n"
-"   public Set<Annotation> getStereotypeDefinition(Class<? extends "
-"Annotation> stereotype);\n"
-"   public Context getContext(Class<? extends Annotation> scopeType);\n"
-"   public ELResolver getELResolver();\n"
-"   public ExpressionFactory wrapExpressionFactory(ExpressionFactory "
-"expressionFactory);\n"
-"   public <T> AnnotatedType<T> createAnnotatedType(Class<T> type);\n"
-"   public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> "
-"type);\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:163
 #, fuzzy, no-c-format
 msgid ""
 "Any bean or other Java EE component which supports injection can obtain an "
 "instance of <literal>BeanManager</literal> via injection:"
 msgstr "삽입을 통해 <literal>Manager</literal> 인스턴스를 얻을 수 있습니다: "
 
-#. Tag: programlisting
-#: extend.xml:166
-#, fuzzy, no-c-format
-msgid "@Inject BeanManager beanManager;"
-msgstr "@Current Manager manager"
-
 #. Tag: para
-#: extend.xml:168
 #, no-c-format
 msgid ""
 "Java EE components may obtain an instance of <literal>BeanManager</literal> "
@@ -375,7 +225,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:174
 #, fuzzy, no-c-format
 msgid ""
 "Let's study some of the interfaces exposed by the <literal>BeanManager</"
@@ -383,13 +232,11 @@
 msgstr "Web Beans 확장의 중심은 <literal>Manager</literal> 객체입니다.  "
 
 #. Tag: title
-#: extend.xml:179
 #, fuzzy, no-c-format
 msgid "The <literal>InjectionTarget</literal> interface"
 msgstr "<literal>Context</literal> 인터페이스 "
 
 #. Tag: para
-#: extend.xml:181
 #, no-c-format
 msgid ""
 "The first thing that a framework developer is going to look for in the "
@@ -399,7 +246,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:188
 #, no-c-format
 msgid ""
 "We recommend that frameworks let CDI take over the job of actually "
@@ -410,50 +256,12 @@
 "field injection will be supported."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:196
-#, no-c-format
-msgid ""
-"<![CDATA[//get the BeanManager from JNDI\n"
-"BeanManager beanManager = (BeanManager) new InitialContext().lookup(\"java:"
-"comp/BeanManager\");\n"
-"\n"
-"//CDI uses an AnnotatedType object to read the annotations of a class\n"
-"AnnotatedType<SomeFrameworkComponent> type = beanManager.createAnnotatedType"
-"(SomeFrameworkComponent.class);\n"
-"\n"
-"//The extension uses an InjectionTarget to delegate instantiation, "
-"dependency injection \n"
-"//and lifecycle callbacks to the CDI container\n"
-"InjectionTarget<SomeFrameworkComponent> it = beanManager."
-"createInjectionTarget(type);\n"
-"\n"
-"//each instance needs its own CDI CreationalContext\n"
-"CreationalContext ctx = beanManager.createCreationalContext(null);\n"
-"\n"
-"//instantiate the framework component and inject its dependencies\n"
-"SomeFrameworkComponent instance = it.produce(ctx);  //call the constructor\n"
-"it.inject(instance, ctx);  //call initializer methods and perform field "
-"injection\n"
-"it.postConstruct(instance);  //call the @PostConstruct method\n"
-"\n"
-"...\n"
-"\n"
-"//destroy the framework component instance and clean up dependent objects\n"
-"it.preDestroy(instance);  //call the @PreDestroy method\n"
-"it.dispose(instance);  //it is now safe to discard the instance\n"
-"ctx.release();  //clean up dependent objects\n"
-"]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:201
 #, fuzzy, no-c-format
 msgid "The <literal>Bean</literal> interface"
 msgstr "<literal>Context</literal> 인터페이스 "
 
 #. Tag: para
-#: extend.xml:203
 #, fuzzy, no-c-format
 msgid ""
 "Instances of the interface <literal>Bean</literal> represent beans. There is "
@@ -467,46 +275,18 @@
 "록된 <literal>Bean</literal> 인스턴스가 있습니다.  "
 
 #. Tag: para
-#: extend.xml:210
 #, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface exposes all the interesting things we "
-"dicussed in <xref linkend=\"bean-anatomy\"/>."
+"dicussed in <xref linkend=\"bean-anatomy\" />."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:215
-#, no-c-format
-msgid ""
-"<![CDATA[public interface Bean<T> extends Contextual<T> {\n"
-"   public Set<Type> getTypes();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public String getName();\n"
-"   public Set<Class<? extends Annotation>> getStereotypes();\n"
-"   public Class<?> getBeanClass();\n"
-"   public boolean isAlternative();\n"
-"   public boolean isNullable();\n"
-"   public Set<InjectionPoint> getInjectionPoints();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:217
 #, no-c-format
 msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:221
-#, no-c-format
-msgid ""
-"<![CDATA[Set<Bean<?>> allBeans = beanManager.getBeans(Obect.class, new "
-"AnnotationLiteral<Any>() {});]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:223
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface makes it possible for a portable "
@@ -523,13 +303,11 @@
 "는 객체를 허용하게 할 수 있습니다. "
 
 #. Tag: title
-#: extend.xml:233
 #, fuzzy, no-c-format
 msgid "Registering a <literal>Bean</literal>"
 msgstr "<literal>Bean</literal> 클래스 "
 
 #. Tag: para
-#: extend.xml:235
 #, no-c-format
 msgid ""
 "The most common kind of CDI portable extension registers a bean (or beans) "
@@ -537,7 +315,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:239
 #, no-c-format
 msgid ""
 "In this example, we make a framework class, <literal>SecurityManager</"
@@ -547,101 +324,7 @@
 "<literal>SecurityManager</literal> instance."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[public class SecurityManagerExtension implements Extension {\n"
-"    \n"
-"    void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager "
-"bm) {\n"
-"            \n"
-"        //use this to read annotations of the class\n"
-"        AnnotatedType<SecurityManager> at = bm.createAnnotatedType"
-"(SecurityManager.class); \n"
-"\n"
-"        //use this to instantiate the class and inject dependencies\n"
-"        final InjectionTarget<SecurityManager> it = bm.createInjectionTarget"
-"(at); \n"
-"\n"
-"        abd.addBean( new Bean<SecurityManager>() {\n"
-"\n"
-"            @Override\n"
-"            public Class<?> getBeanClass() {\n"
-"                return SecurityManager.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public String getName() {\n"
-"                return \"securityManager\";\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getQualifiers() {\n"
-"                Set<Annotation> qualifiers = new HashSet<Annotation>();\n"
-"                qualifiers.add( new AnnotationLiteral<Default>() {} );\n"
-"                qualifiers.add( new AnnotationLiteral<Any>() {} );\n"
-"                return qualifiers;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<? extends Annotation> getScope() {\n"
-"                return SessionScoped.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Class<? extends Annotation>> getStereotypes() {\n"
-"                return Collections.emptySet();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypes() {\n"
-"                Set<Type> types = new HashSet<Type>();\n"
-"                types.add(SecurityManager.class);\n"
-"                types.add(Object.class);\n"
-"                return types;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAlternative() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isNullable() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public SecurityManager create(CreationalContext<SecurityManager> "
-"ctx) {\n"
-"                SecurityManager instance = it.produce(ctx);\n"
-"                it.inject(instance, ctx);\n"
-"                it.postConstruct(instance);\n"
-"                return instance;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void destroy(SecurityManager instance, \n"
-"                                CreationalContext<SecurityManager> ctx) {\n"
-"                it.preDestroy(instance);\n"
-"                it.dispose(instance);\n"
-"                ctx.release();\n"
-"            }\n"
-"            \n"
-"        } );\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:248
 #, no-c-format
 msgid ""
 "But a portable extension can also mess with beans that are discovered "
@@ -649,13 +332,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:255
 #, no-c-format
 msgid "Wrapping an <literal>AnnotatedType</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:257
 #, no-c-format
 msgid ""
 "One of the most interesting things that an extension class can do is process "
@@ -664,7 +345,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:262
 #, no-c-format
 msgid ""
 "Let's start with an example of an extension that provides support for the "
@@ -675,101 +355,7 @@
 "<literal>value()</literal> of the <literal>@Named</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:270
-#, no-c-format
-msgid ""
-"<![CDATA[public class QualifiedNameExtension implements Extension {\n"
-"\n"
-"    <X> void processAnnotatedType(@Observes ProcessAnnotatedType<X> pat) {\n"
-"\n"
-"        //wrap this to override the annotations of the class\n"
-"        final AnnotatedType<X> at = pat.getAnnotatedType();\n"
-"        \n"
-"        AnnotatedType<X> wrapped = new AnnotatedType<X>() {\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedConstructor<X>> getConstructors() {\n"
-"                return at.getConstructors();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedField<? super X>> getFields() {\n"
-"                return at.getFields();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<X> getJavaClass() {\n"
-"                return at.getJavaClass();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedMethod<? super X>> getMethods() {\n"
-"                return at.getMethods();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public <T extends Annotation> T getAnnotation(final Class<T> "
-"annType) {\n"
-"                if ( Named.class.equals(annType) ) {\n"
-"                    class NamedLiteral \n"
-"                            extends AnnotationLiteral<Named> \n"
-"                            implements Named {\n"
-"                        @Override\n"
-"                        public String value() {\n"
-"                            Package pkg = at.getClass().getPackage();\n"
-"                            String unqualifiedName = at.getAnnotation(Named."
-"class).value();\n"
-"                            final String qualifiedName;\n"
-"                            if ( pkg.isAnnotationPresent(Named.class) ) {\n"
-"                                qualifiedName = pkg.getAnnotation(Named."
-"class).value() \n"
-"                                      + '.' + unqualifiedName;\n"
-"                            }\n"
-"                            else {\n"
-"                                qualifiedName = unqualifiedName;\n"
-"                            }\n"
-"                            return qualifiedName;\n"
-"                        }\n"
-"                    }\n"
-"                    return (T) new NamedLiteral();\n"
-"                }\n"
-"                else {\n"
-"                    return at.getAnnotation(annType);\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getAnnotations() {\n"
-"                return at.getAnnotations();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Type getBaseType() {\n"
-"                return at.getBaseType();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypeClosure() {\n"
-"                return at.getTypeClosure();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annType) {\n"
-"                return at.isAnnotationPresent(annType);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pat.setAnnotatedType(wrapped);\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:272
 #, no-c-format
 msgid ""
 "Here's a second example, which adds the <literal>@Alternative</literal> "
@@ -777,41 +363,7 @@
 "literal> interface."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:277
-#, no-c-format
-msgid ""
-"<![CDATA[class ServiceAlternativeExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"   \n"
-"      final AnnotatedType<T> type = pat.getAnnotatedType();\n"
-"      \n"
-"      if ( Service.class.isAssignableFrom( type.getJavaClass() ) ) {\n"
-"      \n"
-"         //if the class implements Service, make it an @Alternative\n"
-"         AnnotatedType<T> wrapped = new AnnotatedType<T>() {\n"
-"         \n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annotationType) {\n"
-"               return annotationType.equals(Alternative.class) ? \n"
-"                  true : type.isAnnotationPresent(annotationType);\n"
-"            }\n"
-"            \n"
-"            //remaining methods of AnnotatedType\n"
-"            ...\n"
-"         }\n"
-"         \n"
-"         pat.setAnnotatedType(wrapped);\n"
-"      }\n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:283
 #, no-c-format
 msgid ""
 "The <literal>AnnotatedType</literal> is not the only thing that can be "
@@ -819,13 +371,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:288
 #, no-c-format
 msgid "Wrapping an <literal>InjectionTarget</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:290
 #, no-c-format
 msgid ""
 "The <literal>InjectionTarget</literal> interface exposes operations for "
@@ -837,7 +387,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:297
 #, no-c-format
 msgid ""
 "Here's a CDI portable extension that reads values from properties files and "
@@ -849,16 +398,7 @@
 "<literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:305
-#, no-c-format
-msgid ""
-"firstName=Gavin\n"
-"lastName=King"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:307
 #, no-c-format
 msgid ""
 "The portable extension works by wrapping the containers "
@@ -866,121 +406,7 @@
 "<literal>inject()</literal> method."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:310
-#, no-c-format
-msgid ""
-"<![CDATA[public class ConfigExtension implements Extension {\n"
-"\n"
-"        <X> void processInjectionTarget(@Observes ProcessInjectionTarget<X> "
-"pit) {\n"
-"                \n"
-"                //wrap this to intercept the component lifecycle\n"
-"            final InjectionTarget<X> it = pit.getInjectionTarget();\n"
-"            \n"
-"        final Map<Field, Object> configuredValues = new HashMap<Field, "
-"Object>();\n"
-"        \n"
-"        //use this to read annotations of the class and its members\n"
-"        AnnotatedType<X> at = pit.getAnnotatedType();\n"
-"        \n"
-"        //read the properties file\n"
-"        String propsFileName = at.getClass().getSimpleName() + \".properties"
-"\";\n"
-"        InputStream stream = at.getJavaClass().getResourceAsStream"
-"(propsFileName);\n"
-"        if (stream!=null) {\n"
-"            \n"
-"            try {\n"
-"                Properties props = new Properties();\n"
-"                props.load(stream);\n"
-"                for (Map.Entry<Object, Object> property : props.entrySet()) "
-"{\n"
-"                    String fieldName = property.getKey().toString();\n"
-"                    Object value = property.getValue();\n"
-"                    try {\n"
-"                        Field field = at.getJavaClass().getField"
-"(fieldName);\n"
-"                        field.setAccessible(true);\n"
-"                        if ( field.getType().isAssignableFrom( value.getClass"
-"() ) ) {\n"
-"                            configuredValues.put(field, value);\n"
-"                        }\n"
-"                        else {\n"
-"                            //TODO: do type conversion automatically\n"
-"                            pit.addDefinitionError( new InjectionException(\n"
-"                                   \"field is not of type String: \" + "
-"field ) );\n"
-"                        }\n"
-"                    }\n"
-"                    catch (NoSuchFieldException nsfe) {\n"
-"                        pit.addDefinitionError(nsfe);\n"
-"                    }\n"
-"                    finally {\n"
-"                        stream.close();\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"            catch (IOException ioe) {\n"
-"                pit.addDefinitionError(ioe);\n"
-"            }\n"
-"        }\n"
-"        \n"
-"        InjectionTarget<X> wrapped = new InjectionTarget<X>() {\n"
-"\n"
-"            @Override\n"
-"            public void inject(X instance, CreationalContext<X> ctx) {\n"
-"                it.inject(instance, ctx);\n"
-"                \n"
-"                //set the values onto the new instance of the component\n"
-"                for (Map.Entry<Field, Object> configuredValue: "
-"configuredValues.entrySet()) {\n"
-"                    try {\n"
-"                        configuredValue.getKey().set(instance, "
-"configuredValue.getValue());\n"
-"                    }\n"
-"                    catch (Exception e) {\n"
-"                        throw new InjectionException(e);\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void postConstruct(X instance) {\n"
-"                it.postConstruct(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void preDestroy(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void dispose(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public X produce(CreationalContext<X> ctx) {\n"
-"                return it.produce(ctx);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pit.setInjectionTarget(wrapped);\n"
-"        \n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:312
 #, no-c-format
 msgid ""
 "There's a lot more to the portable extension SPI than what we've discussed "
@@ -989,13 +415,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:320
 #, no-c-format
 msgid "The <literal>Context</literal> interface"
 msgstr "<literal>Context</literal> 인터페이스 "
 
 #. Tag: para
-#: extend.xml:322
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Context</literal> interface supports addition of new scopes to "
@@ -1004,30 +428,7 @@
 "<literal>Context</literal> 인터페이스는 Web Beans에 새로운 범위를 추가로 지원"
 "하거나 새로운 환경에 내장된 범위를 확장 지원합니다.  "
 
-#. Tag: programlisting
-#: extend.xml:327
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface Context {\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
-"creationalContext);\n"
-"   public <T> T get(Contextual<T> contextual);\n"
-"   boolean isActive();\n"
-"}]]>"
-msgstr ""
-"public interface Context {\n"
-"    \n"
-"    public Class&lt;? extends Annotation&gt; getScopeType();\n"
-"    \n"
-"    public &lt;T&gt; T get(Bean&lt;T&gt; bean, boolean create);\n"
-"    \n"
-"    boolean isActive();\n"
-"    \n"
-"}"
-
 #. Tag: para
-#: extend.xml:329
 #, fuzzy, no-c-format
 msgid ""
 "For example, we might implement <literal>Context</literal> to add a business "
@@ -1039,7 +440,31 @@
 "<literal>Context</literal>를 구현할 수 있습니다. "
 
 #, fuzzy
+#~ msgid "@Inject BeanManager beanManager;"
+#~ msgstr "@Current Manager manager"
+
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public interface Context {\n"
+#~ "   public Class<? extends Annotation> getScope();\n"
+#~ "   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
+#~ "creationalContext);\n"
+#~ "   public <T> T get(Contextual<T> contextual);\n"
+#~ "   boolean isActive();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "public interface Context {\n"
+#~ "    \n"
+#~ "    public Class&lt;? extends Annotation&gt; getScopeType();\n"
+#~ "    \n"
+#~ "    public &lt;T&gt; T get(Bean&lt;T&gt; bean, boolean create);\n"
+#~ "    \n"
+#~ "    boolean isActive();\n"
+#~ "    \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
 #~ "There are two subinterfaces of <literal>Bean</literal> defined by the CDI "
 #~ "specification: <literal>Interceptor</literal> and <literal>Decorator</"
 #~ "literal>."

Modified: doc/trunk/reference/ko-KR/extensions.po
===================================================================
--- doc/trunk/reference/ko-KR/extensions.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/extensions.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,25 +15,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: extensions.xml:8
 #, no-c-format
 msgid "CDI extensions available as part of Weld"
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:11
 #, no-c-format
 msgid "These modules are usable on any JSR-299 implementation, not just Weld!"
 msgstr ""
 
 #. Tag: title
-#: extensions.xml:17
 #, no-c-format
 msgid "Weld Logger"
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:19
 #, no-c-format
 msgid ""
 "Adding logging to your application is now even easier with simple injection "
@@ -42,26 +38,7 @@
 "will be injected into any instance of the bean."
 msgstr ""
 
-#. Tag: programlisting
-#: extensions.xml:25
-#, no-c-format
-msgid ""
-"<![CDATA[import org.slf4j.Logger;\n"
-"import javax.inject.Inject;\n"
-"\n"
-"public class Checkout {\n"
-"   private @Inject Logger log;\n"
-"\n"
-"   public void invoiceItems() {\n"
-"      ShoppingCart cart;\n"
-"      ...\n"
-"      log.debug(\"Items invoiced for {}\", cart);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extensions.xml:27
 #, no-c-format
 msgid ""
 "The example shows how objects can be interpolated into a message. If you use "
@@ -71,7 +48,6 @@
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:34
 #, no-c-format
 msgid ""
 "You can add Weld logging to your project by including weld-logger.jar, sl4j-"
@@ -81,7 +57,6 @@
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:39
 #, no-c-format
 msgid ""
 "If you are using Weld as your JSR-299 implementation, there's no need to "

Modified: doc/trunk/reference/ko-KR/gettingstarted.po
===================================================================
--- doc/trunk/reference/ko-KR/gettingstarted.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/gettingstarted.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ri\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-23 11:14+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -26,27 +26,24 @@
 "\n"
 
 #. Tag: title
-#: gettingstarted.xml:5
 #, no-c-format
 msgid "Getting started with Weld"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:7
 #, no-c-format
 msgid ""
 "Weld comes with two starter example applications, in addition to more "
 "specialized examples. The first, <literal>weld-numberguess</literal>, is a "
-"web (WAR) example containing only non-transactional managed beans. This "
+"web (war) example containing only non-transactional managed beans. This "
 "example can be run on a wide range of servers, including JBoss AS, "
 "GlassFish, Apache Tomcat, Jetty, Google App Engine, and any compliant Java "
 "EE 6 container. The second example, <literal>weld-translator</literal>, is "
-"an enterprise (EAR) example that contains session beans. This example must "
-"be run on JBoss AS 5.2, Glassfish 3.0 or any compliant Java EE 6 container."
+"an enterprise (ear) example that contains session beans. This example must "
+"be run on JBoss AS 6.0, Glassfish 3.0 or any compliant Java EE 6 container."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:16
 #, no-c-format
 msgid ""
 "Both examples use JSF 2.0 as the web framework and, as such, can be found in "
@@ -54,13 +51,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:22
 #, no-c-format
 msgid "Prerequisites"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:24
 #, no-c-format
 msgid ""
 "To run the examples with the provided build scripts, you'll need the "
@@ -68,58 +63,47 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:30
 #, fuzzy, no-c-format
 msgid "the latest release of Weld, which contains the examples"
 msgstr "최신 Web Beans RI 릴리즈 "
 
 #. Tag: para
-#: gettingstarted.xml:33
 #, no-c-format
 msgid "Ant 1.7.0, to build and deploy the examples"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:36
 #, no-c-format
 msgid "a supported runtime environment (minimum versions shown)"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:39
-#, no-c-format
-msgid ""
-"JBoss AS 5.2.0 (currently only nightly builds of JBoss AS 5.2.0.Beta1 are "
-"available),"
-msgstr ""
+#, fuzzy, no-c-format
+msgid "JBoss AS 6.0.0,"
+msgstr "JBoss AS 5.0.0.GA, 및 "
 
 #. Tag: para
-#: gettingstarted.xml:42
 #, no-c-format
 msgid "GlassFish 3.0,"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:45
 #, no-c-format
-msgid "Apache Tomcat 6.0.x (WAR example only), or"
+msgid "Apache Tomcat 6.0.x (war example only), or"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:48
 #, no-c-format
-msgid "Jetty 6.1.x (WAR example only)"
+msgid "Jetty 6.1.x (war example only)"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:53
 #, no-c-format
 msgid ""
 "(optionally) Maven 2.x, to run the examples in an embedded servlet container"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:58
 #, no-c-format
 msgid ""
 "You'll need a full install of Ant 1.7.0. Some linux distributions only "
@@ -128,27 +112,24 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:64
 #, no-c-format
 msgid ""
 "In the next few sections, you'll be using the Ant command (<literal>ant</"
 "literal>) to invoke the Ant build script in each example to compile, "
-"assemble and deploy the example to JBoss AS and, for the WAR example, Apache "
-"Tomcat. You can also deploy the generated artifact (WAR or EAR) to any other "
+"assemble and deploy the example to JBoss AS and, for the war example, Apache "
+"Tomcat. You can also deploy the generated artifact (war or ear) to any other "
 "container that supports Java EE 6, such as GlassFish 3."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:71
 #, no-c-format
 msgid ""
 "If you have Maven installed, you can use the Maven command (<literal>mvn</"
-"literal>) to compile and assemble the standalone artifact (WAR or EAR) and, "
-"for the WAR example, run it in an embedded container."
+"literal>) to compile and assemble the standalone artifact (war or ear) and, "
+"for the war example, run it in an embedded container."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:76
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
@@ -156,28 +137,25 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:81
 #, no-c-format
 msgid "Deploying to JBoss AS"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:83
 #, no-c-format
 msgid ""
 "To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss."
-"org/jbossas/\">JBoss AS 5.2.0.Beta1</ulink> or above. If a release of the "
-"JBoss AS 5.2 line isn't yet available, you can download a <ulink url="
-"\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-5.x-sun16/"
-"\">nightly snapshot</ulink>. The reason JBoss AS 5.2.0.Beta1 or above is "
-"required is because it's the first release that has both CDI and Bean "
-"Validation support built-in, making it close enough to Java EE 6 to run the "
-"examples. The good news is that there are no additional modifications you "
-"have to make to the server. It's ready to go!"
+"org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS "
+"6.0 line isn't yet available, you can download a <ulink url=\"http://hudson."
+"jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</"
+"ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the "
+"first release that has both CDI and Bean Validation support built-in, making "
+"it close enough to Java EE 6 to run the examples. The good news is that "
+"there are no additional modifications you have to make to the server. It's "
+"ready to go!"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:92
 #, no-c-format
 msgid ""
 "After you have downloaded JBoss AS, extract it. (We recommended renaming the "
@@ -187,16 +165,7 @@
 "installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[$> unzip jboss-5.2.*.zip\n"
-"$> mv jboss-5.2.*/ jboss-as-5.2]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:101
 #, no-c-format
 msgid ""
 "In order for the build scripts to know where to deploy the example, you have "
@@ -207,74 +176,36 @@
 "<literal>jboss.home</literal>, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:108
-#, fuzzy, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
-msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
-
 #. Tag: para
-#: gettingstarted.xml:110
 #, fuzzy, no-c-format
 msgid "You're now ready to deploy your first example!"
 msgstr "이제, 첫번째 예제를 배치할 준비가 되었습니다!      "
 
 #. Tag: para
-#: gettingstarted.xml:114
 #, no-c-format
 msgid ""
 "Switch to the <literal>examples/jsf/numberguess</literal> directory and "
 "execute the Ant <literal>deploy</literal> target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:119
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant deploy]]>"
-msgstr ""
-"$ cd examples/numberguess\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:121
 #, no-c-format
 msgid ""
 "If you haven't already, start JBoss AS. You can either start JBoss AS from a "
 "Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:125
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/jboss-as-5.2\n"
-"$> ./bin/run.sh]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:127 gettingstarted.xml:369
 #, no-c-format
 msgid "a Windows command window:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:131
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\jboss-as-5.2\\bin\n"
-"$> run]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:133 gettingstarted.xml:375
 #, no-c-format
 msgid "or you can start the server using an IDE, like Eclipse."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:138
 #, no-c-format
 msgid ""
 "If you are using Eclipse, you should seriously consider installing the "
@@ -284,7 +215,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:145
 #, fuzzy, no-c-format
 msgid ""
 "Wait a few seconds for the application to deploy (or the application server "
@@ -298,7 +228,6 @@
 "니다.  "
 
 #. Tag: para
-#: gettingstarted.xml:152
 #, no-c-format
 msgid ""
 "The Ant build script includes additional targets for JBoss AS to deploy and "
@@ -307,7 +236,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:158
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant restart</literal> - deploy the example in exploded format to "
@@ -316,7 +244,6 @@
 "<literal>ant restart</literal> - exploded 형식으로 예제를 배치합니다      "
 
 #. Tag: para
-#: gettingstarted.xml:163
 #, no-c-format
 msgid ""
 "<literal>ant explode</literal> - update an exploded example, without "
@@ -326,7 +253,6 @@
 "를 업데이트합니다     "
 
 #. Tag: para
-#: gettingstarted.xml:168
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant deploy</literal> - deploy the example in compressed jar format "
@@ -335,19 +261,16 @@
 "<literal>ant deploy</literal> - 압축된 jar 포맷으로 예제를 배치합니다   "
 
 #. Tag: para
-#: gettingstarted.xml:173
 #, fuzzy, no-c-format
 msgid "<literal>ant undeploy</literal> - remove the example from JBoss AS"
 msgstr "<literal>ant undeploy</literal> - 서버에서 예제를 제거합니다 "
 
 #. Tag: para
-#: gettingstarted.xml:178
 #, no-c-format
 msgid "<literal>ant clean</literal> - clean the example"
 msgstr "<literal>ant clean</literal> - 예제를 지웁니다 "
 
 #. Tag: para
-#: gettingstarted.xml:185
 #, no-c-format
 msgid ""
 "The second starter example, <literal>weld-translator</literal>, will "
@@ -356,27 +279,15 @@
 "translator example directory and execute the deploy target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/translator\n"
-"$> ant deploy]]>"
-msgstr ""
-"$ cd examples/translator\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:194
 #, no-c-format
 msgid ""
 "The translator uses session beans, which are packaged in an EJB module "
-"within an EAR. Java EE 6 will allow session beans to be deployed in WAR "
+"within an ear. Java EE 6 will allow session beans to be deployed in war "
 "modules, but that's a topic for a later chapter."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:200
 #, fuzzy, no-c-format
 msgid ""
 "Again, wait a few seconds for the application to deploy (if you're really "
@@ -388,55 +299,32 @@
 "localhost:8080/webbeans-translator</ulink>)을 제공하는 컨텍스트 경로를 설정합"
 "니다.  "
 
-#. Tag: para
-#: gettingstarted.xml:206
-#, no-c-format
-msgid ""
-"TODO Insert note about upgrading the Weld deployer that directs reader to "
-"section on the JBoss AS environment"
-msgstr ""
-
 #. Tag: title
-#: gettingstarted.xml:213
 #, no-c-format
 msgid "Deploying to GlassFish"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:215
 #, no-c-format
 msgid ""
-"Deploying to GlassFish should be easy, right? After all, it's the Java EE 6 "
-"reference implementation. Since it's the Java EE 6 reference implementation, "
-"that means it also bundles the JSR-299 reference implementation, Weld! So "
-"yes, it's very easy."
+"Deploying to GlassFish should be easy and familiar, right? After all, it's "
+"the Java EE 6 reference implementation and Weld is the JSR-299 reference "
+"implementation, meaning Weld gets bundled with GlassFish. So yes, it's all "
+"quite easy and familiar."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:221
 #, no-c-format
 msgid ""
 "To deploy the examples to GlassFish, you'll need the final <ulink url="
-"\"https://glassfish.dev.java.net/\">GlassFish V3</ulink> release (the "
-"preview release won't do). If the final release isn't yet available, you can "
-"download a <ulink url=\"http://download.java.net/glassfish/v3/promoted/"
-"\">promoted build</ulink> in the meantime. Select the b69 preview release or "
-"above that ends in either <literal>-unix.sh</literal> or <literal>-windows."
-"exe</literal> depending on your platform. After the download is complete, "
-"execute the installer. On Linux/Unix, you'll need to first make the script "
-"executable."
+"\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</"
+"ulink> release. Select the release that ends in either <literal>-unix.sh</"
+"literal> or <literal>-windows.exe</literal> depending on your platform. "
+"After the download is complete, execute the installer. On Linux/Unix, you'll "
+"need to first make the script executable."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:231
-#, no-c-format
-msgid ""
-"<![CDATA[$> chmod 755 glassfish-v3-b69-unix.sh\n"
-"$> ./glassfish-v3-b69-unix.sh]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:233
 #, no-c-format
 msgid ""
 "On Windows you can just click on the executable. Follow the instructions in "
@@ -447,7 +335,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:240
 #, no-c-format
 msgid ""
 "If you've deployed either of the starter examples, <literal>weld-"
@@ -456,16 +343,7 @@
 "either of the two directories and build it."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess (or examples/jsf/translator)\n"
-"$> ant package]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:248
 #, no-c-format
 msgid ""
 "The deployable archive for the <literal>weld-numberguess</literal>, named "
@@ -477,24 +355,17 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:255
 #, no-c-format
 msgid ""
-"You deploy applications to GlassFish using the <ulink url=\"http://"
-"localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin Console "
-"running, you need to start a GlassFish domain, in our case <literal>domain1</"
-"literal>. Switch to the <literal>bin</literal> folder in the directory where "
-"you installed GlassFish and execute the following command:"
+"One way to deploy applications to GlassFish is by using the <ulink url="
+"\"http://localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin "
+"Console running, you need to start a GlassFish domain, in our case "
+"<literal>domain1</literal>. Switch to the <literal>bin</literal> folder in "
+"the directory where you installed GlassFish and execute the following "
+"command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:262
-#, no-c-format
-msgid "<![CDATA[$> asadmin start-domain domain1]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:264
 #, no-c-format
 msgid ""
 "After a few seconds you can visit the Admin Console in the browser at the "
@@ -511,22 +382,26 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:276
 #, no-c-format
 msgid ""
+"Alternatively, you can deploy the application to GlassFish using the asadmin "
+"command:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The reason the same artifact can be deployed to both JBoss AS and GlassFish, "
 "without any modifications, is because all of the features being used are "
 "part of the standard platform. And what a capable platform it has become!"
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:285
 #, no-c-format
 msgid "Deploying to Apache Tomcat"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:287
 #, no-c-format
 msgid ""
 "Servlet containers are not required to support Java EE services like CDI. "
@@ -535,7 +410,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:291
 #, no-c-format
 msgid ""
 "Weld comes with a servlet listener which bootstraps the CDI environment, "
@@ -546,7 +420,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:297
 #, fuzzy, no-c-format
 msgid ""
 "Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll "
@@ -556,16 +429,7 @@
 "다음으로 <ulink url=\"http://seamframework.org/Download\">seamframework.org</"
 "ulink>에서 Web Beans RI를 다운로드하여 압축 풀기를 합니다. 예: "
 
-#. Tag: programlisting
-#: gettingstarted.xml:302
-#, fuzzy, no-c-format
-msgid "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
-msgstr ""
-"<![CDATA[$ cd /Applications\n"
-"$ unzip ~/jboss-5.0.0.GA.zip]]>"
-
 #. Tag: para
-#: gettingstarted.xml:304
 #, no-c-format
 msgid ""
 "You have two choices for how you can deploy the application to Tomcat. You "
@@ -576,13 +440,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:312
 #, no-c-format
 msgid "Deploying with Ant"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:314
 #, no-c-format
 msgid ""
 "In order for Ant to push the artifact to the Tomcat hot deploy directory, it "
@@ -593,38 +455,19 @@
 "property key <literal>tomcat.home</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:321
-#, fuzzy, no-c-format
-msgid "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
-msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
-
 #. Tag: para
-#: gettingstarted.xml:323
 #, fuzzy, no-c-format
 msgid "Now you're ready to deploy the numberguess example to Tomcat!"
 msgstr "numberguess 예제를 배치하려면:    "
 
 #. Tag: para
-#: gettingstarted.xml:327
 #, no-c-format
 msgid ""
 "Change to the <literal>examples/jsf/numberguess</literal> directory again "
 "and run the Ant <literal>deploy</literal> target for Tomcat:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:332
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant tomcat.deploy]]>"
-msgstr ""
-"$ cd examples/numberguess\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:335
 #, no-c-format
 msgid ""
 "The Ant build script includes additional targets for Tomcat to deploy and "
@@ -633,7 +476,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:341
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.restart</literal> - deploy the example in exploded "
@@ -642,7 +484,6 @@
 "<literal>ant restart</literal> - exploded 형식으로 예제를 배치합니다      "
 
 #. Tag: para
-#: gettingstarted.xml:346
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.explode</literal> - update an exploded example, without "
@@ -652,7 +493,6 @@
 "를 업데이트합니다     "
 
 #. Tag: para
-#: gettingstarted.xml:351
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.deploy</literal> - deploy the example in compressed jar "
@@ -661,39 +501,18 @@
 "<literal>ant deploy</literal> - 압축된 jar 포맷으로 예제를 배치합니다   "
 
 #. Tag: para
-#: gettingstarted.xml:356
 #, fuzzy, no-c-format
 msgid "<literal>ant tomcat.undeploy</literal> - remove the example from Tomcat"
 msgstr "<literal>ant undeploy</literal> - 서버에서 예제를 제거합니다 "
 
 #. Tag: para
-#: gettingstarted.xml:363
 #, no-c-format
 msgid ""
 "If you haven't already, start Tomcat. You can either start Tomcat from a "
 "Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:367
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/apache-tomcat-6\n"
-"$> ./bin/start.sh]]>"
-msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
-
-#. Tag: programlisting
-#: gettingstarted.xml:373
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
-"$> start]]>"
-msgstr ""
-"<![CDATA[$ cd /Applications\n"
-"$ unzip ~/jboss-5.0.0.GA.zip]]>"
-
 #. Tag: para
-#: gettingstarted.xml:379
 #, no-c-format
 msgid ""
 "Wait a few seconds for the application to deploy (or the application server "
@@ -704,13 +523,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:388
 #, no-c-format
 msgid "Deploying with Maven"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:390
 #, no-c-format
 msgid ""
 "You can also deploy the application to Tomcat using Maven. This section is a "
@@ -720,7 +537,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:396
 #, no-c-format
 msgid ""
 "The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
@@ -732,7 +548,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:403
 #, no-c-format
 msgid ""
 "To allow Maven to communicate with Tomcat over HTTP, edit the <literal>conf/"
@@ -740,41 +555,20 @@
 "following line:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:408
-#, no-c-format
-msgid "<![CDATA[<user username=\"admin\" password=\"\" roles=\"manager\"/>]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:410
 #, no-c-format
 msgid ""
 "Restart Tomcat. You can now deploy the application to Tomcat with Maven "
 "using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:414
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:exploded tomcat:exploded -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:416
 #, no-c-format
 msgid ""
 "Once the application is deployed, you can redeploy it using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:420
-#, no-c-format
-msgid "<![CDATA[$> mvn tomcat:redeploy -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:422
 #, no-c-format
 msgid ""
 "The <literal>-Ptomcat</literal> argument activates the <literal>tomcat</"
@@ -783,21 +577,13 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:427
 #, no-c-format
 msgid ""
 "Rather than shipping the container off to a standalone Tomcat installation, "
 "you can also execute the application in an embedded Tomcat 6 container:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:432
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace tomcat:run -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:434
 #, no-c-format
 msgid ""
 "The advantage of using the embedded server is that changes to assets in "
@@ -807,14 +593,7 @@
 "classpath resource, you need to execute a build:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:441
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:443
 #, no-c-format
 msgid ""
 "There are several other Maven goals that you can use if you are hacking on "
@@ -823,13 +602,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:453
 #, no-c-format
 msgid "Deploying to Jetty"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:457
 #, no-c-format
 msgid ""
 "Support for Jetty in the examples is a more recent addition. Since Jetty is "
@@ -840,7 +617,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:464
 #, no-c-format
 msgid ""
 "If you've read through the entire Tomcat section, then you're all ready to "
@@ -850,7 +626,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:470
 #, no-c-format
 msgid ""
 "The Maven POM (<literal>pom.xml</literal>) includes a profile named "
@@ -862,25 +637,15 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:479
 #, no-c-format
 msgid ""
 "To run the <literal>weld-numberguess</literal> example on Jetty, switch to "
 "the example directory and execute the <literal>inplace</literal> goal of the "
-"Maven WAR plugin followed by the <literal>run</literal> goal of the Maven "
+"Maven war plugin followed by the <literal>run</literal> goal of the Maven "
 "Jetty plugin with the <literal>jetty</literal> profile enabled, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:485
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> mvn war:inplace jetty:run -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:487
 #, no-c-format
 msgid ""
 "The log output of Jetty will be shown in the console. Once Jetty reports "
@@ -891,7 +656,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:494
 #, no-c-format
 msgid ""
 "Any changes to assets in <literal>src/main/webapp</literal> take effect "
@@ -899,30 +663,22 @@
 "application may automatically redeploy. The redeploy behavior can be fined-"
 "tuned in the plugin configuration. If you make a change to a classpath "
 "resource, you need to execute a build and the <literal>inplace</literal> "
-"goal of the Maven WAR plugin, again with the <literal>jetty</literal> "
+"goal of the Maven war plugin, again with the <literal>jetty</literal> "
 "profile enabled."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:501
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:503
 #, no-c-format
 msgid ""
-"The <literal>war:inplace</literal> goal copies the compiled classes and JARs "
+"The <literal>war:inplace</literal> goal copies the compiled classes and jars "
 "inside <literal>src/main/webapp</literal>, under <literal>WEB-INF/classes</"
 "literal> and <literal>WEB-INF/lib</literal>, respectively, mixing source and "
 "compiled files. However, the build does work around these temporary files by "
-"excluding them from the packaged WAR and cleaning them during the Maven "
+"excluding them from the packaged war and cleaning them during the Maven "
 "clean phase."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:510
 #, no-c-format
 msgid ""
 "You have two options if you want to run the example on Jetty from the IDE. "
@@ -932,33 +688,18 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:516
 #, no-c-format
 msgid "First, initialize the Eclipse project:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:520
-#, no-c-format
-msgid "<![CDATA[$> mvn clean eclipse:clean eclipse:eclipse -Pjetty-ide]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:522
 #, no-c-format
 msgid ""
 "Next, assemble all the necessary resources under <literal>src/main/webapp</"
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:526
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace -Pjetty-ide]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:528
 #, no-c-format
 msgid ""
 "Now, you are ready to run the server in Eclipse. Import the project into "
@@ -971,7 +712,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:536
 #, no-c-format
 msgid ""
 "Now that you have gotten the starter applications deployed on the server of "
@@ -980,7 +720,59 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
+
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> ant deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/numberguess\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/translator\n"
+#~ "$> ant deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/translator\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
+#~ msgstr ""
+#~ "<![CDATA[$ cd /Applications\n"
+#~ "$ unzip ~/jboss-5.0.0.GA.zip]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> ant tomcat.deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/numberguess\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd /path/to/apache-tomcat-6\n"
+#~ "$> ./bin/start.sh]]>"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
+#~ "$> start]]>"
+#~ msgstr ""
+#~ "<![CDATA[$ cd /Applications\n"
+#~ "$ unzip ~/jboss-5.0.0.GA.zip]]>"
+
+#, fuzzy
+#~ msgid ""
 #~ "Getting started with Web Beans, the Reference Implementation of JSR-299"
 #~ msgstr "Web Beans 참조 구현 "
 
@@ -1012,10 +804,6 @@
 #~ "translator</literal>가 있습니다. 예를 실행하려면, 다음 사항이 필요합니"
 #~ "다:           "
 
-#, fuzzy
-#~ msgid "JBoss AS 5.0.1.GA, or"
-#~ msgstr "JBoss AS 5.0.0.GA, 및 "
-
 #~ msgid "Ant 1.7.0."
 #~ msgstr "Ant 1.7.0."
 

Modified: doc/trunk/reference/ko-KR/injection.po
===================================================================
--- doc/trunk/reference/ko-KR/injection.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/injection.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: injection\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-23 17:37+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -33,28 +33,24 @@
 "\n"
 
 #. Tag: title
-#: injection.xml:4
 #, fuzzy, no-c-format
 msgid "Dependency injection and programmatic lookup"
 msgstr "의존성 삽입 "
 
 #. Tag: para
-#: injection.xml:6
 #, no-c-format
 msgid ""
-"One of the most significant features of CDI&#8212;certainly the most "
-"recognized&#8212;is dependency injection; excuse me, <emphasis>typesafe</"
-"emphasis> dependency injection."
+"One of the most significant features of CDI—certainly the most recognized—is "
+"dependency injection; excuse me, <emphasis>typesafe</emphasis> dependency "
+"injection."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:12
 #, no-c-format
 msgid "Injection points"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:14
 #, no-c-format
 msgid ""
 "The <literal>@Inject</literal> annotation lets us define an injection point "
@@ -63,77 +59,21 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:19
 #, fuzzy, no-c-format
 msgid "<emphasis>Bean constructor</emphasis> parameter injection:"
 msgstr "<emphasis>초기화</emphasis> 방식 매개 변수 삽입: "
 
-#. Tag: programlisting
-#: injection.xml:23
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private final ShoppingCart cart;\n"
-"    \n"
-"   @Inject\n"
-"   public Checkout(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"    private final ShoppingCart cart;\n"
-"    \n"
-"    @Initializer\n"
-"    public Checkout(ShoppingCart cart) {\n"
-"        this.cart = cart;\n"
-"    }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:26
 #, no-c-format
 msgid "A bean can only have one injectable constructor."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:31
 #, fuzzy, no-c-format
 msgid "<emphasis>Initializer method</emphasis> parameter injection:"
 msgstr "<emphasis>초기화</emphasis> 방식 매개 변수 삽입: "
 
-#. Tag: programlisting
-#: injection.xml:35
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private ShoppingCart cart;\n"
-"\n"
-"   @Inject\n"
-"   void setShoppingCart(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"    private ShoppingCart cart;\n"
-"\n"
-"    @Initializer \n"
-"    void setShoppingCart(ShoppingCart cart) {\n"
-"        this.cart = cart;\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:38
 #, no-c-format
 msgid ""
 "A bean can have multiple initializer methods. If the bean is a session bean, "
@@ -142,29 +82,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:44
 #, no-c-format
 msgid "And direct field injection:"
 msgstr "직접적 영역 삽입: "
 
-#. Tag: programlisting
-#: injection.xml:48
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"   private @Inject ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"    private @Current ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:51
 #, no-c-format
 msgid ""
 "Getter and setter methods are not required for field injection to work "
@@ -172,7 +94,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:56
 #, fuzzy, no-c-format
 msgid ""
 "Dependency injection always occurs when the bean instance is first "
@@ -182,7 +103,6 @@
 "Web Bean 인스턴스가 먼저 인스턴스화되었을 경우 의존성 삽입이 발생합니다. "
 
 #. Tag: para
-#: injection.xml:63
 #, fuzzy, no-c-format
 msgid ""
 "First, the container calls the bean constructor (the default constructor or "
@@ -193,7 +113,6 @@
 "니다.  "
 
 #. Tag: para
-#: injection.xml:69
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container initializes the values of all injected fields of the "
@@ -202,7 +121,6 @@
 "다음으로, Web Bean 관리자는 Web Bean의 삽입된 모든 영역의 값을 초기화합니다. "
 
 #. Tag: para
-#: injection.xml:74
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container calls all initializer methods of bean (the call order is "
@@ -210,7 +128,6 @@
 msgstr "그 후, Web Bean 관리자는 Web Bean의 모든 초기화 방식을 호출합니다.  "
 
 #. Tag: para
-#: injection.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "Finally, the <literal>@PostConstruct</literal> method, if any, is called."
@@ -218,7 +135,6 @@
 "마지막으로 Web Bean의 <literal>@PostConstruct</literal> 방식이 호출됩니다. "
 
 #. Tag: para
-#: injection.xml:86
 #, no-c-format
 msgid ""
 "(The only complication is that the container might call initializer methods "
@@ -227,7 +143,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:90
 #, no-c-format
 msgid ""
 "One major advantage of constructor injection is that it allows the bean to "
@@ -235,7 +150,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:95
 #, no-c-format
 msgid ""
 "CDI also supports parameter injection for some other methods that are "
@@ -243,36 +157,21 @@
 "producer methods:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:100
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:102
 #, no-c-format
 msgid ""
 "This is a case where the <literal>@Inject</literal> annotation <emphasis>is "
 "not</emphasis> required at the injection point. The same is true for "
-"observer methods (which we'll meet in <xref linkend=\"events\"/>) and "
+"observer methods (which we'll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:110
 #, no-c-format
 msgid "What gets injected"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:112
 #, fuzzy, no-c-format
 msgid ""
 "The CDI specification defines a procedure, called <emphasis>typesafe "
@@ -292,7 +191,6 @@
 "는 <literal>AmbiguousDependencyException</literal>을 넘기게 됩니다.  "
 
 #. Tag: para
-#: injection.xml:120
 #, fuzzy, no-c-format
 msgid ""
 "The purpose of this algorithm is to allow multiple beans to implement the "
@@ -302,7 +200,6 @@
 "것입니다: "
 
 #. Tag: para
-#: injection.xml:126
 #, fuzzy, no-c-format
 msgid ""
 "allow the client to select which implementation it requires using a "
@@ -312,7 +209,6 @@
 "현 사항을 선택하게 합니다, "
 
 #. Tag: para
-#: injection.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "allow the application deployer to select which implementation is appropriate "
@@ -324,13 +220,11 @@
 "택하게 합니다.   "
 
 #. Tag: para
-#: injection.xml:137
 #, no-c-format
 msgid "allow the beans to be isolated into separate modules."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:143
 #, no-c-format
 msgid ""
 "Obviously, if you have exactly one bean of a given type, and an injection "
@@ -340,7 +234,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:149
 #, no-c-format
 msgid ""
 "But then, things start to get complicated. Let's explore how the container "
@@ -349,13 +242,11 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:157
 #, fuzzy, no-c-format
 msgid "Qualifier annotations"
 msgstr "바인딩 어노테이션 "
 
 #. Tag: para
-#: injection.xml:159
 #, fuzzy, no-c-format
 msgid ""
 "If we have more than one bean that implements a particular bean type, the "
@@ -368,36 +259,7 @@
 "다. 예를 들어, <literal>PaymentProcessor</literal>의 두 가지 구현이 있을 수 "
 "있습니다: "
 
-#. Tag: programlisting
-#: injection.xml:165
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Synchronous\n"
-"public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: injection.xml:167
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Asynchronous\n"
-"public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:169
 #, fuzzy, no-c-format
 msgid ""
 "Where <literal>@Synchronous</literal> and <literal>@Asynchronous</literal> "
@@ -406,36 +268,7 @@
 "여기서 <literal>@PayByCheque</literal> 및 <literal>@PayByCreditCard</literal>"
 "는 바인딩 어노테이션입니다:  "
 
-#. Tag: programlisting
-#: injection.xml:173
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Synchronous {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayByCheque {}]]>"
-
-#. Tag: programlisting
-#: injection.xml:175
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Asynchronous {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayByCheque {}]]>"
-
 #. Tag: para
-#: injection.xml:177
 #, fuzzy, no-c-format
 msgid ""
 "A client bean developer uses the qualifier annotation to specify exactly "
@@ -445,76 +278,21 @@
 "Bean이 삽입되어야 하는 지를 지정합니다. "
 
 #. Tag: para
-#: injection.xml:181
 #, no-c-format
 msgid "Using field injection:"
 msgstr "영역 삽입 사용: "
 
-#. Tag: programlisting
-#: injection.xml:183
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
-"@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@PayByCheque PaymentProcessor chequePaymentProcessor;\n"
-"@PayByCreditCard PaymentProcessor creditCardPaymentProcessor;]]>"
-
 #. Tag: para
-#: injection.xml:185
 #, no-c-format
 msgid "Using initializer method injection:"
 msgstr "초기화 방식 삽입 사용: "
 
-#. Tag: programlisting
-#: injection.xml:187
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public void setPaymentProcessors(@Synchronous PaymentProcessor "
-"syncPaymentProcessor, \n"
-"                                 @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public void setPaymentProcessors(@PayByCheque PaymentProcessor "
-"chequePaymentProcessor, \n"
-"                                 @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:189
 #, fuzzy, no-c-format
 msgid "Using constructor injection:"
 msgstr "생성자 삽입 사용: "
 
-#. Tag: programlisting
-#: injection.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
-"                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public Checkout(@PayByCheque PaymentProcessor chequePaymentProcessor, \n"
-"                @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:193
 #, no-c-format
 msgid ""
 "Qualifier annotations can also qualify method arguments of producer, "
@@ -523,29 +301,7 @@
 "runtime based on the state of the system:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:199
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces\n"
-"PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
-"syncPaymentProcessor,\n"
-"                                     @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   return isSynchronous() ? syncPaymentProcessor : asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public void setPaymentProcessors(@PayByCheque PaymentProcessor "
-"chequePaymentProcessor, \n"
-"                                 @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:201
 #, no-c-format
 msgid ""
 "If an injected field or a parameter of a bean constructor or initializer "
@@ -554,7 +310,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:206
 #, no-c-format
 msgid ""
 "Now, you may be thinking, <emphasis>\"What's the different between using a "
@@ -566,7 +321,6 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:216
 #, fuzzy, no-c-format
 msgid ""
 "The built-in qualifiers <literal>@Default</literal> and <literal>@Any</"
@@ -576,7 +330,6 @@
 "literal> 콜백 기능만을 지원합니다.    "
 
 #. Tag: para
-#: injection.xml:218
 #, no-c-format
 msgid ""
 "Whenever a bean or injection point does not explicitly declare a qualifier, "
@@ -589,33 +342,18 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:225
 #, no-c-format
 msgid ""
 "This is especially useful if you want to iterate over all beans with a "
 "certain bean type. For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:226
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject \n"
-"void initServices(@Any Instance<Service> services) { \n"
-"   for (Service service: services) {\n"
-"      service.init();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:232
 #, no-c-format
 msgid "Qualifiers with members"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:234
 #, no-c-format
 msgid ""
 "Java annotations can have members. We can use annotation members to further "
@@ -625,41 +363,13 @@
 "single annotation with a member:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:240
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayBy {\n"
-"    PaymentType value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:242
 #, no-c-format
 msgid ""
 "Then we select one of the possible member values when appling the qualifier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:246
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:248
 #, fuzzy, no-c-format
 msgid ""
 "We can force the container to ignore a member of a qualifier type by "
@@ -668,48 +378,17 @@
 "Web Bean 관리자에게 <literal>@NonBinding</literal> 멤버를 어노테이션하여 바인"
 "딩 어노테이션 유형 멤버를 무시하라고 말할 수 있습니다.  "
 
-#. Tag: programlisting
-#: injection.xml:253
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"   @Nonbinding String comment() default \"\";\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @NonBinding public String value();\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:258
 #, no-c-format
 msgid "Multiple qualifiers"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:260
 #, fuzzy, no-c-format
 msgid "An injection point may specify multiple qualifiers:"
 msgstr "삽입 지점은 여러 바인딩 어노테이션을 지정할 수 도 있습니다:  "
 
-#. Tag: programlisting
-#: injection.xml:264
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
-"syncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:266
 #, fuzzy, no-c-format
 msgid ""
 "Then only a bean which has <emphasis>both</emphasis> qualifier annotations "
@@ -718,29 +397,12 @@
 "이러한 경우, <emphasis>양쪽</emphasis> 바인딩 어노테이션을 갖는 Web Bean만 삽"
 "입될 수 있습니다. "
 
-#. Tag: programlisting
-#: injection.xml:271
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Synchronous @Reliable\n"
-"public class SynchronousReliablePaymentProcessor implements PaymentProcessor "
-"{\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:276
 #, no-c-format
 msgid "Alternatives"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:278
 #, no-c-format
 msgid ""
 "Alternatives are beans whose implementation is specific to a particular "
@@ -749,22 +411,7 @@
 "<literal>@Asynchronous PaymentProcessor</literal>, all in one:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:282
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Synchronous @Asynchronous\n"
-"public class MockPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:284
 #, no-c-format
 msgid ""
 "By default, <literal>@Alternative</literal> beans are disabled. We need to "
@@ -773,24 +420,7 @@
 "and injection. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:290
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <class>org.mycompany.mock.MockPaymentProcessor</class>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:292
 #, no-c-format
 msgid ""
 "When an ambiguous dependency exists at an injection point, the container "
@@ -800,13 +430,11 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:301
 #, fuzzy, no-c-format
 msgid "Fixing unsatisfied and ambiguous dependencies"
 msgstr "불만족스러운 의존성 수정 "
 
 #. Tag: para
-#: injection.xml:303
 #, fuzzy, no-c-format
 msgid ""
 "The typesafe resolution algorithm fails when, after considering the "
@@ -821,7 +449,6 @@
 "우 타입 안정적 해상도 알고리즘은 실패하게 됩니다.     "
 
 #. Tag: para
-#: injection.xml:310
 #, no-c-format
 msgid ""
 "During the course of your development, you're going to encounter this "
@@ -829,13 +456,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:314
 #, no-c-format
 msgid "To fix an <emphasis>unsatisfied dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:320
 #, no-c-format
 msgid ""
 "create a bean which implements the bean type and has all the qualifier types "
@@ -843,7 +468,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:325
 #, no-c-format
 msgid ""
 "make sure that the bean you already have is in the classpath of the module "
@@ -851,7 +475,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:330
 #, no-c-format
 msgid ""
 "explicitly enable an <literal>@Alternative</literal> bean that implements "
@@ -860,13 +483,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:337
 #, no-c-format
 msgid "To fix an <emphasis>ambiguous dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:343
 #, no-c-format
 msgid ""
 "introduce a qualifier to distinguish between the two implementations of the "
@@ -874,14 +495,12 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:348
 #, no-c-format
 msgid ""
 "disable one of the beans by annotating it <literal>@Alternative</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:353
 #, no-c-format
 msgid ""
 "move one of the implementations to a module that is not in the classpath of "
@@ -889,7 +508,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:359
 #, no-c-format
 msgid ""
 "disable one of two <literal>@Alternative</literal> beans that are trying to "
@@ -897,7 +515,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:366
 #, no-c-format
 msgid ""
 "See <ulink url=\"http://sfwk.org/Documentation/"
@@ -908,22 +525,19 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:374
 #, no-c-format
 msgid "Just remember: \"There can be only one.\""
 msgstr ""
 
 #. Tag: para
-#: injection.xml:377
 #, no-c-format
 msgid ""
 "On the other hand, if you really do have an optional or multivalued "
 "injection point, you should change the type of your injection point to "
-"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\"/>."
+"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:382
 #, fuzzy, no-c-format
 msgid ""
 "Now there's one more issue you need to be aware of when using the dependency "
@@ -933,13 +547,11 @@
 "다. "
 
 #. Tag: title
-#: injection.xml:389
 #, no-c-format
 msgid "Client proxies"
 msgstr "클라이언트 프록시 "
 
 #. Tag: para
-#: injection.xml:391
 #, fuzzy, no-c-format
 msgid ""
 "Clients of an injected bean do not usually hold a direct reference to a bean "
@@ -950,13 +562,12 @@
 "습니다. "
 
 #. Tag: para
-#: injection.xml:396
 #, fuzzy, no-c-format
 msgid ""
 "Imagine that a bean bound to the application scope held a direct reference "
 "to a bean bound to the request scope. The application-scoped bean is shared "
 "between many different requests. However, each request should see a "
-"different instance of the request scoped bean&#8212;the current one!"
+"different instance of the request scoped bean—the current one!"
 msgstr ""
 "요청 범위로 바운딩된 Web Bean으로의 직접 참조를 보유하고 있는 애플리케이션 범"
 "위에 바운딩된 Web Bean을 가정해 봅시다. 애플리케이션 범위에 바운딩된 Web Bean"
@@ -964,7 +575,6 @@
 "딩된 Web Bean의 다른 인스턴스를 확인해야 합니다! "
 
 #. Tag: para
-#: injection.xml:402
 #, fuzzy, no-c-format
 msgid ""
 "Now imagine that a bean bound to the session scope holds a direct reference "
@@ -981,7 +591,6 @@
 "나열되어서는 안됩니다! "
 
 #. Tag: para
-#: injection.xml:409
 #, fuzzy, no-c-format
 msgid ""
 "Therefore, unless a bean has the default scope <literal>@Dependent</"
@@ -1002,7 +611,6 @@
 "로 바운딩되게 합니다. "
 
 #. Tag: para
-#: injection.xml:417
 #, fuzzy, no-c-format
 msgid ""
 "Unfortunately, due to limitations of the Java language, some Java types "
@@ -1016,20 +624,17 @@
 "<literal>UnproxyableDependencyException</literal>을 던지게 됩니다.      "
 
 #. Tag: para
-#: injection.xml:423
 #, fuzzy, no-c-format
 msgid "The following Java types cannot be proxied by the container:"
 msgstr "다음과 같은 Java 유형은 Web Bean 관리자에 의해 프록시될 수 없습니다:  "
 
 #. Tag: para
-#: injection.xml:427
 #, fuzzy, no-c-format
 msgid ""
 "classes which don't have a non-private constructor with no parameters, and"
 msgstr "매개 변수 없는 비전용 생성자를 갖지 않는 클래스, "
 
 #. Tag: para
-#: injection.xml:430
 #, no-c-format
 msgid ""
 "classes which are declared <literal>final</literal> or have a "
@@ -1039,13 +644,11 @@
 "방식을 갖는 클래스, "
 
 #. Tag: para
-#: injection.xml:435
 #, no-c-format
 msgid "arrays and primitive types."
 msgstr "배열 및 기본 유형   "
 
 #. Tag: para
-#: injection.xml:439
 #, no-c-format
 msgid ""
 "It's usually very easy to fix an unproxyable dependency problem. If an "
@@ -1054,13 +657,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:446
 #, no-c-format
 msgid "add a constructor with no parameters to <literal>X</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:451
 #, no-c-format
 msgid ""
 "change the type of the injection point to <literal>Instance&lt;X&gt;</"
@@ -1068,7 +669,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:456
 #, no-c-format
 msgid ""
 "introduce an interface <literal>Y</literal>, implemented by the injected "
@@ -1076,7 +676,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:462
 #, no-c-format
 msgid ""
 "if all else fails, change the scope of the injected bean to "
@@ -1084,7 +683,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:469
 #, no-c-format
 msgid ""
 "A future release of Weld will likely support a non-standard workaround for "
@@ -1092,7 +690,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:476
 #, no-c-format
 msgid ""
 "Sun, IcedTea, Mac: <literal>Unsafe.allocateInstance()</literal> (The most "
@@ -1100,7 +697,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:481
 #, no-c-format
 msgid ""
 "IBM, JRockit: <literal>ReflectionFactory.newConstructorForSerialization()</"
@@ -1108,19 +704,16 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:487
 #, no-c-format
 msgid "But we didn't get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:496
 #, fuzzy, no-c-format
 msgid "Obtaining a contextual instance by programmatic lookup"
 msgstr "프로그램적 lookup에 의해 Web Bean 획득 "
 
 #. Tag: para
-#: injection.xml:498
 #, no-c-format
 msgid ""
 "In certain situations, injection is not the most convenient way to obtain a "
@@ -1128,13 +721,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:505
 #, no-c-format
 msgid "the bean type or qualifiers vary dynamically at runtime, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:510
 #, no-c-format
 msgid ""
 "depending upon the deployment, there may be no bean which satisfies the type "
@@ -1142,13 +733,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:515
 #, no-c-format
 msgid "we would like to iterate over all beans of a certain type."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:521
 #, fuzzy, no-c-format
 msgid ""
 "In these situations, the application may obtain an instance of the interface "
@@ -1157,14 +746,7 @@
 "애플리케이션은 삽입에 의해 <literal>Manager</literal> 인터페이스의 인스턴스"
 "를 획득할 수 있습니다:  "
 
-#. Tag: programlisting
-#: injection.xml:526
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:528
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>get()</literal> method of <literal>Instance</literal> produces "
@@ -1172,26 +754,17 @@
 msgstr ""
 "테스트 용 <literal>@Mock</literal> 및 <literal>@Staging</literal> 배치 유형 "
 
-#. Tag: programlisting
-#: injection.xml:532
-#, fuzzy, no-c-format
-msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:534
 #, no-c-format
 msgid "Qualifiers can be specified in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:540
 #, no-c-format
 msgid "by annotating the <literal>Instance</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:543
 #, fuzzy, no-c-format
 msgid ""
 "by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
@@ -1201,22 +774,11 @@
 "literal> 콜백 기능만을 지원합니다.    "
 
 #. Tag: para
-#: injection.xml:547
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is much, much easier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:551
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
-"paymentProcessorSource;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:553
 #, no-c-format
 msgid ""
 "Now, the <literal>PaymentProcessor</literal> returned by <literal>get()</"
@@ -1224,7 +786,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:558
 #, no-c-format
 msgid ""
 "Alternatively, we can specify the qualifier dynamically. First, we add the "
@@ -1232,15 +793,7 @@
 "default qualifier. (All beans have the qualifier <literal>@Any</literal>.)"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:563
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:565
 #, no-c-format
 msgid ""
 "Next, we need to obtain an instance of our qualifier type. Since annotatons "
@@ -1250,68 +803,30 @@
 "subclassing the helper class <literal>AnnotationLiteral</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:572
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[abstract class AsynchronousQualifier\n"
-"extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
-msgstr ""
-"<![CDATA[abstract class CreditCardBinding \n"
-"    extends AnnotationLiteral<CreditCard> \n"
-"    implements CreditCard {}]]>"
-
 #. Tag: para
-#: injection.xml:574
 #, no-c-format
 msgid "In some cases, we can use an anonymous class:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:578
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
-"   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
-msgstr ""
-"<![CDATA[PaymentProcessor p = manager.getInstanceByType(PaymentProcessor."
-"class, \n"
-"                                               new "
-"AnnotationLiteral<CreditCard>(){});]]>"
-
 #. Tag: para
-#: injection.xml:581
 #, no-c-format
 msgid ""
 "We can't use an anonymous class to implement a qualifier type with members."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:586
 #, no-c-format
 msgid ""
 "Now, finally, we can pass the qualifier to the <literal>select()</literal> "
 "method of <literal>Instance</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:590
-#, no-c-format
-msgid ""
-"<![CDATA[Annotation qualifier = synchronously ?\n"
-"      new SynchronousQualifier() : new AsynchronousQualifier();\n"
-"PaymentProcessor p = anyPaymentProcessor.select(qualifier).get().process"
-"(payment);]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:595
 #, no-c-format
 msgid "The <literal>InjectionPoint</literal> object"
 msgstr "<literal>InjectionPoint</literal> 객체 "
 
 #. Tag: para
-#: injection.xml:597
 #, fuzzy, no-c-format
 msgid ""
 "There are certain kinds of dependent objects (beans with scope "
@@ -1324,7 +839,6 @@
 "입 지점에 관해 알아야 합니다. 예:  "
 
 #. Tag: para
-#: injection.xml:603
 #, no-c-format
 msgid ""
 "The log category for a <literal>Logger</literal> depends upon the class of "
@@ -1334,7 +848,6 @@
 "합니다.  "
 
 #. Tag: para
-#: injection.xml:607
 #, no-c-format
 msgid ""
 "Injection of a HTTP parameter or header value depends upon what parameter or "
@@ -1344,7 +857,6 @@
 "을 지정하였는가에 의존합니다. "
 
 #. Tag: para
-#: injection.xml:611
 #, no-c-format
 msgid ""
 "Injection of the result of an EL expression evaluation depends upon the "
@@ -1354,7 +866,6 @@
 "현식에 의존합니다.  "
 
 #. Tag: para
-#: injection.xml:616
 #, fuzzy, no-c-format
 msgid ""
 "A bean with scope <literal>@Dependent</literal> may inject an instance of "
@@ -1366,7 +877,6 @@
 "된 메타데이트를 액세스합니다. "
 
 #. Tag: para
-#: injection.xml:620
 #, no-c-format
 msgid ""
 "Let's look at an example. The following code is verbose, and vulnerable to "
@@ -1375,14 +885,7 @@
 "다음 예를 살펴봅시다. 다음과 같은 코드는 프로그램을 리팩토링하기에 취약하고 "
 "장황합니다: "
 
-#. Tag: programlisting
-#: injection.xml:623
-#, no-c-format
-msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-msgstr "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-
 #. Tag: para
-#: injection.xml:625
 #, no-c-format
 msgid ""
 "This clever little producer method lets you inject a JDK <literal>Logger</"
@@ -1391,42 +894,12 @@
 "이와 같이 현명한 생산자 방식은 로그 범주를 명시적으로 지정하지 않고 JDK "
 "<literal>Logger</literal>를 삽입하게 합니다:  "
 
-#. Tag: programlisting
-#: injection.xml:628
-#, no-c-format
-msgid ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:630
 #, no-c-format
 msgid "We can now write:"
 msgstr "이제 다음을 작성할 수 있습니다:  "
 
-#. Tag: programlisting
-#: injection.xml:632
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject Logger log;]]>"
-msgstr "<![CDATA[@Current Logger log;]]>"
-
 #. Tag: para
-#: injection.xml:634
 #, fuzzy, no-c-format
 msgid ""
 "Not convinced? Then here's a second example. To inject HTTP parameters, we "
@@ -1435,72 +908,17 @@
 "확신하시지 않습니까? 그러시다면 여기에 두 번째 예제가 있습니다. HTTP 매개 변"
 "수를 삽입하려면, 바인딩 유형을 정의해야 합니다:  "
 
-#. Tag: programlisting
-#: injection.xml:637
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @Nonbinding public String value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @NonBinding public String value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:639
 #, fuzzy, no-c-format
 msgid "We would use this qualifier type at injection points as follows:"
 msgstr "다음과 같이 삽입 지점에서 이러한 바인딩 유형을 사용할 수 있습니다:  "
 
-#. Tag: programlisting
-#: injection.xml:641
-#, no-c-format
-msgid ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-msgstr ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-
 #. Tag: para
-#: injection.xml:643
 #, no-c-format
 msgid "The following producer method does the work:"
 msgstr "다음의 생산자 방식은 다음과 같이 작업합니다:  "
 
-#. Tag: programlisting
-#: injection.xml:645
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotated().getAnnotation(HttpParam."
-"class).value());\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotation(HttpParam.class).value"
-"());\n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:647
 #, fuzzy, no-c-format
 msgid ""
 "(Note that the <literal>value()</literal> member of the <literal>HttpParam</"
@@ -1512,7 +930,6 @@
 "시됨에 유의하시기 바랍니다.   "
 
 #. Tag: para
-#: injection.xml:650
 #, fuzzy, no-c-format
 msgid ""
 "The container provides a built-in bean that implements the "
@@ -1521,30 +938,395 @@
 "Web Bean 관리자는 <literal>InjectionPoint</literal> 인터페이스를 구현하는 내"
 "장된 Web Bean을 제공합니다:  "
 
-#. Tag: programlisting
-#: injection.xml:653
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Type getType();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Bean<?> getBean();\n"
-"   public Member getMember();\n"
-"   public Annotated getAnnotated();\n"
-"   public boolean isDelegate();\n"
-"   public boolean isTransient();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Object getInstance(); \n"
-"   public Bean<?> getBean(); \n"
-"   public Member getMember(): \n"
-"   public <T extends Annotation> T getAnnotation(Class<T> annotation); \n"
-"   public Set<T extends Annotation> getAnnotations(); \n"
-"}]]>"
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   public Checkout(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "    private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "    @Initializer\n"
+#~ "    public Checkout(ShoppingCart cart) {\n"
+#~ "        this.cart = cart;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "}]]>"
 
 #, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private ShoppingCart cart;\n"
+#~ "\n"
+#~ "   @Inject\n"
+#~ "   void setShoppingCart(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "    private ShoppingCart cart;\n"
+#~ "\n"
+#~ "    @Initializer \n"
+#~ "    void setShoppingCart(ShoppingCart cart) {\n"
+#~ "        this.cart = cart;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "   private @Inject ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "    private @Current ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Synchronous\n"
+#~ "public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Asynchronous\n"
+#~ "public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Synchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayByCheque {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Asynchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayByCheque {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
+#~ "@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque PaymentProcessor chequePaymentProcessor;\n"
+#~ "@PayByCreditCard PaymentProcessor creditCardPaymentProcessor;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public void setPaymentProcessors(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor, \n"
+#~ "                                 @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public void setPaymentProcessors(@PayByCheque PaymentProcessor "
+#~ "chequePaymentProcessor, \n"
+#~ "                                 @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
+#~ "                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public Checkout(@PayByCheque PaymentProcessor chequePaymentProcessor, \n"
+#~ "                @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces\n"
+#~ "PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor,\n"
+#~ "                                     @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   return isSynchronous() ? syncPaymentProcessor : "
+#~ "asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public void setPaymentProcessors(@PayByCheque PaymentProcessor "
+#~ "chequePaymentProcessor, \n"
+#~ "                                 @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayBy {\n"
+#~ "    PaymentType value();\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "   @Nonbinding String comment() default \"\";\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @NonBinding public String value();\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
+#~ "syncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Synchronous @Reliable\n"
+#~ "public class SynchronousReliablePaymentProcessor implements "
+#~ "PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative @Synchronous @Asynchronous\n"
+#~ "public class MockPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
+#~ "paymentProcessorSource;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]"
+#~ ">"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[abstract class AsynchronousQualifier\n"
+#~ "extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[abstract class CreditCardBinding \n"
+#~ "    extends AnnotationLiteral<CreditCard> \n"
+#~ "    implements CreditCard {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
+#~ "   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
+#~ msgstr ""
+#~ "<![CDATA[PaymentProcessor p = manager.getInstanceByType(PaymentProcessor."
+#~ "class, \n"
+#~ "                                               new "
+#~ "AnnotationLiteral<CreditCard>(){});]]>"
+
+#~ msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
+#~ msgstr "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
+
+#~ msgid ""
+#~ "<![CDATA[class LogFactory {\n"
+#~ "\n"
+#~ "   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
+#~ "      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass"
+#~ "().getName()); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[class LogFactory {\n"
+#~ "\n"
+#~ "   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
+#~ "      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass"
+#~ "().getName()); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject Logger log;]]>"
+#~ msgstr "<![CDATA[@Current Logger log;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @Nonbinding public String value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @NonBinding public String value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@HttpParam(\"username\") String username;\n"
+#~ "@HttpParam(\"password\") String password;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@HttpParam(\"username\") String username;\n"
+#~ "@HttpParam(\"password\") String password;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[class HttpParams\n"
+#~ "\n"
+#~ "   @Produces @HttpParam(\"\")\n"
+#~ "   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
+#~ "      return request.getParameter(ip.getAnnotated().getAnnotation"
+#~ "(HttpParam.class).value());\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[class HttpParams\n"
+#~ "\n"
+#~ "   @Produces @HttpParam(\"\")\n"
+#~ "   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
+#~ "      return request.getParameter(ip.getAnnotation(HttpParam.class).value"
+#~ "());\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public interface InjectionPoint { \n"
+#~ "   public Type getType();\n"
+#~ "   public Set<Annotation> getQualifiers();\n"
+#~ "   public Bean<?> getBean();\n"
+#~ "   public Member getMember();\n"
+#~ "   public Annotated getAnnotated();\n"
+#~ "   public boolean isDelegate();\n"
+#~ "   public boolean isTransient();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface InjectionPoint { \n"
+#~ "   public Object getInstance(); \n"
+#~ "   public Bean<?> getBean(); \n"
+#~ "   public Member getMember(): \n"
+#~ "   public <T extends Annotation> T getAnnotation(Class<T> annotation); \n"
+#~ "   public Set<T extends Annotation> getAnnotations(); \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
 #~ "It's usually very easy to fix an unproxyable dependency problem. Simply "
 #~ "add a constructor with no parameters to the injected class, introduce an "
 #~ "interface, or, if all else fails, change the scope of the injected bean "

Modified: doc/trunk/reference/ko-KR/interceptors.po
===================================================================
--- doc/trunk/reference/ko-KR/interceptors.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/interceptors.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: interceptors\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-23 11:10+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -23,13 +23,11 @@
 "\n"
 
 #. Tag: title
-#: interceptors.xml:5
 #, no-c-format
 msgid "Interceptors"
 msgstr "인터셉터 "
 
 #. Tag: para
-#: interceptors.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Interceptor functionality is defined in the Java Interceptors specification. "
@@ -40,32 +38,27 @@
 "반 방식을 특징으로 합니다. "
 
 #. Tag: para
-#: interceptors.xml:12
 #, fuzzy, no-c-format
 msgid ""
 "The Interceptors specification defines two kinds of interception points:"
 msgstr "EJB 사양은 두 종류의 인터셉션 지점을 정의합니다:  "
 
 #. Tag: para
-#: interceptors.xml:18
 #, no-c-format
 msgid "business method interception, and"
 msgstr "비지니스 방식 인터셉터 "
 
 #. Tag: para
-#: interceptors.xml:21
 #, no-c-format
 msgid "lifecycle callback interception."
 msgstr "수명주기 콜백 인터셉터 "
 
 #. Tag: para
-#: interceptors.xml:25
 #, fuzzy, no-c-format
 msgid "In addition, the EJB specification defines timeout method interception."
 msgstr "EJB 사양은 두 종류의 인터셉션 지점을 정의합니다:  "
 
 #. Tag: para
-#: interceptors.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>business method interceptor</emphasis> applies to invocations of "
@@ -74,23 +67,7 @@
 "<emphasis>비지니스 방식 인터셉터</emphasis>는 Web Bean 클라이언트에 의해 Web "
 "Bean 방식 호출에 적용됩니다: "
 
-#. Tag: programlisting
-#: interceptors.xml:34
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:36
 #, no-c-format
 msgid ""
 "A <emphasis>lifecycle callback interceptor</emphasis> applies to invocations "
@@ -99,22 +76,7 @@
 "<emphasis>수명 주기 콜백 인터셉터</emphasis>는 컨테이너에 의해 수명 주기 콜"
 "백 호출에 적용됩니다:  "
 
-#. Tag: programlisting
-#: interceptors.xml:41
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"   @PostConstruct \n"
-"   public void injectDependencies(InvocationContext ctx) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"    @PostConstruct public void injectDependencies(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:43
 #, no-c-format
 msgid ""
 "An interceptor class may intercept both lifecycle callbacks and business "
@@ -123,7 +85,6 @@
 "인터셉터 클래스는 수명 주기 콜백 및 비지니스 방식 모두를 차단할 수 있습니다. "
 
 #. Tag: para
-#: interceptors.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>timeout method interceptor</emphasis> applies to invocations of "
@@ -132,29 +93,12 @@
 "<emphasis>수명 주기 콜백 인터셉터</emphasis>는 컨테이너에 의해 수명 주기 콜"
 "백 호출에 적용됩니다:  "
 
-#. Tag: programlisting
-#: interceptors.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TimeoutInterceptor {\n"
-"   @AroundTimeout \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:55
 #, no-c-format
 msgid "Interceptor bindings"
 msgstr "인터셉터 바인딩 "
 
 #. Tag: para
-#: interceptors.xml:57
 #, fuzzy, no-c-format
 msgid ""
 "Suppose we want to declare that some of our beans are transactional. The "
@@ -165,22 +109,7 @@
 "로 해야할 것은 어떤 Web Beans에 관심이 있는 지를 지정하기 위해 <emphasis>인터"
 "셉터 바인딩 어노테이션</emphasis>을 합니다:  "
 
-#. Tag: programlisting
-#: interceptors.xml:62
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-
 #. Tag: para
-#: interceptors.xml:64
 #, no-c-format
 msgid ""
 "Now we can easily specify that our <literal>ShoppingCart</literal> is a "
@@ -189,42 +118,17 @@
 "<literal>ShoppingCart</literal>가 트랜젝션 객체임을 쉽게 지정할 수 있습니"
 "다:  "
 
-#. Tag: programlisting
-#: interceptors.xml:68
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:70
 #, no-c-format
 msgid "Or, if we prefer, we can specify that just one method is transactional:"
 msgstr "원하실 경우, 하나의 방식 만이 트랙젝션 가능하도록 지정할 수 있습니다: "
 
-#. Tag: programlisting
-#: interceptors.xml:74
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class ShoppingCart {\n"
-"    @Transactional public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:79
 #, no-c-format
 msgid "Implementing interceptors"
 msgstr "인터셉터 구현 "
 
 #. Tag: para
-#: interceptors.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "That's great, but somewhere along the line we're going to have to actually "
@@ -237,68 +141,22 @@
 "<literal>@Interceptor</literal> 및 <literal>@Transactional</literal>로 어노테"
 "이션하는 것입니다.  "
 
-#. Tag: programlisting
-#: interceptors.xml:87
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:89
 #, no-c-format
 msgid "Interceptors can take advantage of dependency injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:93
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource UserTransaction transaction;\n"
-"\n"
-"    @AroundInvoke \n"
-"    public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource Transaction transaction;\n"
-"\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:95
 #, no-c-format
 msgid "Multiple interceptors may use the same interceptor binding type."
 msgstr "여러 인터셉터는 동일한 인터셉터 바인딩 유형을 사용할 수 있습니다.  "
 
 #. Tag: title
-#: interceptors.xml:102
 #, no-c-format
 msgid "Enabling interceptors"
 msgstr "인터셉터 활성화 "
 
 #. Tag: para
-#: interceptors.xml:104
 #, no-c-format
 msgid ""
 "By default, all interceptors are disabled. We need to <emphasis>enable</"
@@ -306,30 +164,12 @@
 "a bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:110
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:112
 #, no-c-format
 msgid "Whoah! Why the angle bracket stew?"
 msgstr "왜 각진 괄호를 써야 합니까? "
 
 #. Tag: para
-#: interceptors.xml:114
 #, fuzzy, no-c-format
 msgid ""
 "Well, having the XML declaration is actually a <emphasis>good thing</"
@@ -337,7 +177,6 @@
 msgstr "XML 선언으로 두 가지 문제를 해결합니다:  "
 
 #. Tag: para
-#: interceptors.xml:120
 #, no-c-format
 msgid ""
 "it enables us to specify a total ordering for all the interceptors in our "
@@ -347,13 +186,11 @@
 "하며, 결정적인 작업를 확인합니다  "
 
 #. Tag: para
-#: interceptors.xml:126
 #, no-c-format
 msgid "it lets us enable or disable interceptor classes at deployment time."
 msgstr "배치시 인터셉터 클래스를 활성화 또는 비활성화하게 합니다.    "
 
 #. Tag: para
-#: interceptors.xml:130
 #, fuzzy, no-c-format
 msgid ""
 "For example, we could specify that our security interceptor runs before our "
@@ -362,25 +199,7 @@
 "예를 들어, <literal>TransactionInterceptor</literal> 이전에 보안 인터셉터를 "
 "실행하도록 지정할 수 있습니다.  "
 
-#. Tag: programlisting
-#: interceptors.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.SecurityInterceptor</class>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:136
 #, no-c-format
 msgid ""
 "Or we could turn them both off in our test environment by simply not "
@@ -388,13 +207,11 @@
 msgstr ""
 
 #. Tag: title
-#: interceptors.xml:142
 #, no-c-format
 msgid "Interceptor bindings with members"
 msgstr "멤버와 인터셉터 바인딩  "
 
 #. Tag: para
-#: interceptors.xml:144
 #, no-c-format
 msgid ""
 "Suppose we want to add some extra information to our "
@@ -403,26 +220,7 @@
 "<literal>@Transactional</literal> 어노테이션에 정보를 추가하고자 한다고 가정"
 "합시다: "
 
-#. Tag: programlisting
-#: interceptors.xml:148
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"   boolean requiresNew() default false;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"    boolean requiresNew() default false;\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:150
 #, fuzzy, no-c-format
 msgid ""
 "CDI will use the value of <literal>requiresNew</literal> to choose between "
@@ -433,25 +231,7 @@
 "터 <literal>TransactionInterceptor</literal>와 "
 "<literal>RequiresNewTransactionInterceptor</literal> 중에서 선택하게 됩니다. "
 
-#. Tag: programlisting
-#: interceptors.xml:155
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional(requiresNew=true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:157
 #, no-c-format
 msgid ""
 "Now we can use <literal>RequiresNewTransactionInterceptor</literal> like "
@@ -460,18 +240,7 @@
 "다음과 같이 <literal>RequiresNewTransactionInterceptor</literal>를 사용할 수 "
 "있습니다:  "
 
-#. Tag: programlisting
-#: interceptors.xml:161
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true)\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional(requiresNew=true)\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:163
 #, fuzzy, no-c-format
 msgid ""
 "But what if we only have one interceptor and we want the container to ignore "
@@ -483,32 +252,12 @@
 "literal> 값을 무시하기 위한 관리자를 원할 경우에는 <literal>@NonBinding</"
 "literal> 어노테이션을 사용할 수 있습니다:  "
 
-#. Tag: programlisting
-#: interceptors.xml:169
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"   @Nonbinding String[] rolesAllowed() default {};\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"    @NonBinding String[] rolesAllowed() default {};\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:174
 #, no-c-format
 msgid "Multiple interceptor binding annotations"
 msgstr "여러개의 인터셉터 바인딩 어노테이션  "
 
 #. Tag: para
-#: interceptors.xml:176
 #, fuzzy, no-c-format
 msgid ""
 "Usually we use combinations of interceptor bindings types to bind multiple "
@@ -521,18 +270,7 @@
 "Bean에 <literal>TransactionInterceptor</literal> 및 "
 "<literal>SecurityInterceptor</literal>를 바인딩할 수 있습니다: "
 
-#. Tag: programlisting
-#: interceptors.xml:182
-#, no-c-format
-msgid ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:184
 #, no-c-format
 msgid ""
 "However, in very complex cases, an interceptor itself may specify some "
@@ -541,18 +279,7 @@
 "하지만 매우 복잡한 경우 인터셉터 자체가 인터셉터 바인딩 유형의 조합을 일부 지"
 "정할 수 있습니다:  "
 
-#. Tag: programlisting
-#: interceptors.xml:189
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:191
 #, no-c-format
 msgid ""
 "Then this interceptor could be bound to the <literal>checkout()</literal> "
@@ -561,68 +288,12 @@
 "그 후 이러한 인터셉터는 다음과 같은 조합 중 하나를 사용하여 <literal>checkout"
 "()</literal> 방식에 바운딩될 수 있습니다: "
 
-#. Tag: programlisting
-#: interceptors.xml:196
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class ShoppingCart {\n"
-"    @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:198
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"    @Transactional public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:200
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart {\n"
-"   @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactionl\n"
-"public class ShoppingCart {\n"
-"    @Secure public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:202
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"    public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:207
 #, no-c-format
 msgid "Interceptor binding type inheritance"
 msgstr "인터셉터 바인딩 유형 상속 "
 
 #. Tag: para
-#: interceptors.xml:209
 #, no-c-format
 msgid ""
 "One limitation of the Java language support for annotations is the lack of "
@@ -632,47 +303,21 @@
 "어노테이션에 대한 Java 언어 지원 한계는 어노테이션 상속의 결여입니다. 실제로 "
 "어노테이션은 재사용 기능이 내장되어 있어 이러한 기능이 작동하게 해야 합니다: "
 
-#. Tag: programlisting
-#: interceptors.xml:214
-#, no-c-format
-msgid ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-msgstr ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:216
 #, fuzzy, no-c-format
 msgid ""
 "Well, fortunately, CDI works around this missing feature of Java. We may "
 "annotate one interceptor binding type with other interceptor binding types "
 "(termed a <emphasis>meta-annotation</emphasis>). The interceptor bindings "
-"are transitive &#8212; any bean with the first interceptor binding inherits "
-"the interceptor bindings declared as meta-annotations."
+"are transitive — any bean with the first interceptor binding inherits the "
+"interceptor bindings declared as meta-annotations."
 msgstr ""
 "다행히도 Web Beans는 이러한 생략된 Java의 기능을 해결하여 하나의 인터셉터 바"
 "인딩 유형을 다른 인터셉터 바인딩 유형과 어노테이션할 수 있습니다. 인터셉터 바"
 "인딩은 트렌젝션 가능하여  &#151;  첫번째 인터셉터 바인딩이 있는 Web Bean은 메"
 "타 어노테이션으로 명시된 인터셉터 바인딩을 상속할 수 있습니다. "
 
-#. Tag: programlisting
-#: interceptors.xml:223
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBinding\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBindingType\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:225
 #, fuzzy, no-c-format
 msgid ""
 "Now, any bean annotated <literal>@Action</literal> will be bound to both "
@@ -686,13 +331,11 @@
 "이 있을 경우 이것으로 바운딩됩니다.) "
 
 #. Tag: title
-#: interceptors.xml:234
 #, no-c-format
 msgid "Use of <literal>@Interceptors</literal>"
 msgstr "<literal>@Interceptors</literal> 사용 "
 
 #. Tag: para
-#: interceptors.xml:236
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>@Interceptors</literal> annotation defined by the interceptor "
@@ -702,57 +345,289 @@
 "EJB 사양에 의해 정의된 <literal>@Interceptors</literal> 어노테이션은 엔터프라"
 "이즈 및 심플 Web Beans 모두를 지원합니다. 예:   "
 
-#. Tag: programlisting
-#: interceptors.xml:239
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"    public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:241
 #, no-c-format
 msgid "However, this approach suffers the following drawbacks:"
 msgstr "하지만, 이러한 방식은 다음과 같은 결점을 갖습니다: "
 
 #. Tag: para
-#: interceptors.xml:245
 #, no-c-format
 msgid "the interceptor implementation is hardcoded in business code,"
 msgstr "인터셉터 구현은 비지니스 코드에서 하드코어되어 있습니다 "
 
 #. Tag: para
-#: interceptors.xml:250
 #, no-c-format
 msgid "interceptors may not be easily disabled at deployment time, and"
 msgstr "인터셉터는 배치시 쉽게 비활성화할 수 없습니다, "
 
 #. Tag: para
-#: interceptors.xml:255
 #, fuzzy, no-c-format
 msgid ""
-"the interceptor ordering is non-global &#8212; it is determined by the order "
-"in which interceptors are listed at the class level."
+"the interceptor ordering is non-global — it is determined by the order in "
+"which interceptors are listed at the class level."
 msgstr ""
 "인터셉터 순서는 비전역적입니다 &#151; 이는 클래스 레벨로 열거된 인터셉터 순서"
 "에 의해 결정됩니다. "
 
 #. Tag: para
-#: interceptors.xml:262
 #, fuzzy, no-c-format
 msgid "Therefore, we recommend the use of CDI-style interceptor bindings."
 msgstr "따라서 Web Beans 형식 인터셉터 바인딩을 사용할 것을 권장합니다.  "
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DependencyInjectionInterceptor {\n"
+#~ "   @PostConstruct \n"
+#~ "   public void injectDependencies(InvocationContext ctx) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DependencyInjectionInterceptor {\n"
+#~ "    @PostConstruct public void injectDependencies(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class TimeoutInterceptor {\n"
+#~ "   @AroundTimeout \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "    @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke \n"
+#~ "    public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource Transaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {\n"
+#~ "   boolean requiresNew() default false;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {\n"
+#~ "    boolean requiresNew() default false;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
+#~ "public class RequiresNewTransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional(requiresNew=true) @Interceptor\n"
+#~ "public class RequiresNewTransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional(requiresNew = true)\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional(requiresNew=true)\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Secure {\n"
+#~ "   @Nonbinding String[] rolesAllowed() default {};\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Secure {\n"
+#~ "    @NonBinding String[] rolesAllowed() default {};\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure @Interceptor\n"
+#~ "public class TransactionalSecureInterceptor { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure @Interceptor\n"
+#~ "public class TransactionalSecureInterceptor { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "    @Transactional @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "    @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactionl\n"
+#~ "public class ShoppingCart {\n"
+#~ "    @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "    public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "@InterceptorBinding\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Action { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "@InterceptorBindingType\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Action { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
+#~ "class})\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
+#~ "class})\n"
+#~ "public class ShoppingCart {\n"
+#~ "    public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "Web Beans re-uses the basic interceptor architecture of EJB 3.0, "
 #~ "extending the functionality in two directions:"
 #~ msgstr ""

Modified: doc/trunk/reference/ko-KR/intro.po
===================================================================
--- doc/trunk/reference/ko-KR/intro.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/intro.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: intro\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-29 14:49+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -31,13 +31,11 @@
 "\n"
 
 #. Tag: title
-#: intro.xml:4
 #, no-c-format
 msgid "Introduction"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "So you're keen to get started writing your first bean? Or perhaps you're "
@@ -53,13 +51,11 @@
 "지 못하고 계실 수 도 있습니다.  "
 
 #. Tag: title
-#: intro.xml:13
 #, fuzzy, no-c-format
 msgid "What is a bean?"
 msgstr "Web Bean은 무엇인가요?  "
 
 #. Tag: para
-#: intro.xml:15
 #, no-c-format
 msgid ""
 "A bean is exactly what you think it is. Only now, it has a true identity in "
@@ -67,7 +63,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:19
 #, no-c-format
 msgid ""
 "Prior to Java EE 6, there was no clear definition of the term \"bean\" in "
@@ -80,7 +75,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:27
 #, no-c-format
 msgid ""
 "Java EE 6 finally lays down that common definition in the Managed Beans "
@@ -94,14 +88,13 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:36
 #, no-c-format
 msgid ""
 "With very few exceptions, almost every concrete Java class that has a "
 "constructor with no parameters (or a constructor designated with the "
 "annotation <literal>@Inject</literal>) is a bean. This includes every "
 "JavaBean and every EJB session bean. If you've already got some JavaBeans or "
-"session beans lying around, they're already beans&#8212;you won't need any "
+"session beans lying around, they're already beans—you won't need any "
 "additional special metadata. There's just little one thing you need to do "
 "before you can start injecting them into stuff: you need to put them in an "
 "archive (a jar, or a Java EE module such as a war or EJB jar) that contains "
@@ -109,33 +102,29 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:45
 #, no-c-format
 msgid ""
 "The JavaBeans and EJBs you've been writing every day, up until now, have not "
 "been able to take advantage of the new services defined by the CDI "
-"specification. But you'll be able to use every one of them with CDI&#8212;"
-"allowing the container to create and destroy instances of your beans and "
-"associate them with a designated context, injecting them into other beans, "
-"using them in EL expressions, specializing them with qualifier annotations, "
-"even adding interceptors and decorators to them&#8212;without modifying your "
-"existing code. At most, you'll need to add some annotations."
+"specification. But you'll be able to use every one of them with CDI—allowing "
+"the container to create and destroy instances of your beans and associate "
+"them with a designated context, injecting them into other beans, using them "
+"in EL expressions, specializing them with qualifier annotations, even adding "
+"interceptors and decorators to them—without modifying your existing code. At "
+"most, you'll need to add some annotations."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:54
 #, no-c-format
 msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
-#: intro.xml:61
 #, no-c-format
 msgid "Getting our feet wet"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:63
 #, fuzzy, no-c-format
 msgid ""
 "Suppose that we have two existing Java classes that we've been using for "
@@ -145,20 +134,7 @@
 "다양한 애플리케이션에서 오랫동안 사용해 온 두 개의 Java 클래스를 갖고 있다고 "
 "가정합시다. 첫 번째 클래스는 문자열을 문장 목록으로 구문 분석합니다:    "
 
-#. Tag: programlisting
-#: intro.xml:68
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class SentenceParser {\n"
-"   public List<String> parse(String text) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class SentenceParser {\n"
-"    public List<String> parse(String text) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:70
 #, no-c-format
 msgid ""
 "The second existing class is a stateless session bean front-end for an "
@@ -168,42 +144,12 @@
 "두 번째 클래스는 하나의 언어에서 다른 언어로 문장을 번역할 수 있는 외부 시스"
 "템에 대한 무상태 세션 빈 프론트엔드입니다:   "
 
-#. Tag: programlisting
-#: intro.xml:75
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"   public String translate(String sentence) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"    public String translate(String sentence) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:77
 #, fuzzy, no-c-format
 msgid "Where <literal>Translator</literal> is the EJB local interface:"
 msgstr "여기서 <literal>Translator</literal>는 로컬 인터페이스입니다:  "
 
-#. Tag: programlisting
-#: intro.xml:79
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"   public String translate(String sentence);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"    public String translate(String sentence);\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "Unfortunately, we don't have a class that translates whole text documents. "
@@ -212,54 +158,7 @@
 "불행하게도 전체 텍스트 문서를 번역하는 기존 클래스가 없으므로, 이러한 작업을 "
 "실행하는 Web Bean을 작성합시다:  "
 
-#. Tag: programlisting
-#: intro.xml:85
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator {\n"
-"   private SentenceParser sentenceParser;\n"
-"   private Translator sentenceTranslator;\n"
-"    \n"
-"   @Inject\n"
-"   TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"      this.sentenceParser = sentenceParser;\n"
-"      this.sentenceTranslator = sentenceTranslator;\n"
-"   }\n"
-"    \n"
-"   public String translate(String text) {\n"
-"      StringBuilder sb = new StringBuilder();\n"
-"      for (String sentence: sentenceParser.parse(text)) {\n"
-"          sb.append(sentenceTranslator.translate(sentence));\n"
-"      }\n"
-"      return sb.toString();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TextTranslator {\n"
-"    \n"
-"    private SentenceParser sentenceParser;\n"
-"    private Translator sentenceTranslator;\n"
-"    \n"
-"    @Initializer\n"
-"    TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"        this.sentenceParser = sentenceParser;\n"
-"        this.sentenceTranslator = sentenceTranslator;\n"
-"    }\n"
-"    \n"
-"    public String translate(String text) {\n"
-"        StringBuilder sb = new StringBuilder();\n"
-"        for (String sentence: sentenceParser.parse(text)) {\n"
-"            sb.append(sentenceTranslator.translate(sentence));\n"
-"        }\n"
-"        return sb.toString();\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:87
 #, fuzzy, no-c-format
 msgid ""
 "But wait! <literal>TextTranslator</literal> does not have a constructor with "
@@ -273,7 +172,6 @@
 "개 변수 없이 생성자를 갖지 않는 클래스는 Web Bean이 될 수 있습니다.  "
 
 #. Tag: para
-#: intro.xml:93
 #, fuzzy, no-c-format
 msgid ""
 "As you've guessed, the <literal>@Inject</literal> annotation has something "
@@ -290,7 +188,6 @@
 "됩니다.  "
 
 #. Tag: para
-#: intro.xml:100
 #, no-c-format
 msgid ""
 "We may obtain an instance of <literal>TextTranslator</literal> by injecting "
@@ -301,7 +198,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:107
 #, no-c-format
 msgid ""
 "Let's create a UI controller bean that uses field injection to obtain an "
@@ -309,44 +205,12 @@
 "entered by a user:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:116
-#, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class TranslateController {\n"
-"   @Inject TextTranslator textTranslator;\n"
-"\n"
-"   private String inputText;\n"
-"   private String translation;\n"
-"\n"
-"   // JSF action method, perhaps\n"
-"   public void translate() {\n"
-"      translation = textTranslator.translate(inputText); \n"
-"   }\n"
-"\n"
-"   public String getInputText() {\n"
-"      return inputText;\n"
-"   }\n"
-"\n"
-"   public void setInputText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"\n"
-"   public String getTranslation() {\n"
-"      return translation;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:119
 #, fuzzy, no-c-format
 msgid "Field injection of <literal>TextTranslator</literal> instance"
 msgstr "여기서 <literal>Translator</literal>는 로컬 인터페이스입니다:  "
 
 #. Tag: para
-#: intro.xml:127
 #, no-c-format
 msgid ""
 "Notice the controller bean is request-scoped and named. Since this "
@@ -357,7 +221,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:135
 #, fuzzy, no-c-format
 msgid ""
 "Alternatively, we may obtain an instance of <literal>TextTranslator</"
@@ -367,23 +230,7 @@
 "인스턴스를 Web Bean, Servlet 또는 EJB로 삽입하여 <literal>TextTranslator</"
 "literal> 인스턴스를 얻을 수 있습니다:  "
 
-#. Tag: programlisting
-#: intro.xml:140
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
-"...\n"
-"public void translate() {\n"
-"   textTranslatorInstance.get().translate(inputText);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public setTextTranslator(TextTranslator textTranslator) {\n"
-"    this.textTranslator = textTranslator;\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:142
 #, no-c-format
 msgid ""
 "Notice that it isn't necessary to create a getter or setter method to inject "
@@ -394,17 +241,15 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:148
 #, fuzzy, no-c-format
 msgid ""
 "At system initialization time, the container must validate that exactly one "
 "bean exists which satisfies each injection point. In our example, if no "
-"implementation of <literal>Translator</literal> is available&#8212;if the "
-"<literal>SentenceTranslator</literal> EJB was not deployed&#8212;the "
-"container would inform us of an <emphasis>unsatisfied dependency</emphasis>. "
-"If more than one implementation of <literal>Translator</literal> were "
-"available, the container would inform us of the <emphasis>ambiguous "
-"dependency</emphasis>."
+"implementation of <literal>Translator</literal> is available—if the "
+"<literal>SentenceTranslator</literal> EJB was not deployed—the container "
+"would inform us of an <emphasis>unsatisfied dependency</emphasis>. If more "
+"than one implementation of <literal>Translator</literal> were available, the "
+"container would inform us of the <emphasis>ambiguous dependency</emphasis>."
 msgstr ""
 "시스템 초기화시 Web Bean 관리자는 각각의 삽입 지점을 만족시키는 하나의 Web "
 "Bean이 존재하도록 이를 유효화해야 합니다. 예에서 사용 가능한 "
@@ -416,7 +261,6 @@
 "다.  "
 
 #. Tag: para
-#: intro.xml:156
 #, no-c-format
 msgid ""
 "Before we get too deep in the details, let's pause and examine a bean's "
@@ -425,6 +269,97 @@
 "what <emphasis>makes</emphasis> something a bean."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class SentenceParser {\n"
+#~ "   public List<String> parse(String text) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class SentenceParser {\n"
+#~ "    public List<String> parse(String text) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator {\n"
+#~ "   public String translate(String sentence) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator {\n"
+#~ "    public String translate(String sentence) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Local\n"
+#~ "public interface Translator {\n"
+#~ "   public String translate(String sentence);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Local\n"
+#~ "public interface Translator {\n"
+#~ "    public String translate(String sentence);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class TextTranslator {\n"
+#~ "   private SentenceParser sentenceParser;\n"
+#~ "   private Translator sentenceTranslator;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) {\n"
+#~ "      this.sentenceParser = sentenceParser;\n"
+#~ "      this.sentenceTranslator = sentenceTranslator;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public String translate(String text) {\n"
+#~ "      StringBuilder sb = new StringBuilder();\n"
+#~ "      for (String sentence: sentenceParser.parse(text)) {\n"
+#~ "          sb.append(sentenceTranslator.translate(sentence));\n"
+#~ "      }\n"
+#~ "      return sb.toString();\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TextTranslator {\n"
+#~ "    \n"
+#~ "    private SentenceParser sentenceParser;\n"
+#~ "    private Translator sentenceTranslator;\n"
+#~ "    \n"
+#~ "    @Initializer\n"
+#~ "    TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) {\n"
+#~ "        this.sentenceParser = sentenceParser;\n"
+#~ "        this.sentenceTranslator = sentenceTranslator;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public String translate(String text) {\n"
+#~ "        StringBuilder sb = new StringBuilder();\n"
+#~ "        for (String sentence: sentenceParser.parse(text)) {\n"
+#~ "            sb.append(sentenceTranslator.translate(sentence));\n"
+#~ "        }\n"
+#~ "        return sb.toString();\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
+#~ "...\n"
+#~ "public void translate() {\n"
+#~ "   textTranslatorInstance.get().translate(inputText);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public setTextTranslator(TextTranslator textTranslator) {\n"
+#~ "    this.textTranslator = textTranslator;\n"
+#~ "}]]>"
+
 #~ msgid "Getting started with Web Beans"
 #~ msgstr "Web Beans로 시작하기 "
 

Modified: doc/trunk/reference/ko-KR/master.po
===================================================================
--- doc/trunk/reference/ko-KR/master.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/master.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-09 10:27+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -21,13 +21,11 @@
 "\n"
 
 #. Tag: title
-#: master.xml:9
 #, no-c-format
 msgid "A note about naming and nomenclature"
 msgstr ""
 
 #. Tag: para
-#: master.xml:10
 #, no-c-format
 msgid ""
 "Shortly before the final draft of JSR-299 was submitted, the specification "
@@ -42,7 +40,6 @@
 msgstr ""
 
 #. Tag: para
-#: master.xml:19
 #, no-c-format
 msgid ""
 "You'll also find that some of the functionality that once existed in the "
@@ -52,43 +49,37 @@
 msgstr ""
 
 #. Tag: para
-#: master.xml:25
 #, no-c-format
 msgid ""
 "Note that this reference guide was started while changes were still being "
 "made to the specification. We've done our best to update it for accuracy. If "
 "you discover a conflict between what is written in this guide and the "
-"specification, the specification is the authority&#8212;assume it is "
-"correct. If you believe you have found an error in the specification, please "
-"report it to the JSR-299 EG."
+"specification, the specification is the authority—assume it is correct. If "
+"you believe you have found an error in the specification, please report it "
+"to the JSR-299 EG."
 msgstr ""
 
 #. Tag: title
-#: master.xml:36
 #, no-c-format
 msgid "Beans"
 msgstr ""
 
 #. Tag: title
-#: master.xml:49
 #, no-c-format
 msgid "Weld, the CDI Reference Implementation"
 msgstr ""
 
 #. Tag: title
-#: master.xml:59
 #, fuzzy, no-c-format
 msgid "Loose coupling with strong typing"
 msgstr "가장 강한 타이핑 (strong typing) 사용 "
 
 #. Tag: title
-#: master.xml:75
 #, fuzzy, no-c-format
 msgid "CDI and the Java EE ecosystem"
 msgstr "Web Beans 및 Java EE 에코시스템 "
 
 #. Tag: title
-#: master.xml:87
 #, no-c-format
 msgid "Weld reference"
 msgstr ""

Modified: doc/trunk/reference/ko-KR/next.po
===================================================================
--- doc/trunk/reference/ko-KR/next.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/next.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: next\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-09 11:31+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -19,13 +19,11 @@
 "\n"
 
 #. Tag: title
-#: next.xml:4
 #, no-c-format
 msgid "Next steps"
 msgstr "다음 단계 "
 
 #. Tag: para
-#: next.xml:6
 #, no-c-format
 msgid ""
 "Because CDI is so new, there's not yet a lot of information available "
@@ -38,7 +36,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:14
 #, fuzzy, no-c-format
 msgid ""
 "The CDI reference implementation, Weld, is being developed at the <ulink url="
@@ -55,7 +52,6 @@
 "서는  실질적으로 블로그에 게시된 기사의 시리즈를 기반으로 합니다.  "
 
 #. Tag: para
-#: next.xml:22
 #, no-c-format
 msgid ""
 "We encourage you to follow the <ulink url=\"https://lists.jboss.org/mailman/"
@@ -65,7 +61,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:28
 #, no-c-format
 msgid ""
 "We are eager to find volunteers to help revise, proofread or translate this "
@@ -74,7 +69,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:35
 #, no-c-format
 msgid ""
 "Checkout source from <ulink url=\"http://anonsvn.jboss.org/repos/weld/doc/"
@@ -82,16 +76,7 @@
 "ulink> using SVN"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:40
-#, no-c-format
-msgid ""
-"<![CDATA[$> svn co http://anonsvn.jboss.org/repos/weld/doc/trunk/reference "
-"weld-reference]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:43
 #, no-c-format
 msgid ""
 "Edit the <literal>pom.xml</literal> file in the root of the checkout and "
@@ -100,19 +85,11 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:49
 #, no-c-format
 msgid "Build using Maven 2"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:52
-#, no-c-format
-msgid "<![CDATA[$> mvn]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:54
 #, no-c-format
 msgid ""
 "If you experience an out of memory error, try setting this environment "
@@ -120,7 +97,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:61
 #, no-c-format
 msgid ""
 "The PDF version of the reference guide will appear the current directory. "
@@ -129,7 +105,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:66
 #, no-c-format
 msgid "We look forward to your participation!"
 msgstr ""

Modified: doc/trunk/reference/ko-KR/part1.po
===================================================================
--- doc/trunk/reference/ko-KR/part1.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/part1.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part1\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-27 10:42+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -23,7 +23,6 @@
 "\n"
 
 #. Tag: para
-#: part1.xml:14
 #, fuzzy, no-c-format
 msgid ""
 "The <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-299</ulink> "
@@ -39,7 +38,6 @@
 "Web Beans는 다음과 같은 서비스를 제공합니다:  "
 
 #. Tag: para
-#: part1.xml:23
 #, fuzzy, no-c-format
 msgid ""
 "an improved lifecycle for stateful objects, bound to well-defined "
@@ -49,7 +47,6 @@
 "의 수명 주기 개선   "
 
 #. Tag: para
-#: part1.xml:28
 #, no-c-format
 msgid "a typesafe approach to <emphasis>dependency injection</emphasis>,"
 msgstr ""
@@ -57,14 +54,12 @@
 "(typesafe) 접근  "
 
 #. Tag: para
-#: part1.xml:33
 #, fuzzy, no-c-format
 msgid ""
 "object interaction via an <emphasis>event notification facility</emphasis>,"
 msgstr "<emphasis>이벤트 통지</emphasis> 기능을 통한 상호작용 "
 
 #. Tag: para
-#: part1.xml:38
 #, fuzzy, no-c-format
 msgid ""
 "a better approach to binding <emphasis>interceptors</emphasis> to objects, "
@@ -76,7 +71,6 @@
 "로, 비지니스 문제 해결을 위해 보다 적절하게 사용  "
 
 #. Tag: para
-#: part1.xml:45
 #, no-c-format
 msgid ""
 "an <emphasis>SPI</emphasis> for developing portable extensions to the "
@@ -84,22 +78,21 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:51
 #, no-c-format
 msgid ""
 "The CDI services are a core aspect of the Java EE platform and include full "
 "support for Java EE modularity and the Java EE component architecture. But "
 "the specification does not limit the use of CDI to the Java EE environment. "
 "In the Java SE environment, the services might be provided by a standalone "
-"CDI implementation like Weld (see <xref linkend=\"weld-se\"/>), or even by a "
-"container that also implements the subset of EJB defined for embedded usage "
-"by the EJB 3.1 specification. CDI is especially useful in the context of web "
-"application development, but the problems it solves are general development "
-"concerns and it is therefore applicable to a wide variety of application."
+"CDI implementation like Weld (see <xref linkend=\"weld-se\" />), or even by "
+"a container that also implements the subset of EJB defined for embedded "
+"usage by the EJB 3.1 specification. CDI is especially useful in the context "
+"of web application development, but the problems it solves are general "
+"development concerns and it is therefore applicable to a wide variety of "
+"application."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:61
 #, no-c-format
 msgid ""
 "An object bound to a lifecycle context is called a bean. CDI includes built-"
@@ -108,19 +101,16 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:68
 #, no-c-format
 msgid "managed beans, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:71
 #, no-c-format
 msgid "EJB session beans."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:75
 #, no-c-format
 msgid ""
 "Both managed beans and EJB session beans may inject other beans. But some "
@@ -130,37 +120,31 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:83
 #, no-c-format
 msgid "message-driven beans,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:86
 #, no-c-format
 msgid "interceptors,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:89
 #, no-c-format
 msgid "servlets, servlet filters and servlet event listeners,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:92
 #, no-c-format
 msgid "JAX-WS service endpoints and handlers, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:95
 #, no-c-format
 msgid "JSP tag handlers and tag library event listeners."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:99
 #, fuzzy, no-c-format
 msgid ""
 "CDI relieves the user of an unfamiliar API of the need to answer the "
@@ -170,44 +154,37 @@
 "는 것에서 생소한 API 사용자를 보호합니다:   "
 
 #. Tag: para
-#: part1.xml:105
 #, fuzzy, no-c-format
 msgid "What is the lifecycle of this object?"
 msgstr "이러한 객체의 수명 주기는 무엇입니까? "
 
 #. Tag: para
-#: part1.xml:108
 #, fuzzy, no-c-format
 msgid "How many simultaneous clients can it have?"
 msgstr "얼마나 많은 클라이언트가 이를 동시에 갖을 수 있습니까?       "
 
 #. Tag: para
-#: part1.xml:111
 #, fuzzy, no-c-format
 msgid "Is it multithreaded?"
 msgstr "이는 멀티스레드됩니까? "
 
 #. Tag: para
-#: part1.xml:114
 #, no-c-format
 msgid "How do I get access to it from a client?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:117
 #, fuzzy, no-c-format
 msgid "Do I need to explicitly destroy it?"
 msgstr "이를 명시적으로 삭제해야 합니까? "
 
 #. Tag: para
-#: part1.xml:120
 #, fuzzy, no-c-format
 msgid ""
 "Where should I keep the reference to it when I'm not currently using it?"
 msgstr "직접 사용하지 않을 경우 참조 사항을 어디에 보관해야 합니까? "
 
 #. Tag: para
-#: part1.xml:125
 #, fuzzy, no-c-format
 msgid ""
 "How can I define an alternative implementation, so that the implementation "
@@ -217,13 +194,11 @@
 "까요?     "
 
 #. Tag: para
-#: part1.xml:131
 #, fuzzy, no-c-format
 msgid "How should I go about sharing this object between other objects?"
 msgstr "어떻게 하면 다른 개체 사이에서 이러한 개체를 공유할 수 있을까요? "
 
 #. Tag: para
-#: part1.xml:137
 #, no-c-format
 msgid ""
 "CDI is more than a framework. It's a whole, rich programming model. The "
@@ -232,7 +207,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:142
 #, fuzzy, no-c-format
 msgid ""
 "A bean specifies only the type and semantics of other beans it depends upon. "
@@ -249,7 +223,6 @@
 "에 따라 달라질 수 있습니다.        "
 
 #. Tag: para
-#: part1.xml:149
 #, fuzzy, no-c-format
 msgid ""
 "Events, interceptors and decorators enhance the loose-coupling inherent in "
@@ -259,7 +232,6 @@
 "하는 (loose-coupling)</emphasis> 기능을 강화합니다:  "
 
 #. Tag: para
-#: part1.xml:155
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -269,7 +241,6 @@
 "해제합니다  "
 
 #. Tag: para
-#: part1.xml:159
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -279,7 +250,6 @@
 "해제합니다   "
 
 #. Tag: para
-#: part1.xml:163
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> allow business concerns to be "
@@ -287,7 +257,6 @@
 msgstr "<emphasis>데코레이터</emphasis>는 비지니스 문제를 구분하게 합니다. "
 
 #. Tag: para
-#: part1.xml:168
 #, fuzzy, no-c-format
 msgid ""
 "What's even more powerful (and comforting) is that CDI provides all these "
@@ -309,7 +278,6 @@
 "인터셉터, 데코레이터 및 이벤트 소비자를 함께 묶습니다.     "
 
 #. Tag: para
-#: part1.xml:177
 #, no-c-format
 msgid ""
 "But CDI isn't a restrictive programming model. It doesn't tell you how you "
@@ -319,7 +287,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:183
 #, fuzzy, no-c-format
 msgid ""
 "CDI even provides a comprehensive SPI, allowing other kinds of object "
@@ -332,7 +299,6 @@
 "의 장점을 취하고 다른 종류의 Web Bean과 상호 작용합니다.        "
 
 #. Tag: para
-#: part1.xml:189
 #, fuzzy, no-c-format
 msgid ""
 "CDI was influenced by a number of existing Java frameworks, including Seam, "
@@ -349,7 +315,6 @@
 "중심, Guice 보다 더 웹 및 엔터프라이즈-애플리케이션 사용 가능   "
 
 #. Tag: para
-#: part1.xml:197
 #, no-c-format
 msgid ""
 "Finally, CDI is a <ulink url=\"http://jcp.org\">Java Community Process</"

Modified: doc/trunk/reference/ko-KR/part2.po
===================================================================
--- doc/trunk/reference/ko-KR/part2.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/part2.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part2\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-23 11:18+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -21,7 +21,6 @@
 "\n"
 
 #. Tag: para
-#: part2.xml:5
 #, no-c-format
 msgid ""
 "Weld, the JSR-299 Reference Implementation (RI), is being developed as part "
@@ -33,7 +32,6 @@
 msgstr ""
 
 #. Tag: para
-#: part2.xml:12
 #, no-c-format
 msgid ""
 "Weld provides a complete SPI allowing Java EE containers such as JBoss AS "
@@ -43,7 +41,6 @@
 msgstr ""
 
 #. Tag: para
-#: part2.xml:18
 #, no-c-format
 msgid ""
 "Weld comes with an extensive library of examples, which are a great starting "

Modified: doc/trunk/reference/ko-KR/part3.po
===================================================================
--- doc/trunk/reference/ko-KR/part3.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/part3.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part3\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-23 11:11+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -19,7 +19,6 @@
 "\n"
 
 #. Tag: para
-#: part3.xml:5
 #, no-c-format
 msgid ""
 "The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've "
@@ -27,19 +26,16 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:12
 #, no-c-format
 msgid "<emphasis>alternatives</emphasis> enable deployment time polymorphism,"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:17
 #, no-c-format
 msgid "<emphasis>producer methods</emphasis> enable runtime polymorphism, and"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:21
 #, no-c-format
 msgid ""
 "<emphasis>contextual lifecycle management</emphasis> decouples bean "
@@ -47,7 +43,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:27
 #, no-c-format
 msgid ""
 "These techniques serve to enable loose coupling of client and server. The "
@@ -57,7 +52,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:33
 #, no-c-format
 msgid ""
 "Loose coupling makes a system more <emphasis>dynamic</emphasis>. The system "
@@ -69,7 +63,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:40
 #, no-c-format
 msgid ""
 "CDI provides three extra important facilities that further the goal of loose "
@@ -77,7 +70,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:46
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -85,7 +77,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:51
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> may be used to decouple some business "
@@ -93,7 +84,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:56
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -101,7 +91,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:62
 #, fuzzy, no-c-format
 msgid ""
 "The second major theme of CDI is <emphasis>strong typing</emphasis>. The "
@@ -115,20 +104,18 @@
 "타입 안정적 Java 구성 요소에 들어 있습니다. "
 
 #. Tag: para
-#: part3.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "You don't see string-based identifiers in CDI code, not because the "
-"framework is hiding them from you using clever defaulting rules&#8212;so-"
-"called \"configuration by convention\"&#8212;but because there are simply no "
-"strings there to begin with!"
+"framework is hiding them from you using clever defaulting rules—so-called "
+"\"configuration by convention\"—but because there are simply no strings "
+"there to begin with!"
 msgstr ""
 "Web Beans 코드에서 문자열 기반 식별자를 보실 수 없습니다. 그 이유는 프레임워"
 "크가  &#151; \"관례에 의한 설정\"이라고 부르는 &#151;  기본값 규칙을 사용하"
 "여 이를 숨기려하기 때문이 아니라 시작할 수 있는 문자열이 없기 때문입니다! "
 
 #. Tag: para
-#: part3.xml:74
 #, no-c-format
 msgid ""
 "The obvious benefit of this approach is that <emphasis>any</emphasis> IDE "
@@ -144,68 +131,57 @@
 "우 이것이 나타나 코드의 시맨틱 레벨을 해제할 수 있습니다. "
 
 #. Tag: para
-#: part3.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "CDI encourages you develop annotations that model concepts, for example,"
 msgstr "Web Beans는 개념을 모델로 하는 어노테이션을 개발하게 합니다. 예: "
 
 #. Tag: para
-#: part3.xml:87
 #, no-c-format
 msgid "<literal>@Asynchronous</literal>,"
 msgstr "<literal>@Asynchronous</literal>,"
 
 #. Tag: para
-#: part3.xml:90
 #, no-c-format
 msgid "<literal>@Mock</literal>,"
 msgstr "<literal>@Mock</literal>,"
 
 #. Tag: para
-#: part3.xml:93
 #, no-c-format
 msgid "<literal>@Secure</literal> or"
 msgstr "<literal>@Secure</literal> 또는 "
 
 #. Tag: para
-#: part3.xml:96
 #, no-c-format
 msgid "<literal>@Updated</literal>,"
 msgstr "<literal>@Updated</literal>,"
 
 #. Tag: para
-#: part3.xml:100
 #, no-c-format
 msgid "instead of using compound names like"
 msgstr "다음과 같은 복합적인 명칭을 사용하는 대신 "
 
 #. Tag: para
-#: part3.xml:104
 #, no-c-format
 msgid "<literal>asyncPaymentProcessor</literal>,"
 msgstr "<literal>asyncPaymentProcessor</literal>,"
 
 #. Tag: para
-#: part3.xml:107
 #, no-c-format
 msgid "<literal>mockPaymentProcessor</literal>,"
 msgstr "<literal>mockPaymentProcessor</literal>,"
 
 #. Tag: para
-#: part3.xml:110
 #, no-c-format
 msgid "<literal>SecurityInterceptor</literal> or"
 msgstr "<literal>SecurityInterceptor</literal> 또는 "
 
 #. Tag: para
-#: part3.xml:113
 #, no-c-format
 msgid "<literal>DocumentUpdatedEvent</literal>."
 msgstr "<literal>DocumentUpdatedEvent</literal>."
 
 #. Tag: para
-#: part3.xml:117
 #, no-c-format
 msgid ""
 "The annotations are reusable. They help describe common qualities of "
@@ -219,7 +195,6 @@
 "다 더 이해하고 읽고 쓸 수 있게 합니다.  "
 
 #. Tag: para
-#: part3.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "CDI <emphasis>stereotypes</emphasis> take this idea a step further. A "
@@ -235,7 +210,6 @@
 "양한 역할의 속성으로 다시 사용 가능한 단일 패키지로 캡슐화합니다.    "
 
 #. Tag: para
-#: part3.xml:138
 #, fuzzy, no-c-format
 msgid ""
 "We're now ready to meet some more advanced features of CDI. Bear in mind "

Modified: doc/trunk/reference/ko-KR/part4.po
===================================================================
--- doc/trunk/reference/ko-KR/part4.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/part4.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-13 16:06+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -19,7 +19,6 @@
 "\n"
 
 #. Tag: para
-#: part4.xml:5
 #, no-c-format
 msgid ""
 "The third theme of CDI is <emphasis>integration</emphasis>. We've already "
@@ -31,7 +30,6 @@
 msgstr ""
 
 #. Tag: para
-#: part4.xml:12
 #, fuzzy, no-c-format
 msgid ""
 "CDI is also designed to work in concert with technologies outside of the "
@@ -56,7 +54,6 @@
 "할 수 있게 합니다. "
 
 #. Tag: para
-#: part4.xml:23
 #, fuzzy, no-c-format
 msgid ""
 "We're about to see how to take full advantage of the Java EE platform in an "

Modified: doc/trunk/reference/ko-KR/part5.po
===================================================================
--- doc/trunk/reference/ko-KR/part5.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/part5.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,7 +15,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part5.xml:5
 #, no-c-format
 msgid ""
 "Weld is the reference implementation of JSR-299, and is used by JBoss AS and "
@@ -27,7 +26,6 @@
 msgstr ""
 
 #. Tag: para
-#: part5.xml:12
 #, no-c-format
 msgid ""
 "Some of the extensions in Weld are portable across JSR-299 implementations "
@@ -37,12 +35,11 @@
 msgstr ""
 
 #. Tag: para
-#: part5.xml:18
 #, no-c-format
 msgid ""
 "If you want to get started quickly using Weld (and, in turn, CDI) with JBoss "
 "AS, GlassFish or Tomcat and experiment with one of the examples, take a look "
-"at <xref linkend=\"gettingstarted\"/>. Otherwise read on for a exhaustive "
+"at <xref linkend=\"gettingstarted\" />. Otherwise read on for a exhaustive "
 "discussion of using Weld in all the environments and application servers it "
 "supports and the Weld extensions."
 msgstr ""

Modified: doc/trunk/reference/ko-KR/producermethods.po
===================================================================
--- doc/trunk/reference/ko-KR/producermethods.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/producermethods.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: producermethods\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-23 11:12+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -21,13 +21,11 @@
 "\n"
 
 #. Tag: title
-#: producermethods.xml:5
 #, no-c-format
 msgid "Producer methods"
 msgstr "생산자 방식 "
 
 #. Tag: para
-#: producermethods.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Producer methods let us overcome certain limitations that arise when a "
@@ -41,31 +39,26 @@
 "\"xml\"/>에서 두번째 방법에 대해 살펴보겠습니다.) "
 
 #. Tag: para
-#: producermethods.xml:14
 #, no-c-format
 msgid "According to the spec:"
 msgstr "spec에 의하면: "
 
 #. Tag: para
-#: producermethods.xml:18
 #, no-c-format
 msgid "A producer method acts as a source of objects to be injected, where:"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:22
 #, no-c-format
 msgid "the objects to be injected are not required to be instances of beans,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:25
 #, no-c-format
 msgid "the concrete type of the objects to be injected may vary at runtime or"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:28
 #, no-c-format
 msgid ""
 "the objects require some custom initialization that is not performed by the "
@@ -73,25 +66,21 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:36
 #, fuzzy, no-c-format
 msgid "For example, producer methods let us:"
 msgstr "생산자 방식의 범위 "
 
 #. Tag: para
-#: producermethods.xml:40
 #, no-c-format
 msgid "expose a JPA entity as a bean,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:43
 #, no-c-format
 msgid "expose any JDK class as a bean,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:46
 #, no-c-format
 msgid ""
 "define multiple beans, with different scopes or initialization, for the same "
@@ -99,13 +88,11 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:51
 #, no-c-format
 msgid "vary the implementation of a bean type at runtime."
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:55
 #, no-c-format
 msgid ""
 "In particular, producer methods let us use runtime polymorphism with CDI. As "
@@ -114,55 +101,12 @@
 "is fixed. A producer method has no such limitation:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:61
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Preferences implements Serializable {\n"
-"   private PaymentStrategyType paymentStrategy;\n"
-"   ...\n"
-"   @Produces @Preferred \n"
-"   public PaymentStrategy getPaymentStrategy() {\n"
-"       switch (paymentStrategy) {\n"
-"           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
-"           case CHECK: return new CheckPaymentStrategy();\n"
-"           case PAYPAL: return new PayPalPaymentStrategy();\n"
-"           default: return null;\n"
-"       } \n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          ChequePaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:63
 #, no-c-format
 msgid "Consider an injection point:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:65
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"    ...\n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:67
 #, no-c-format
 msgid ""
 "This injection point has the same type and qualifier annotations as the "
@@ -172,13 +116,11 @@
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:74
 #, no-c-format
 msgid "Scope of a producer method"
 msgstr "생산자 방식의 범위 "
 
 #. Tag: para
-#: producermethods.xml:76
 #, fuzzy, no-c-format
 msgid ""
 "The scope of the producer method defaults to <literal>@Dependent</literal>, "
@@ -194,7 +136,6 @@
 "을 수 있습니다.  "
 
 #. Tag: para
-#: producermethods.xml:83
 #, no-c-format
 msgid ""
 "To change this behavior, we can add a <literal>@SessionScoped</literal> "
@@ -203,22 +144,7 @@
 "이러한 기능을 변경하려면, <literal>@SessionScoped</literal> 어노테이션 방식"
 "을 추가할 수 있습니다.  "
 
-#. Tag: programlisting
-#: producermethods.xml:87
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"    ...\n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:89
 #, no-c-format
 msgid ""
 "Now, when the producer method is called, the returned "
@@ -230,7 +156,6 @@
 "니다.  "
 
 #. Tag: para
-#: producermethods.xml:95
 #, no-c-format
 msgid ""
 "A producer method does <emphasis>not</emphasis> inherit the scope of the "
@@ -243,13 +168,11 @@
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:107
 #, no-c-format
 msgid "Injection into producer methods"
 msgstr "생산자 방식으로 삽입 "
 
 #. Tag: para
-#: producermethods.xml:109
 #, no-c-format
 msgid ""
 "There's one potential problem with the code above. The implementations of "
@@ -264,7 +187,6 @@
 "스화된 객체는 의존성 삽입의 장점을 취할 수 없으며 인터셉터를 갖지 못합니다. "
 
 #. Tag: para
-#: producermethods.xml:116
 #, fuzzy, no-c-format
 msgid ""
 "If this isn't what we want, we can use dependency injection into the "
@@ -273,36 +195,7 @@
 "이러한 방식을 원하지 않을 경우, 의존성 삽입을 생산자 방식으로 사용하여 Web "
 "Bean 인스턴스를 획득할 수 있습니다:  "
 
-#. Tag: programlisting
-#: producermethods.xml:121
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          CheckPaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          ChequePaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-"
@@ -323,7 +216,6 @@
 "랍니다! "
 
 #. Tag: para
-#: producermethods.xml:132
 #, fuzzy, no-c-format
 msgid ""
 "There's at least three ways we could go about fixing this bug. We could "
@@ -339,7 +231,6 @@
 "literal>로 변경하는 것입니다. "
 
 #. Tag: para
-#: producermethods.xml:139
 #, fuzzy, no-c-format
 msgid ""
 "But a more common solution is to use the special <literal>@New</literal> "
@@ -349,51 +240,16 @@
 "을 사용하는 것입니다. "
 
 #. Tag: title
-#: producermethods.xml:144
 #, no-c-format
 msgid "Use of <literal>@New</literal> with producer methods"
 msgstr "생산자 방식과 함께 <literal>@New</literal> 사용 "
 
 #. Tag: para
-#: producermethods.xml:146
 #, no-c-format
 msgid "Consider the following producer method:"
 msgstr "다음과 같은 생산자 방식을 고려합니다: "
 
-#. Tag: programlisting
-#: producermethods.xml:148
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New CheckPaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New ChequePaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:150
 #, no-c-format
 msgid ""
 "Then a new <emphasis>dependent</emphasis> instance of "
@@ -410,47 +266,25 @@
 "다.      "
 
 #. Tag: title
-#: producermethods.xml:160
 #, fuzzy, no-c-format
 msgid "Disposer methods"
 msgstr "생산자 방식 "
 
 #. Tag: para
-#: producermethods.xml:162
 #, no-c-format
 msgid ""
 "Some producer methods return objects that require explicit destruction. For "
 "example, somebody needs to close this JDBC connection:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:167
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @RequestScoped Connection connect(User user) {\n"
-"   return createConnection(user.getId(), user.getPassword());\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:169
 #, no-c-format
 msgid ""
 "Destruction can be performed by a matching <emphasis>disposer method</"
 "emphasis>, defined by the same class as the producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:172
-#, no-c-format
-msgid ""
-"<![CDATA[void close(@Disposes Connection connection) {\n"
-"   connection.close();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:174
 #, no-c-format
 msgid ""
 "The disposer method must have at least one parameter, annotated "
@@ -463,7 +297,116 @@
 "method automatically."
 msgstr ""
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Preferences implements Serializable {\n"
+#~ "   private PaymentStrategyType paymentStrategy;\n"
+#~ "   ...\n"
+#~ "   @Produces @Preferred \n"
+#~ "   public PaymentStrategy getPaymentStrategy() {\n"
+#~ "       switch (paymentStrategy) {\n"
+#~ "           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
+#~ "           case CHECK: return new CheckPaymentStrategy();\n"
+#~ "           case PAYPAL: return new PayPalPaymentStrategy();\n"
+#~ "           default: return null;\n"
+#~ "       } \n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          ChequePaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "    ...\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "    ...\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          CheckPaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          ChequePaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          @New CheckPaymentStrategy cps,\n"
+#~ "                                          @New PayPalPaymentStrategy "
+#~ "ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          @New ChequePaymentStrategy "
+#~ "cps,\n"
+#~ "                                          @New PayPalPaymentStrategy "
+#~ "ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "<blockquote> <para>A Web Beans producer method acts as a source of "
 #~ "objects to be injected, where:</para> <itemizedlist> <listitem> <para>the "
 #~ "objects to be injected are not required to be instances of Web Beans,</"

Modified: doc/trunk/reference/ko-KR/resources.po
===================================================================
--- doc/trunk/reference/ko-KR/resources.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/resources.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: resources.xml:5
 #, no-c-format
 msgid "Java EE component environment resources"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:7
 #, no-c-format
 msgid ""
 "Java EE 5 already introduced some limited support for dependency injection, "
@@ -30,7 +28,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:13
 #, no-c-format
 msgid ""
 "Naturally, there is now a slight mismatch with the new style of dependency "
@@ -44,7 +41,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:22
 #, no-c-format
 msgid ""
 "Fields have a duality in that they can both be the target of Java EE "
@@ -57,13 +53,11 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:31
 #, no-c-format
 msgid "Defining a resource"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:33
 #, no-c-format
 msgid ""
 "The CDI specification uses the term <emphasis>resource</emphasis> to refer, "
@@ -72,7 +66,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:38
 #, no-c-format
 msgid ""
 "JDBC <literal>Datasource</literal>s, JMS <literal>Queue</literal>s, "
@@ -82,7 +75,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:43
 #, no-c-format
 msgid ""
 "JPA <literal>EntityManager</literal>s and <literal>EntityManagerFactory</"
@@ -90,19 +82,16 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:46
 #, no-c-format
 msgid "remote EJBs, and"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:49
 #, no-c-format
 msgid "web services"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:53
 #, no-c-format
 msgid ""
 "We declare a resource by annotating a producer field with a component "
@@ -111,61 +100,17 @@
 "<literal>@PersistenceUnit</literal> or <literal>@WebServiceRef</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:57
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @WebServiceRef(lookup=\"java:app/service/Catalog\")\n"
-"Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Resource(lookup=\"java:global/env/jdbc/CustomerDatasource"
-"\") \n"
-"@CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceContext(unitName=\"CustomerDatabase\")\n"
-"@CustomerDatabase EntityManager customerDatabasePersistenceContext;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:63
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceUnit(unitName=\"CustomerDatabase\") \n"
-"@CustomerDatabase EntityManagerFactory customerDatabasePersistenceUnit;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @EJB(ejbLink=\"../their.jar#PaymentService\") \n"
-"PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:67
 #, no-c-format
 msgid "The field may be static (but not final)."
 msgstr ""
 
 #. Tag: para
-#: resources.xml:69
 #, no-c-format
 msgid "A resource declaration really contains two pieces of information:"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:73
 #, no-c-format
 msgid ""
 "the JNDI name, EJB link, persistence unit name, or other metadata needed to "
@@ -173,7 +118,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:77
 #, no-c-format
 msgid ""
 "the type and qualifiers that we will use to inject the reference into our "
@@ -181,7 +125,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:82
 #, no-c-format
 msgid ""
 "It might feel strange to be declaring resources in Java code. Isn't this "
@@ -191,53 +134,16 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:90
 #, no-c-format
 msgid "Typesafe resource injection"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:92
 #, no-c-format
 msgid "These resources can now be injected in the usual way."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:96
-#, no-c-format
-msgid "<![CDATA[@Inject Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:97
-#, no-c-format
-msgid "<![CDATA[@Inject @CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:98
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManager "
-"customerDatabaseEntityManager;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManagerFactory "
-"customerDatabaseEntityManagerFactory;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:100
-#, no-c-format
-msgid "<![CDATA[@Inject PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:102
 #, no-c-format
 msgid ""
 "The bean type and qualifiers of the resource are determined by the producer "
@@ -245,7 +151,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:106
 #, no-c-format
 msgid ""
 "It might seem like a pain to have to write these extra producer field "
@@ -256,26 +161,12 @@
 "and more typesafe to write"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:113
-#, no-c-format
-msgid "@Inject @CustomerDatabase EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:115
 #, no-c-format
 msgid "instead of"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:117
-#, no-c-format
-msgid "@PersistenceContext(unitName=\"CustomerDatabase\") EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:119
 #, no-c-format
 msgid "all over the place?"
 msgstr ""

Modified: doc/trunk/reference/ko-KR/ri-spi.po
===================================================================
--- doc/trunk/reference/ko-KR/ri-spi.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/ri-spi.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ri-spi\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-19 13:32+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -26,13 +26,11 @@
 "\n"
 
 #. Tag: title
-#: ri-spi.xml:4
 #, fuzzy, no-c-format
 msgid "Integrating Weld into other environments"
 msgstr "Web Beans RI를 다른 환경으로 통합 "
 
 #. Tag: para
-#: ri-spi.xml:6
 #, no-c-format
 msgid ""
 "If you want to use Weld in another environment, you will need to provide "
@@ -41,13 +39,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:12
 #, fuzzy, no-c-format
 msgid "Enterprise Services"
 msgstr "리소스 불러오기 "
 
 #. Tag: para
-#: ri-spi.xml:13
 #, no-c-format
 msgid ""
 "If you just want to use managed beans, and not take advantage of enterprise "
@@ -59,7 +55,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:21
 #, no-c-format
 msgid ""
 "All SPIs and APIs described have extensive JavaDoc, which spell out the "
@@ -67,13 +62,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:27
 #, fuzzy, no-c-format
 msgid "The Weld SPI"
 msgstr "Web Beans RI SPI "
 
 #. Tag: para
-#: ri-spi.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "The Weld SPI is located in the <literal>weld-spi</literal> module, and "
@@ -86,7 +79,6 @@
 "션 사항이며, 기본값 동작을 덮어쓰기해야할 경우, 다른 사항이 필요합니다. "
 
 #. Tag: para
-#: ri-spi.xml:35
 #, no-c-format
 msgid ""
 "All interfaces in the SPI support the decorator pattern and provide a "
@@ -97,7 +89,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:41
 #, no-c-format
 msgid ""
 "Weld supports multiple environments. An environment is defined by an "
@@ -111,7 +102,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:50
 #, no-c-format
 msgid ""
 "Weld uses a generic-typed service registry to allow services to be "
@@ -120,18 +110,16 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:56
 #, no-c-format
 msgid "Deployment structure"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:58
 #, no-c-format
 msgid ""
 "An application is often comprised of a number of modules. For example, a "
 "Java EE deployment may contain a number of EJB modules (containing business "
-"logic) and WAR modules (containing the user interface). A container may "
+"logic) and war modules (containing the user interface). A container may "
 "enforce certain <emphasis>accessibility</emphasis> rules which limit the "
 "visibility of classes between modules. CDI allows these same rules to apply "
 "to bean and observer method resolution. As the accessibility rules vary "
@@ -141,13 +129,12 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:67
 #, no-c-format
 msgid ""
 "The CDI specification discusses <emphasis>Bean Deployment Archives</"
-"emphasis> (BDAs)&#8212;archives which are marked as containing beans which "
-"should be deployed to the CDI container, and made available for injection "
-"and resolution. Weld reuses this description of <emphasis>Bean Deployment "
+"emphasis> (BDAs)—archives which are marked as containing beans which should "
+"be deployed to the CDI container, and made available for injection and "
+"resolution. Weld reuses this description of <emphasis>Bean Deployment "
 "Archives</emphasis> in its deployment structure SPI. Each deployment exposes "
 "the BDAs which it contains; each BDA may also reference other which it can "
 "access. Together, the transitive closure of this graph forms the beans which "
@@ -155,7 +142,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:76
 #, no-c-format
 msgid ""
 "To describe the deployment structure to Weld, the container should provide "
@@ -169,7 +155,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:85
 #, no-c-format
 msgid ""
 "As programmatically described beans may result in additional BDAs being "
@@ -179,13 +164,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:92
 #, no-c-format
 msgid "Virtual BDAs"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:93
 #, no-c-format
 msgid ""
 "In a strict container, each BDA might have to explicitly specify which other "
@@ -196,7 +179,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:100
 #, no-c-format
 msgid ""
 "A container, might, for example, use a flat accessibility structure for the "
@@ -205,11 +187,10 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:106
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it's contents to be discovered by Weld&#8212;<literal>BeanDeploymentArchive."
+"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
 "getBeanClasses()</literal> must return all the classes in the BDA, "
 "<literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the "
 "deployment descriptors in the archive, and <literal>BeanDeploymentArchive."
@@ -218,7 +199,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:114
 #, no-c-format
 msgid ""
 "BDA X may also reference another BDA Y whose beans can be resolved by, and "
@@ -229,13 +209,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:122
 #, no-c-format
 msgid "Matching the classloader structure for the deployment"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:124
 #, no-c-format
 msgid ""
 "In practice, you can regard the deployment structure represented by "
@@ -246,7 +224,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:132
 #, no-c-format
 msgid ""
 "To specify the directly accessible BDAs, the container should provide an "
@@ -255,7 +232,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:138
 #, no-c-format
 msgid ""
 "Weld allows the container to describe a circular graph, and will convert a "
@@ -263,7 +239,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:144
 #, no-c-format
 msgid ""
 "Certain services are provided for the whole deployment, whilst some are "
@@ -273,13 +248,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:153
 #, no-c-format
 msgid "EJB descriptors"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:155
 #, no-c-format
 msgid ""
 "Weld delegates EJB 3 bean discovery to the container so that it doesn't "
@@ -288,7 +261,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:160
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>EjbDescriptor</literal> should return the relevant metadata as "
@@ -302,13 +274,11 @@
 "색하는데 사용되는 인터페이스 클래스 및 jndi 이름을 캡슐화)  "
 
 #. Tag: title
-#: ri-spi.xml:169
 #, no-c-format
 msgid "EE resource injection and resolution services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:171
 #, no-c-format
 msgid ""
 "All the EE resource services are per-BDA services, and may be provided using "
@@ -317,37 +287,33 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:176
 #, no-c-format
 msgid ""
 "The integrator may choose to provide all EE resource injection services "
 "themselves, using another library or framework. In this case the integrator "
 "should use the <literal>EE</literal> environment, and implement the <xref "
-"linkend=\"injection.services\"/> SPI."
+"linkend=\"injection.services\" /> SPI."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:182
 #, no-c-format
 msgid ""
 "Alternatively, the integrator may choose to use CDI to provide EE resource "
 "injection. In this case, the <literal>EE_INJECT</literal> environment should "
 "be used, and the integrator should implement the <xref linkend=\"ejb."
-"services.resolution\"/>, <xref linkend=\"resource.services\"/> and <xref "
-"linkend=\"jpa.services\"/>."
+"services.resolution\" />, <xref linkend=\"resource.services\" /> and <xref "
+"linkend=\"jpa.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:189
 #, no-c-format
 msgid ""
 "CDI only provides annotation-based EE resource injection; if you wish to "
 "provide deployment descriptor (e.g. <literal>ejb-jar.xml</literal>) "
-"injection, you must use <xref linkend=\"injection.services\"/>."
+"injection, you must use <xref linkend=\"injection.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:195
 #, no-c-format
 msgid ""
 "If the container performs EE resource injection, the injected resources must "
@@ -356,7 +322,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:201
 #, no-c-format
 msgid ""
 "If you use a non-EE environment then you may implement any of the EE service "
@@ -365,49 +330,43 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:210
 #, no-c-format
 msgid "EJB services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:212
 #, no-c-format
 msgid "EJB services are split between two interfaces which are both per-BDA."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:216
 #, no-c-format
 msgid ""
 "<literal>EJBServices</literal> is used to resolve local EJBs used to back "
 "session beans, and must always be provided in an EE environment. "
 "<literal>EJBServices.resolveEjb(EjbDescriptor ejbDescriptor)</literal> "
-"returns a wrapper&#8212;<literal>SessionObjectReference</literal>&#8212;"
-"around the EJB reference. This wrapper allows Weld to request a reference "
-"that implements the given business interface, and, in the case of SFSBs, "
-"both request the removal of the EJB from the container and query whether the "
-"EJB has been previously removed."
+"returns a wrapper—<literal>SessionObjectReference</literal>—around the EJB "
+"reference. This wrapper allows Weld to request a reference that implements "
+"the given business interface, and, in the case of SFSBs, both request the "
+"removal of the EJB from the container and query whether the EJB has been "
+"previously removed."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:225
 #, no-c-format
 msgid ""
 "<literal>EJBResolutionServices.resolveEjb(InjectionPoint ij)</literal> "
 "allows the resolution of <literal>@EJB</literal> (for injection into managed "
 "beans). This service is not required if the implementation of <xref linkend="
-"\"injection.services\"/> takes care of <literal>@EJB</literal> injection."
+"\"injection.services\" /> takes care of <literal>@EJB</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:234
 #, no-c-format
 msgid "JPA services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:236
 #, no-c-format
 msgid ""
 "Just as EJB resolution is delegated to the container, resolution of "
@@ -417,23 +376,20 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:242
 #, no-c-format
 msgid ""
 "To allow JPA integration, the <literal>JpaServices</literal> interface "
 "should be implemented. This service is not required if the implementation of "
-"<xref linkend=\"injection.services\"/> takes care of "
+"<xref linkend=\"injection.services\" /> takes care of "
 "<literal>@PersistenceContext</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:251
 #, no-c-format
 msgid "Transaction Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:253
 #, no-c-format
 msgid ""
 "Weld delegates JTA activities to the container. The SPI provides a couple "
@@ -442,7 +398,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:258
 #, no-c-format
 msgid ""
 "Any <literal>javax.transaction.Synchronization</literal> implementation may "
@@ -452,7 +407,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:264
 #, no-c-format
 msgid ""
 "To make it easier to determine whether or not a transaction is currently "
@@ -462,30 +416,26 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:272
 #, fuzzy, no-c-format
 msgid "Resource Services"
 msgstr "리소스 불러오기 "
 
 #. Tag: para
-#: ri-spi.xml:274
 #, no-c-format
 msgid ""
 "The resolution of <literal>@Resource</literal> (for injection into managed "
 "beans) is delegated to the container. You must provide an implementation of "
 "<literal>ResourceServices</literal> which provides these operations. This "
 "service is not required if the implementation of <xref linkend=\"injection."
-"services\"/> takes care of <literal>@Resource</literal> injection."
+"services\" /> takes care of <literal>@Resource</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:283
 #, fuzzy, no-c-format
 msgid "Injection Services"
 msgstr "리소스 불러오기 "
 
 #. Tag: para
-#: ri-spi.xml:285
 #, no-c-format
 msgid ""
 "An integrator may wish to use <literal>InjectionServices</literal> to "
@@ -496,7 +446,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:291
 #, no-c-format
 msgid ""
 "<literal>InjectionServices</literal> provides a very simple contract, the "
@@ -507,7 +456,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:298
 #, no-c-format
 msgid ""
 "The <literal>InjectionContext</literal> can be used to discover additional "
@@ -518,13 +466,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:307
 #, fuzzy, no-c-format
 msgid "Security Services"
 msgstr "리소스 불러오기 "
 
 #. Tag: para
-#: ri-spi.xml:309
 #, no-c-format
 msgid ""
 "In order to obtain the <literal>Principal</literal> representing the current "
@@ -533,13 +479,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:317
 #, no-c-format
 msgid "Bean Validation Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:319
 #, no-c-format
 msgid ""
 "In order to obtain the default <literal>ValidatorFactory</literal> for the "
@@ -548,13 +492,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:327
 #, no-c-format
 msgid "Identifying the BDA being addressed"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:329
 #, no-c-format
 msgid ""
 "When a client makes a request to an application which uses Weld, the request "
@@ -565,43 +507,39 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:337
 #, no-c-format
 msgid ""
-"Most Servlet contains use a classloader-per-WAR, this may provide a good way "
+"Most Servlet contains use a classloader-per-war, this may provide a good way "
 "to identify the BDA in use for web requests."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:343
 #, no-c-format
 msgid ""
 "When Weld needs to identify the BDA, it will use one of these services, "
 "depending on what is servicing the request:"
 msgstr ""
 
-#. Tag: literal
-#: ri-spi.xml:350
+#. Tag: term
 #, no-c-format
-msgid "ServletServices.getBeanDeploymentArchive(ServletContext ctx)"
+msgid ""
+"<literal>ServletServices.getBeanDeploymentArchive(ServletContext ctx)</"
+"literal>"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:352
 #, no-c-format
 msgid ""
-"Identify the WAR in use. The <literal>ServletContext</literal> is provided "
+"Identify the war in use. The <literal>ServletContext</literal> is provided "
 "for additional context."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:362
 #, no-c-format
 msgid "The bean store"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:364
 #, no-c-format
 msgid ""
 "Weld uses a map like structure to store bean instances - <literal>org.jboss."
@@ -610,13 +548,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:372
 #, no-c-format
 msgid "The application context"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:374
 #, no-c-format
 msgid ""
 "Weld expects the Application Server or other container to provide the "
@@ -626,13 +562,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:383
 #, no-c-format
 msgid "Initialization and shutdown"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:384
 #, no-c-format
 msgid ""
 "The <literal>org.jboss.weld.bootstrap.api.Bootstrap</literal> interface "
@@ -643,7 +577,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:391
 #, no-c-format
 msgid ""
 "The bootstrap is split into phases, container initialization, bean "
@@ -654,7 +587,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:398
 #, no-c-format
 msgid ""
 "To initialize the container, you call <literal>Bootstrap.startInitialization"
@@ -666,7 +598,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:405
 #, no-c-format
 msgid ""
 "Having called <literal>startInitialization()</literal>, the "
@@ -675,7 +606,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:410
 #, no-c-format
 msgid ""
 "To deploy the discovered beans, call <literal>Bootstrap.deployBeans()</"
@@ -683,7 +613,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:414
 #, no-c-format
 msgid ""
 "To validate the deployed beans, call <literal>Bootstrap.validateBeans()</"
@@ -691,7 +620,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:418
 #, no-c-format
 msgid ""
 "To place the container into a state where it can service requests, call "
@@ -699,7 +627,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:423
 #, no-c-format
 msgid ""
 "To shutdown the container you call <literal>Bootstrap.shutdown()</literal>. "
@@ -707,13 +634,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:431
 #, no-c-format
 msgid "Resource loading"
 msgstr "리소스 불러오기 "
 
 #. Tag: para
-#: ri-spi.xml:433
 #, fuzzy, no-c-format
 msgid ""
 "Weld needs to load classes and resources from the classpath at various "
@@ -728,13 +653,11 @@
 "webbeans.spi.ResourceLoader</literal>를 구현할 수 있습니다:  "
 
 #. Tag: title
-#: ri-spi.xml:445
 #, no-c-format
 msgid "The contract with the container"
 msgstr "컨테이너와 계약 "
 
 #. Tag: para
-#: ri-spi.xml:447
 #, fuzzy, no-c-format
 msgid ""
 "There are a number of requirements that Weld places on the container for "
@@ -744,13 +667,11 @@
 "너에 위치하게 해야 할 여러 요구 사항이 있습니다 "
 
 #. Tag: term
-#: ri-spi.xml:454
 #, no-c-format
 msgid "Classloader isolation"
 msgstr "Classloader 분리 "
 
 #. Tag: para
-#: ri-spi.xml:458
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into an environment that supports deployment of "
@@ -762,13 +683,11 @@
 "정을 통해 반드시 활성화해야 합니다.   "
 
 #. Tag: term
-#: ri-spi.xml:466
 #, no-c-format
 msgid "Servlet"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:470
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a Servlet environment you must register "
@@ -782,7 +701,6 @@
 "야 합니다.  "
 
 #. Tag: para
-#: ri-spi.xml:475
 #, no-c-format
 msgid ""
 "You must ensure that that <literal>WeldListener.contextInitialized()</"
@@ -791,13 +709,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:482
 #, no-c-format
-msgid "<term>JSF</term>"
+msgid "JSF"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:487
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -809,7 +725,6 @@
 "야 합니다.  "
 
 #. Tag: para
-#: ri-spi.xml:492
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -822,7 +737,6 @@
 "야 합니다.  "
 
 #. Tag: para
-#: ri-spi.xml:497
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -835,7 +749,6 @@
 "야 합니다.  "
 
 #. Tag: para
-#: ri-spi.xml:502
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -847,7 +760,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:509
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -857,7 +769,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:516 ri-spi.xml:562
 #, no-c-format
 msgid ""
 "There are a number of ways you can obtain the bean manager for the module. "
@@ -867,7 +778,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:523
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -882,19 +792,16 @@
 "야 합니다.  "
 
 #. Tag: para
-#: ri-spi.xml:531
 #, no-c-format
 msgid "Weld only supports JSF 1.2 and above."
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:538
 #, no-c-format
-msgid "<term>JSP</term>"
+msgid "JSP"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:543
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must register "
@@ -907,7 +814,6 @@
 "야 합니다.  "
 
 #. Tag: para
-#: ri-spi.xml:548
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -918,7 +824,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:555
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -928,20 +833,20 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:572
 #, no-c-format
 msgid "Session Bean Interceptor"
 msgstr "Session Bean 인터셉터 "
 
 #. Tag: para
-#: ri-spi.xml:576
 #, fuzzy, no-c-format
 msgid ""
-"If you are integrating Weld into an EJB environment you must register "
-"<literal>org.jboss.weld.ejb.SessionBeanInterceptor</literal> as a EJB "
-"interceptor for all EJBs in the application, either automatically, or "
-"through user configuration, for each CDI application which uses enterprise "
-"beans."
+"If you are integrating Weld into an EJB environment you must register the "
+"<literal>aroundInvoke</literal> method of <literal>org.jboss.weld.ejb."
+"SessionBeanInterceptor</literal> as a EJB around-invoke interceptor for all "
+"EJBs in the application, either automatically, or through user "
+"configuration, for each CDI application which uses enterprise beans. If you "
+"are running in a EJB 3.1 environment, you should register this as an around-"
+"timeout interceptor as well."
 msgstr ""
 "Web Beans를 EJB 환경으로 통합하고자 할 경우 엔터프라이즈 beans를 사용하는 각"
 "각의 Web Beans 애플리케이션 용으로 모든 EJB 애플리케이션에 대해 EJB 인터셉터"
@@ -949,7 +854,6 @@
 "으로 또는 사용자 설정을 통해 등록해야 합니다.  "
 
 #. Tag: para
-#: ri-spi.xml:583
 #, no-c-format
 msgid ""
 "You must register the <literal>SessionBeanInterceptor</literal> as the inner "
@@ -957,13 +861,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:591
 #, fuzzy, no-c-format
 msgid "The <literal>weld-core.jar</literal>"
 msgstr "<literal>webbeans-ri.jar</literal> "
 
 #. Tag: para
-#: ri-spi.xml:595
 #, no-c-format
 msgid ""
 "Weld can reside on an isolated classloader, or on a shared classloader. If "
@@ -975,7 +877,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:601
 #, no-c-format
 msgid ""
 "You can provide your own implementation of <literal>Singleton</literal> and "
@@ -984,7 +885,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:606
 #, no-c-format
 msgid ""
 "Weld also provides an implementation of Thread Context Classloader per "
@@ -992,13 +892,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:613
 #, no-c-format
 msgid "Binding the manager in JNDI"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:617
 #, no-c-format
 msgid ""
 "You should bind the bean manager for the bean deployment archive into JNDI "
@@ -1009,13 +907,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:627
 #, no-c-format
 msgid "Performing CDI injection on Java EE component classes"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:631
 #, no-c-format
 msgid ""
 "The CDI specification requires the container to provide injection into non-"
@@ -1027,7 +923,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:639
 #, no-c-format
 msgid ""
 "The CDI specification also requires that a <literal>ProcessInjectionTarget</"
@@ -1038,7 +933,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:646
 #, no-c-format
 msgid ""
 "To help the integrator, Weld provides <literal>WeldManager."
@@ -1046,36 +940,7 @@
 "<literal>InjectionTarget</literal> to use."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:651
-#, no-c-format
-msgid ""
-"<![CDATA[// Fire ProcessInjectionTarget, returning the InjectionTarget\n"
-"// to use\n"
-"InjectionTarget it = weldBeanManager.fireProcessInjectionTarget(clazz);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = beanManager.createCreationalContext(null);\n"
-"\n"
-"// Produce the instance, performing any constructor injection required\n"
-"Object instance = it.produce();\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
-
 #. Tag: para
-#: ri-spi.xml:652
 #, no-c-format
 msgid ""
 "The container may intersperse other operations between these calls. Further, "
@@ -1084,7 +949,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:656
 #, no-c-format
 msgid ""
 "When performing injections on EJBs you must use the Weld-defined SPI, "
@@ -1093,42 +957,6 @@
 "EJB."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:661
-#, no-c-format
-msgid ""
-"<![CDATA[// Obtain the EjbDescriptor for the EJB\n"
-"// You may choose to use this utility method to get the descriptor\n"
-"EjbDescriptor<?> ejbDescriptor = beanManager.getEjbDescriptor(ejbName);\n"
-"\n"
-"// Get an the Bean object\n"
-"Bean<?> bean = beanManager.getBean(ejbDescriptor);\n"
-"\n"
-"// Create the injection target\n"
-"InjectionTarget it = deploymentBeanManager.createInjectionTarget"
-"(ejbDescriptor);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = deploymentBeanManager.createCreationalContext"
-"(bean);\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// You may choose to have CDI call the post construct and pre destroy\n"
-"// lifecycle callbacks\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
-
 #, fuzzy
 #~ msgid ""
 #~ "Currently Web Beans only runs in JBoss AS 5; integrating the RI into "

Modified: doc/trunk/reference/ko-KR/scopescontexts.po
===================================================================
--- doc/trunk/reference/ko-KR/scopescontexts.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/scopescontexts.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: scopescontexts\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-22 12:18+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -22,13 +22,11 @@
 "\n"
 
 #. Tag: title
-#: scopescontexts.xml:5
 #, no-c-format
 msgid "Scopes and contexts"
 msgstr "범위 및 컨텍스트 "
 
 #. Tag: para
-#: scopescontexts.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "So far, we've seen a few examples of <emphasis>scope type annotations</"
@@ -42,26 +40,22 @@
 "Web Beans 사양에 따라 범위는 다음을 결정합니다: "
 
 #. Tag: para
-#: scopescontexts.xml:16
 #, fuzzy, no-c-format
 msgid "When a new instance of any bean with that scope is created"
 msgstr "범위와 함께 Web Bean의 새로운 인스턴스가 생성될 시기 "
 
 #. Tag: para
-#: scopescontexts.xml:19
 #, fuzzy, no-c-format
 msgid "When an existing instance of any bean with that scope is destroyed"
 msgstr "범위와 함께 Web Bean의 기존 인스턴스가 제거될 시기  "
 
 #. Tag: para
-#: scopescontexts.xml:22
 #, fuzzy, no-c-format
 msgid ""
 "Which injected references refer to any instance of a bean with that scope"
 msgstr "삽입된 어떤 참조가 범위와 함께 Web Bean 인스턴스를 참조하는 지 "
 
 #. Tag: para
-#: scopescontexts.xml:27
 #, fuzzy, no-c-format
 msgid ""
 "For example, if we have a session-scoped bean, <literal>CurrentUser</"
@@ -78,7 +72,6 @@
 "성되고 세션이 끝나면 자동으로 삭제됩니다. "
 
 #. Tag: para
-#: scopescontexts.xml:35
 #, no-c-format
 msgid ""
 "JPA entities aren't a great fit for this model. Entities have their whole "
@@ -91,13 +84,11 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:45
 #, no-c-format
 msgid "Scope types"
 msgstr "범위 유형 "
 
 #. Tag: para
-#: scopescontexts.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "CDI features an <emphasis>extensible context model</emphasis>. It's possible "
@@ -106,22 +97,7 @@
 "Web Beans는 <emphasis>extensible context model</emphasis>을 특징으로 합니다. "
 "새로운 범위 유형 어노테이션을 생성하여 새로운 범위를 정의할 수 있습니다:  "
 
-#. Tag: programlisting
-#: scopescontexts.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ScopeType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"public @interface ClusterScoped {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"@ScopeType\n"
-"public @interface ClusterScoped {}]]>"
-
 #. Tag: para
-#: scopescontexts.xml:54
 #, fuzzy, no-c-format
 msgid ""
 "Of course, that's the easy part of the job. For this scope type to be "
@@ -137,7 +113,6 @@
 "을 목적으로 합니다.  "
 
 #. Tag: para
-#: scopescontexts.xml:61
 #, fuzzy, no-c-format
 msgid ""
 "We can apply a scope type annotation to a bean implementation class to "
@@ -146,66 +121,47 @@
 "Web Bean 범위를 지정하기 위해 Web Bean 구현 클래스에 범위 유형 어노테이션을 "
 "적용할 수 있습니다:  "
 
-#. Tag: programlisting
-#: scopescontexts.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-msgstr ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:67
 #, fuzzy, no-c-format
 msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr "주로, Web Beans의 내장된 범위 중 하나를 사용하게 됩니다.  "
 
 #. Tag: title
-#: scopescontexts.xml:72
 #, no-c-format
 msgid "Built-in scopes"
 msgstr "내장된 범위 "
 
 #. Tag: para
-#: scopescontexts.xml:74
 #, fuzzy, no-c-format
 msgid "CDI defines four built-in scopes:"
 msgstr "Web Beans는 네 가지 내장된 범위를 정의합니다:  "
 
-#. Tag: literal
-#: scopescontexts.xml:78
-#, no-c-format
-msgid "@RequestScoped"
-msgstr "@RequestScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@RequestScoped</literal>"
+msgstr "<literal>@New</literal> 어노테이션 "
 
-#. Tag: literal
-#: scopescontexts.xml:81
-#, no-c-format
-msgid "@SessionScoped"
-msgstr "@SessionScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@SessionScoped</literal>"
+msgstr "<literal>@New</literal> 어노테이션 "
 
-#. Tag: literal
-#: scopescontexts.xml:84
-#, no-c-format
-msgid "@ApplicationScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@ApplicationScoped</literal>"
 msgstr "@ApplicationScoped"
 
-#. Tag: literal
-#: scopescontexts.xml:87
-#, no-c-format
-msgid "@ConversationScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@ConversationScoped</literal>"
 msgstr "@ConversationScoped"
 
 #. Tag: para
-#: scopescontexts.xml:91
 #, fuzzy, no-c-format
 msgid "For a web application that uses CDI:"
 msgstr "Web Beans를 사용하는 웹 애플리케이션의 경우: "
 
 #. Tag: para
-#: scopescontexts.xml:95
 #, no-c-format
 msgid ""
 "any servlet request has access to active request, session and application "
@@ -213,13 +169,11 @@
 msgstr "servlet 요청은 활성 요청, 세션 및 애플리케이션 범위에 액세스합니다 "
 
 #. Tag: para
-#: scopescontexts.xml:100
 #, no-c-format
 msgid "any JSF request has access to an active conversation scope."
 msgstr "JSF 요청은 활성 컨버세이션 범위에 액세스합니다.   "
 
 #. Tag: para
-#: scopescontexts.xml:105
 #, no-c-format
 msgid ""
 "A CDI extension can implement support for the conversation scope in other "
@@ -227,49 +181,41 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:108
 #, no-c-format
 msgid "The request and application scopes are also active:"
 msgstr "요청 및 애플리케이션 범위도 활성화되어 있습니다: "
 
 #. Tag: para
-#: scopescontexts.xml:112
 #, no-c-format
 msgid "during invocations of EJB remote methods,"
 msgstr "EJB 원격 방식의 호출시 "
 
 #. Tag: para
-#: scopescontexts.xml:115
 #, fuzzy, no-c-format
 msgid "during invocations of EJB asynchronous methods,"
 msgstr "EJB 원격 방식의 호출시 "
 
 #. Tag: para
-#: scopescontexts.xml:118
 #, no-c-format
 msgid "during EJB timeouts,"
 msgstr "EJB 시간 초과시 "
 
 #. Tag: para
-#: scopescontexts.xml:121
 #, fuzzy, no-c-format
 msgid "during message delivery to a message-driven bean,"
 msgstr "메세지 구동 빈에 메세지 전달시 "
 
 #. Tag: para
-#: scopescontexts.xml:124
 #, fuzzy, no-c-format
 msgid "during message delivery to a <literal>MessageListener</literal>, and"
 msgstr "메세지 구동 빈에 메세지 전달시 "
 
 #. Tag: para
-#: scopescontexts.xml:127
 #, no-c-format
 msgid "during web service invocations."
 msgstr "웹 서비스 호출시 "
 
 #. Tag: para
-#: scopescontexts.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "If the application tries to invoke a bean with a scope that does not have an "
@@ -281,7 +227,6 @@
 "에 의해 넘기게 됩니다.  "
 
 #. Tag: para
-#: scopescontexts.xml:136
 #, no-c-format
 msgid ""
 "Managed beans with scope <literal>@SessionScoped</literal> or "
@@ -290,7 +235,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:141
 #, no-c-format
 msgid ""
 "Three of the four built-in scopes should be extremely familiar to every Java "
@@ -301,13 +245,11 @@
 "루지 않겠습니다. 하지만 이 중 하나의 범위 새로운 것입니다. "
 
 #. Tag: title
-#: scopescontexts.xml:149
 #, no-c-format
 msgid "The conversation scope"
 msgstr "컨버세이션 범위 "
 
 #. Tag: para
-#: scopescontexts.xml:151
 #, fuzzy, no-c-format
 msgid ""
 "The conversation scope is a bit like the traditional session scope in that "
@@ -320,13 +262,11 @@
 "다르게 컨버세이션 범위는 다음과 같은 사항을 갖습니다:      "
 
 #. Tag: para
-#: scopescontexts.xml:159
 #, no-c-format
 msgid "is demarcated explicitly by the application, and"
 msgstr "애플리케이션에 의해 명시적으로 경계를 정합니다  "
 
 #. Tag: para
-#: scopescontexts.xml:162
 #, no-c-format
 msgid ""
 "holds state associated with a particular web browser tab in a JSF "
@@ -335,13 +275,12 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:169
 #, fuzzy, no-c-format
 msgid ""
-"A conversation represents a task&#8212;a unit of work from the point of view "
-"of the user. The conversation context holds state associated with what the "
-"user is currently working on. If the user is doing multiple things at the "
-"same time, there are multiple conversations."
+"A conversation represents a task—a unit of work from the point of view of "
+"the user. The conversation context holds state associated with what the user "
+"is currently working on. If the user is doing multiple things at the same "
+"time, there are multiple conversations."
 msgstr ""
 "컨버세이션은 사용자 관점에서의 작업 단위, 작업 내용을 나타냅니다. 컨버세이션 "
 "컨텍스트는 현재 사용자가 작업하고 있는 것과 관련된 상태를 유지합니다. 사용자"
@@ -349,7 +288,6 @@
 "니다. "
 
 #. Tag: para
-#: scopescontexts.xml:175
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context is active during any JSF request. Most "
@@ -363,13 +301,11 @@
 "다. "
 
 #. Tag: title
-#: scopescontexts.xml:182
 #, no-c-format
 msgid "Conversation demarcation"
 msgstr "컨버세이션 경계 설정 "
 
 #. Tag: para
-#: scopescontexts.xml:184
 #, fuzzy, no-c-format
 msgid ""
 "CDI provides a built-in bean for controlling the lifecycle of conversations "
@@ -378,14 +314,7 @@
 "Web Beans는 JSF 애플리케이션에 있는 컨버세이션 수명 주기를 제어하기 위한 내장"
 "된 Web Bean을 제공합니다. 이러한 Web Bean은 삽입에 의해 획득될 수 있습니다:  "
 
-#. Tag: programlisting
-#: scopescontexts.xml:189
-#, fuzzy, no-c-format
-msgid "@Inject Conversation conversation;"
-msgstr "@Current Conversation conversation;"
-
 #. Tag: para
-#: scopescontexts.xml:191
 #, no-c-format
 msgid ""
 "To promote the conversation associated with the current request to a long-"
@@ -400,7 +329,6 @@
 "<literal>end()</literal>를 호출합니다.  "
 
 #. Tag: para
-#: scopescontexts.xml:197
 #, fuzzy, no-c-format
 msgid ""
 "In the following example, a conversation-scoped bean controls the "
@@ -408,72 +336,7 @@
 msgstr ""
 "다음의 예에서, 컨버세이션 범위 Web Bean은 관련 된 컨버세이션을 제어합니다: "
 
-#. Tag: programlisting
-#: scopescontexts.xml:201
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"   private Order order;\n"
-"   private @Inject Conversation conversation;\n"
-"   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
-"   \n"
-"   @Produces public Order getOrder() {\n"
-"      return order;\n"
-"   }\n"
-"\n"
-"   public Order createOrder() {\n"
-"      order = new Order();\n"
-"      conversation.begin();\n"
-"      return order;\n"
-"   }\n"
-"   \n"
-"   public void addLineItem(Product product, int quantity) {\n"
-"      order.add(new LineItem(product, quantity));\n"
-"   }\n"
-"\n"
-"   public void saveOrder(Order order) {\n"
-"      em.persist(order);\n"
-"      conversation.end();\n"
-"   }\n"
-"   \n"
-"   @Remove\n"
-"   public void destroy() {}\n"
-"}]]>"
-msgstr ""
-"@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"\n"
-"    private Order order;\n"
-"    private @Current Conversation conversation;\n"
-"    private @PersistenceContext(type=EXTENDED) EntityManager em;\n"
-"    \n"
-"    @Produces public Order getOrder() {\n"
-"        return order;\n"
-"    }\n"
-"\n"
-"    public Order createOrder() {\n"
-"        order = new Order();\n"
-"        conversation.begin();\n"
-"        return order;\n"
-"    }\n"
-"    \n"
-"    public void addLineItem(Product product, int quantity) {\n"
-"        order.add( new LineItem(product, quantity) );\n"
-"    }\n"
-"\n"
-"    public void saveOrder(Order order) {\n"
-"        em.persist(order);\n"
-"        conversation.end();\n"
-"    }\n"
-"    \n"
-"    @Remove\n"
-"    public void destroy() {}\n"
-"    \n"
-"}"
-
 #. Tag: para
-#: scopescontexts.xml:203
 #, fuzzy, no-c-format
 msgid ""
 "This bean is able to control its own lifecycle through use of the "
@@ -485,13 +348,11 @@
 "기를 갖습니다.  "
 
 #. Tag: title
-#: scopescontexts.xml:211
 #, no-c-format
 msgid "Conversation propagation"
 msgstr "컨버세이션 보급 "
 
 #. Tag: para
-#: scopescontexts.xml:213
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context automatically propagates with any JSF faces request "
@@ -503,7 +364,6 @@
 "으로 보급되지 않습니다.  "
 
 #. Tag: para
-#: scopescontexts.xml:218
 #, fuzzy, no-c-format
 msgid ""
 "We can force the conversation to propagate with a non-faces request by "
@@ -520,38 +380,16 @@
 "<literal>conversation</literal>이라는 Web Beans 이름을 갖습니다.  "
 
 #. Tag: para
-#: scopescontexts.xml:225
 #, no-c-format
 msgid "Therefore, the following link propagates the conversation:"
 msgstr "따라서, 다음과 같은 링크가 컨버세이션을 보급합니다:  "
 
-#. Tag: programlisting
-#: scopescontexts.xml:229
-#, no-c-format
-msgid ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-msgstr ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-
 #. Tag: para
-#: scopescontexts.xml:231
 #, no-c-format
 msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:235
-#, no-c-format
-msgid ""
-"<![CDATA[<h:link outcome=\"/addProduct.xhtml value=\"Add Product\">\n"
-"   <f:param name=\"cid\" value=\"#{conversation.id}\"/>\n"
-"</h:link>]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:238
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context propagates across redirects, making it very easy to "
@@ -566,21 +404,19 @@
 "추가합니다.  "
 
 #. Tag: title
-#: scopescontexts.xml:248
 #, no-c-format
 msgid "Conversation timeout"
 msgstr "컨버세이션 시간 초과   "
 
 #. Tag: para
-#: scopescontexts.xml:250
 #, fuzzy, no-c-format
 msgid ""
 "The container is permitted to destroy a conversation and all state held in "
 "its context at any time in order to conserve resources. A CDI implementation "
-"will normally do this on the basis of some kind of timeout&#8212;though this "
-"is not required by the specification. The timeout is the period of "
-"inactivity before the conversation is destroyed (as opposed to the amount of "
-"time the conversation is active)."
+"will normally do this on the basis of some kind of timeout—though this is "
+"not required by the specification. The timeout is the period of inactivity "
+"before the conversation is destroyed (as opposed to the amount of time the "
+"conversation is active)."
 msgstr ""
 "Web Bean 관리자에게는 리소스를 보관하기 위해 컨텍스트에 있는 모든 상태 및 컨"
 "버세이션을 삭제할 수 있는 권한이 있습니다. Web Bean 관리자 구현은 주로 시간 "
@@ -588,7 +424,6 @@
 "습니다. 시간 초과는 컨버세이션이 삭제된 후 비활성화 기간을 말합니다.       "
 
 #. Tag: para
-#: scopescontexts.xml:257
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Conversation</literal> object provides a method to set the "
@@ -599,20 +434,12 @@
 "합니다. 이는 Web Bean 관리자에게 도움이 되며, 설정 사항을 무시하셔도 상관 없"
 "습니다. "
 
-#. Tag: programlisting
-#: scopescontexts.xml:262
-#, no-c-format
-msgid "conversation.setTimeout(timeoutInMillis);"
-msgstr "conversation.setTimeout(timeoutInMillis);"
-
 #. Tag: title
-#: scopescontexts.xml:269
 #, fuzzy, no-c-format
 msgid "The singleton pseudo-scope"
 msgstr "dependent pseudo-scope "
 
 #. Tag: para
-#: scopescontexts.xml:271
 #, fuzzy, no-c-format
 msgid ""
 "In addition to the four built-in scopes, CDI also supports two "
@@ -625,7 +452,6 @@
 "에 대한 기본값 범위입니다. "
 
 #. Tag: para
-#: scopescontexts.xml:277
 #, no-c-format
 msgid ""
 "Unlike the other scopes, which belong to the package <literal>javax."
@@ -634,7 +460,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:283
 #, no-c-format
 msgid ""
 "You can guess what \"singleton\" means here. It means a bean that is "
@@ -649,7 +474,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:292
 #, no-c-format
 msgid ""
 "Now, if the singleton instance is a simple, immutable, serializable object "
@@ -660,7 +484,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:298
 #, no-c-format
 msgid ""
 "There are several ways to ensure that the singleton bean remains a singleton "
@@ -668,7 +491,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:302
 #, no-c-format
 msgid ""
 "have the singleton bean implement <literal>writeResolve()</literal> and "
@@ -677,7 +499,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:308
 #, no-c-format
 msgid ""
 "make sure the client keeps only a transient reference to the singleton bean, "
@@ -685,7 +506,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:313
 #, no-c-format
 msgid ""
 "give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
@@ -693,7 +513,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:320
 #, no-c-format
 msgid ""
 "A fourth, better solution is to instead use <literal>@ApplicationScoped</"
@@ -702,13 +521,11 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:326
 #, no-c-format
 msgid "The dependent pseudo-scope"
 msgstr "dependent pseudo-scope "
 
 #. Tag: para
-#: scopescontexts.xml:328
 #, fuzzy, no-c-format
 msgid ""
 "Finally, CDI features the so-called <emphasis>dependent pseudo-scope</"
@@ -720,21 +537,13 @@
 "에 대한 기본값 범위입니다. "
 
 #. Tag: para
-#: scopescontexts.xml:333
 #, fuzzy, no-c-format
 msgid ""
 "For example, this bean has the scope type <literal>@Dependent</literal>:"
 msgstr ""
 "예를 들어, Web Bean에는 <literal>@Dependent</literal> 범위 유형이 있습니다:  "
 
-#. Tag: programlisting
-#: scopescontexts.xml:337
-#, no-c-format
-msgid "<![CDATA[public class Calculator { ... }]]>"
-msgstr "<![CDATA[public class Calculator { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:339
 #, no-c-format
 msgid ""
 "An instance of a dependent bean is never shared between different clients or "
@@ -745,7 +554,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:345
 #, no-c-format
 msgid ""
 "If a Unified EL expression refers to a dependent bean by EL name, an "
@@ -754,7 +562,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:351
 #, no-c-format
 msgid ""
 "If you need to access a bean directly by EL name in a JSF page, you probably "
@@ -769,7 +576,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:361
 #, no-c-format
 msgid ""
 "Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
@@ -777,7 +583,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:366
 #, fuzzy, no-c-format
 msgid ""
 "CDI makes it easy to obtain a dependent instance of a bean, even if the bean "
@@ -788,27 +593,18 @@
 "있게 합니다.   "
 
 #. Tag: title
-#: scopescontexts.xml:374
 #, fuzzy, no-c-format
 msgid "The <literal>@New</literal> qualifier"
 msgstr "<literal>@New</literal> 어노테이션 "
 
 #. Tag: para
-#: scopescontexts.xml:376
 #, no-c-format
 msgid ""
 "The built-in qualifier <literal>@New</literal> allows us to obtain a "
 "dependent object of a specified class."
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:380
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
-msgstr "<![CDATA[@New Calculator calculator;]]>"
-
 #. Tag: para
-#: scopescontexts.xml:382
 #, no-c-format
 msgid ""
 "The class must be a valid managed bean or session bean, but need not be an "
@@ -816,7 +612,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:384
 #, fuzzy, no-c-format
 msgid ""
 "This works even if <literal>Calculator</literal> is <emphasis>already</"
@@ -825,18 +620,7 @@
 "<literal>Calculator</literal>가 다른 범위 유형과 함께 <emphasis>이미</"
 "emphasis> 명시되어 있어도 이는 사실입니다, 예:  "
 
-#. Tag: programlisting
-#: scopescontexts.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-msgstr ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:391
 #, no-c-format
 msgid ""
 "So the following injected attributes each get a different instance of "
@@ -844,24 +628,7 @@
 msgstr ""
 "다음의 삽입 속성은 다른 <literal>Calculator</literal> 인스턴스를 갖습니다:  "
 
-#. Tag: programlisting
-#: scopescontexts.xml:395
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class PaymentCalc {\n"
-"   @Inject Calculator calculator;\n"
-"   @Inject @New Calculator newCalculator;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class PaymentCalc {\n"
-"\n"
-"    @Current Calculator calculator;\n"
-"    @New Calculator newCalculator;\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: scopescontexts.xml:397
 #, no-c-format
 msgid ""
 "The <literal>calculator</literal> field has a conversation-scoped instance "
@@ -875,14 +642,142 @@
 "<literal>Calculator</literal>의 새로운 인스턴스가 삽입되어 있습니다.  "
 
 #. Tag: para
-#: scopescontexts.xml:403
 #, no-c-format
 msgid ""
 "This feature is particularly useful with producer methods, as we'll see in "
 "the next chapter."
 msgstr "특히 이러한 기능은 다음 장에서 다루게 될 생산자 방식에서 유용합니다.  "
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@ScopeType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD})\n"
+#~ "public @interface ClusterScoped {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD})\n"
+#~ "@ScopeType\n"
+#~ "public @interface ClusterScoped {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ClusterScoped\n"
+#~ "public class SecondLevelCache { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ClusterScoped\n"
+#~ "public class SecondLevelCache { ... }]]>"
+
+#~ msgid "@RequestScoped"
+#~ msgstr "@RequestScoped"
+
+#~ msgid "@SessionScoped"
+#~ msgstr "@SessionScoped"
+
+#, fuzzy
+#~ msgid "@Inject Conversation conversation;"
+#~ msgstr "@Current Conversation conversation;"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ConversationScoped @Stateful\n"
+#~ "public class OrderBuilder {\n"
+#~ "   private Order order;\n"
+#~ "   private @Inject Conversation conversation;\n"
+#~ "   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
+#~ "   \n"
+#~ "   @Produces public Order getOrder() {\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public Order createOrder() {\n"
+#~ "      order = new Order();\n"
+#~ "      conversation.begin();\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void addLineItem(Product product, int quantity) {\n"
+#~ "      order.add(new LineItem(product, quantity));\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public void saveOrder(Order order) {\n"
+#~ "      em.persist(order);\n"
+#~ "      conversation.end();\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Remove\n"
+#~ "   public void destroy() {}\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@ConversationScoped @Stateful\n"
+#~ "public class OrderBuilder {\n"
+#~ "\n"
+#~ "    private Order order;\n"
+#~ "    private @Current Conversation conversation;\n"
+#~ "    private @PersistenceContext(type=EXTENDED) EntityManager em;\n"
+#~ "    \n"
+#~ "    @Produces public Order getOrder() {\n"
+#~ "        return order;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "    public Order createOrder() {\n"
+#~ "        order = new Order();\n"
+#~ "        conversation.begin();\n"
+#~ "        return order;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void addLineItem(Product product, int quantity) {\n"
+#~ "        order.add( new LineItem(product, quantity) );\n"
+#~ "    }\n"
+#~ "\n"
+#~ "    public void saveOrder(Order order) {\n"
+#~ "        em.persist(order);\n"
+#~ "        conversation.end();\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    @Remove\n"
+#~ "    public void destroy() {}\n"
+#~ "    \n"
+#~ "}"
+
+#~ msgid ""
+#~ "<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</"
+#~ "a>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</"
+#~ "a>]]>"
+
+#~ msgid "conversation.setTimeout(timeoutInMillis);"
+#~ msgstr "conversation.setTimeout(timeoutInMillis);"
+
+#~ msgid "<![CDATA[public class Calculator { ... }]]>"
+#~ msgstr "<![CDATA[public class Calculator { ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
+#~ msgstr "<![CDATA[@New Calculator calculator;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ConversationScoped\n"
+#~ "public class Calculator { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ConversationScoped\n"
+#~ "public class Calculator { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class PaymentCalc {\n"
+#~ "   @Inject Calculator calculator;\n"
+#~ "   @Inject @New Calculator newCalculator;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class PaymentCalc {\n"
+#~ "\n"
+#~ "    @Current Calculator calculator;\n"
+#~ "    @New Calculator newCalculator;\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "holds state associated with a particular web browser tab in a JSF "
 #~ "application."
 #~ msgstr ""

Modified: doc/trunk/reference/ko-KR/specialization.po
===================================================================
--- doc/trunk/reference/ko-KR/specialization.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/specialization.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: specialization\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-23 11:14+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -26,13 +26,11 @@
 "\n"
 
 #. Tag: title
-#: specialization.xml:5
 #, no-c-format
 msgid "Specialization, inheritance and alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:7
 #, no-c-format
 msgid ""
 "When you first start developing with CDI, you'll likely be dealing only with "
@@ -47,7 +45,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:16
 #, no-c-format
 msgid ""
 "The CDI specification recognizes two distinct scenarios in which one bean "
@@ -55,7 +52,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:23
 #, no-c-format
 msgid ""
 "The second bean <emphasis>specializes</emphasis> the first bean in certain "
@@ -64,7 +60,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:29
 #, no-c-format
 msgid ""
 "The second bean is simply reusing the Java implementation, and otherwise "
@@ -73,7 +68,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:37
 #, no-c-format
 msgid ""
 "The second case is the default assumed by CDI. It's possible to have two "
@@ -83,7 +77,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:43
 #, no-c-format
 msgid ""
 "The first case is the exception, and also requires more care. In any given "
@@ -95,13 +88,11 @@
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:51
 #, no-c-format
 msgid "Using alternative stereotypes"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:53
 #, fuzzy, no-c-format
 msgid ""
 "CDI lets you <emphasis>override</emphasis> the implementation of a bean type "
@@ -113,23 +104,7 @@
 "emphasis> 하게 합니다. 예를 들어, 다음과 같은 엔터프라이즈 Web Bean은 제품에"
 "서 API <literal>PaymentProcessor</literal> 구현을 제공합니다:   "
 
-#. Tag: programlisting
-#: specialization.xml:59
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DefaultPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless\n"
-"public class CreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:61
 #, fuzzy, no-c-format
 msgid ""
 "But in our staging environment, we don't really want to submit payments to "
@@ -139,46 +114,12 @@
 "staging 환경에서, 다른 Web Bean을 사용하여 <literal>PaymentProcessor</"
 "literal> 구현을 덮어쓰기 합니다:  "
 
-#. Tag: programlisting
-#: specialization.xml:66
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless\n"
-"public class CreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:68
 #, no-c-format
-msgid "<para>or</para>"
+msgid "or"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:70
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      extends DefaultPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@Stateless @Staging @Specializes\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        extends CreditCardPaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:72
 #, no-c-format
 msgid ""
 "We've already seen how we can enable this alternative by listing its class "
@@ -186,7 +127,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:77
 #, no-c-format
 msgid ""
 "But suppose we have many alternatives in the staging environment. It would "
@@ -196,67 +136,21 @@
 "this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:84
-#, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Staging {}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:86
 #, no-c-format
 msgid ""
 "Then we replace the <literal>@Alternative</literal> annotation on our bean "
 "with <literal>@Staging</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:90
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Staging\n"
-"public class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless @Staging\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:92
 #, no-c-format
 msgid ""
 "Finally, we activate the <literal>@Staging</literal> stereotype in the "
 "<literal>beans.xml</literal> descriptor:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:96
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <stereotype>org.mycompany.myapp.Staging</stereotype>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:98
 #, no-c-format
 msgid ""
 "Now, no matter how many staging beans we have, they will all be enabled at "
@@ -264,13 +158,11 @@
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:105
 #, no-c-format
 msgid "A minor problem with alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:107
 #, no-c-format
 msgid ""
 "When we enable an alternative, does that mean the default implementation is "
@@ -279,15 +171,7 @@
 "not, you could still inject the default implementation."
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:113
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @LargeTransaction PaymentProcessor paymentProcessor;]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:115
 #, no-c-format
 msgid ""
 "So we haven't completely replaced the default implementation in this "
@@ -300,7 +184,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "CDI provides a special feature, called <emphasis>specialization</emphasis>, "
@@ -314,13 +197,11 @@
 "다.  "
 
 #. Tag: title
-#: specialization.xml:132
 #, no-c-format
 msgid "Using specialization"
 msgstr "특성화 기능 사용  "
 
 #. Tag: para
-#: specialization.xml:134
 #, no-c-format
 msgid ""
 "When the goal is to replace one bean implementation with a second, to help "
@@ -328,13 +209,11 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:141
 #, no-c-format
 msgid "directly extend the bean class of the second bean, or"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:146
 #, no-c-format
 msgid ""
 "directly override the producer method, in the case that the second bean is a "
@@ -342,7 +221,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:152
 #, fuzzy, no-c-format
 msgid ""
 "explicitly declare that it <emphasis>specializes</emphasis> the second bean:"
@@ -350,24 +228,7 @@
 "높은 우선 순위의 Web Bean이 해당 상위클래스를 <emphasis>특성화</emphasis>한다"
 "고 합니다.   "
 
-#. Tag: programlisting
-#: specialization.xml:154
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Specializes\n"
-"public class MockCreditCardPaymentProcessor \n"
-"      extends CreditCardPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@Stateless @Staging @Specializes\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        extends CreditCardPaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:156
 #, no-c-format
 msgid ""
 "When an enabled bean specializes another bean, the other bean is never "
@@ -376,7 +237,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:161
 #, no-c-format
 msgid ""
 "So why does specialization work, and what does it have to do with "
@@ -384,7 +244,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:165
 #, no-c-format
 msgid ""
 "Since we're informing the container that our alternative bean is meant to "
@@ -396,7 +255,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:172
 #, no-c-format
 msgid ""
 "Furthermore, if the default implementation declares a bean EL name using "
@@ -404,6 +262,75 @@
 "alternative bean."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DefaultPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      extends DefaultPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Stateless @Staging @Specializes\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        extends CreditCardPaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Staging\n"
+#~ "public class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless @Staging\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative @Specializes\n"
+#~ "public class MockCreditCardPaymentProcessor \n"
+#~ "      extends CreditCardPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Stateless @Staging @Specializes\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        extends CreditCardPaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
 #~ msgid "Specialization"
 #~ msgstr "특성화 "
 

Modified: doc/trunk/reference/ko-KR/stereotypes.po
===================================================================
--- doc/trunk/reference/ko-KR/stereotypes.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/stereotypes.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: stereotypes\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-20 15:31+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -21,19 +21,16 @@
 "\n"
 
 #. Tag: title
-#: stereotypes.xml:5
 #, no-c-format
 msgid "Stereotypes"
 msgstr "스테레오타입 (Stereotypes)  "
 
 #. Tag: para
-#: stereotypes.xml:7
 #, no-c-format
 msgid "The CDI specification defines a stereotype as follows:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:11
 #, fuzzy, no-c-format
 msgid ""
 "In many systems, use of architectural patterns produces a set of recurring "
@@ -46,31 +43,26 @@
 "에서의 역할과 함께 Web Beans의 일반적인 메타데이터를 명시하게 합니다. "
 
 #. Tag: para
-#: stereotypes.xml:17
 #, no-c-format
 msgid "A stereotype encapsulates any combination of:"
 msgstr "스테레오타입은 다음의 조합을 캡슐화합니다:  "
 
 #. Tag: para
-#: stereotypes.xml:21
 #, fuzzy, no-c-format
 msgid "a default scope, and"
 msgstr "기본값 범위 유형 "
 
 #. Tag: para
-#: stereotypes.xml:24
 #, fuzzy, no-c-format
 msgid "a set of interceptor bindings."
 msgstr "인터셉터 바인딩 어노테이션 모음 "
 
 #. Tag: para
-#: stereotypes.xml:28
 #, no-c-format
 msgid "A stereotype may also specify that:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:34
 #, fuzzy, no-c-format
 msgid "all beans with the stereotype have defaulted bean EL names, or that"
 msgstr ""
@@ -78,13 +70,11 @@
 "로 하도록 지정할 수 도 있습니다.  "
 
 #. Tag: para
-#: stereotypes.xml:37
 #, no-c-format
 msgid "all beans with the stereotype are alternatives."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:41
 #, no-c-format
 msgid ""
 "A bean may declare zero, one or multiple stereotypes. Stereotype annotations "
@@ -92,7 +82,6 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype is an annotation, annotated <literal>@Stereotype</literal>, "
@@ -102,39 +91,12 @@
 "스테레오타입은 Java 어노테이션 유형입니다. 이러한 스테레오타입은 일부 MVC 프"
 "레임워크에서 작업 클래스를 인식합니다:   "
 
-#. Tag: programlisting
-#: stereotypes.xml:53
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"...\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:55
 #, fuzzy, no-c-format
 msgid "We use the stereotype by applying the annotation to a bean."
 msgstr "Web Bean에 어노테이션을 적용하여 스테레오타입을 사용합니다.  "
 
-#. Tag: programlisting
-#: stereotypes.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-
 #. Tag: para
-#: stereotypes.xml:61
 #, no-c-format
 msgid ""
 "Of course, we need to apply some other annotations to our stereotype or else "
@@ -142,13 +104,11 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:66
 #, fuzzy, no-c-format
 msgid "Default scope for a stereotype"
 msgstr "스테레오타입에 대한 기본값 범위 및 배치 유형 "
 
 #. Tag: para
-#: stereotypes.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype may specify a default scope for beans annotated with the "
@@ -157,39 +117,12 @@
 "스테레오타입은 스테레오타입이 있는 모든 Web Beans이 Web Bean 이름을 기본값으"
 "로 하도록 지정할 수 도 있습니다.  "
 
-#. Tag: programlisting
-#: stereotypes.xml:72
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:74
 #, fuzzy, no-c-format
 msgid "A particular action may still override this default if necessary:"
 msgstr "물론 특정 작업은 필요할 경우 이러한 기본값을 덮어쓰기할 수 있습니다:  "
 
-#. Tag: programlisting
-#: stereotypes.xml:78
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Dependent @Action \n"
-"public class DependentScopedLoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Dependent @Mock @Action \n"
-"public class MockLoginAction { ... }]]>"
-
 #. Tag: para
-#: stereotypes.xml:80
 #, no-c-format
 msgid ""
 "Naturally, overriding a single default isn't much use. But remember, "
@@ -197,13 +130,11 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:88
 #, no-c-format
 msgid "Interceptor bindings for stereotypes"
 msgstr "스테레오타입 용 인터셉터 바인딩  "
 
 #. Tag: para
-#: stereotypes.xml:90
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype may specify a set of interceptor bindings to be inherited by "
@@ -212,29 +143,7 @@
 "스테레오타입은 스테레오타입과 함께 모든 Web Beans에 의해 상속되기 위해 인터셉"
 "터 바인딩 모음을 지정할 수 있습니다.  "
 
-#. Tag: programlisting
-#: stereotypes.xml:94
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@WebTier\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "This helps us get technical concerns, like transactions and security, even "
@@ -243,13 +152,11 @@
 "이는 비지니스 코드에서 발생할 수 있는 기술적 문제를 발생하지 않게 합니다! "
 
 #. Tag: title
-#: stereotypes.xml:103
 #, no-c-format
 msgid "Name defaulting with stereotypes"
 msgstr "스테레오타입과 함께 이름을 기본값으로 지정 "
 
 #. Tag: para
-#: stereotypes.xml:105
 #, fuzzy, no-c-format
 msgid ""
 "We can specify that all beans with a certain stereotype have a defaulted EL "
@@ -261,31 +168,7 @@
 "참조할 수 있어, 이러한 기능을 완벽하게 사용할 수 있는 경우라 할 수 있습니다. "
 "필요한 작업은 빈 <literal>@Named</literal> 어노테이션을 추가하는 것입니다:  "
 
-#. Tag: programlisting
-#: stereotypes.xml:110
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@WebTier\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:112
 #, fuzzy, no-c-format
 msgid ""
 "Now, the <literal>LoginAction</literal> bean will have the defaulted name "
@@ -295,13 +178,11 @@
 "름을 갖게 됩니다. "
 
 #. Tag: title
-#: stereotypes.xml:119
 #, fuzzy, no-c-format
 msgid "Alternative stereotypes"
 msgstr "표준 스테레오타입 "
 
 #. Tag: para
-#: stereotypes.xml:121
 #, no-c-format
 msgid ""
 "A stereotype can indicate that all beans to which it is applied are "
@@ -309,47 +190,19 @@
 "emphasis> lets us classify beans by deployment scenario."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:126
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Mock {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:128
 #, no-c-format
 msgid ""
 "We can apply an alternative stereotype to a whole set of beans, and activate "
 "them all with one line of code in <literal>beans.xml</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:133
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Mock\n"
-"public class MockLoginAction extends LoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-
 #. Tag: title
-#: stereotypes.xml:141
 #, fuzzy, no-c-format
 msgid "Stereotype stacking"
 msgstr "스테레오타입 (Stereotypes)  "
 
 #. Tag: para
-#: stereotypes.xml:143
 #, no-c-format
 msgid ""
 "This may blow your mind a bit, but stereotypes may declare other "
@@ -360,39 +213,18 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:150
 #, no-c-format
 msgid ""
 "Here's an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:155
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Auditable\n"
-"@Action\n"
-"@Stereotype\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface AuditableAction {}]]>"
-msgstr ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {} ]]>"
-
 #. Tag: title
-#: stereotypes.xml:160
 #, fuzzy, no-c-format
 msgid "Built-in stereotypes"
 msgstr "표준 스테레오타입 "
 
 #. Tag: para
-#: stereotypes.xml:162
 #, fuzzy, no-c-format
 msgid ""
 "We've already met two standard stereotypes defined by the CDI specification: "
@@ -402,33 +234,13 @@
 "literal> 및 <literal>@Decorator</literal>를 살펴보았습니다.  "
 
 #. Tag: para
-#: stereotypes.xml:167
 #, no-c-format
 msgid ""
 "CDI defines one further standard stereotype, <literal>@Model</literal>, "
 "which is expected to be used frequently in web applications:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:172
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {}]]>"
-msgstr ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {} ]]>"
-
 #. Tag: para
-#: stereotypes.xml:174
 #, fuzzy, no-c-format
 msgid ""
 "Instead of using JSF managed beans, just annotate a bean <literal>@Model</"
@@ -438,6 +250,140 @@
 "용하지 않고 Web Bean <literal>@Model</literal>을 어노테이션하여 이를 직접 "
 "JSF 페이지에서 사용합니다. "
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "...\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Dependent @Action \n"
+#~ "public class DependentScopedLoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Dependent @Mock @Action \n"
+#~ "public class MockLoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@WebTier\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Named\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Named\n"
+#~ "@WebTier\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Mock {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Mock\n"
+#~ "public class MockLoginAction extends LoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Auditable\n"
+#~ "@Action\n"
+#~ "@Stereotype\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface AuditableAction {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {} ]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {} ]]>"
+
 #~ msgid "According to the Web Beans specification:"
 #~ msgstr "Web Beans 사양에 따라: "
 

Modified: doc/trunk/reference/ko-KR/viewlayers.po
===================================================================
--- doc/trunk/reference/ko-KR/viewlayers.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/viewlayers.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-04-19 20:36+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,19 +15,16 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: viewlayers.xml:5
 #, no-c-format
 msgid "Alternative view layers"
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:8
 #, no-c-format
 msgid "Wicket CDI integration"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:10
 #, no-c-format
 msgid ""
 "Weld provides integration between the Apache Wicket web framework and CDI. "
@@ -37,7 +34,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:16
 #, no-c-format
 msgid ""
 "This section describes some of the utilities provided by the Wicket "
@@ -45,13 +41,11 @@
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:22
 #, no-c-format
 msgid "The <literal>WebApplication</literal> class"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:24
 #, no-c-format
 msgid ""
 "Each wicket application must have a <literal>WebApplication</literal> "
@@ -61,7 +55,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:31
 #, no-c-format
 msgid ""
 "If you would prefer not to subclass <literal>WeldApplication</literal>, you "
@@ -71,31 +64,16 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:38
 #, no-c-format
 msgid "For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: viewlayers.xml:41
-#, no-c-format
-msgid ""
-"<![CDATA[public class SampleApplication extends WeldApplication {\n"
-"   @Override\n"
-"   public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: viewlayers.xml:45
 #, no-c-format
 msgid "Conversations with Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:46
 #, no-c-format
 msgid ""
 "Wicket can also take advantage of the conversation scope from CDI, provided "
@@ -103,7 +81,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:52
 #, no-c-format
 msgid ""
 "Setting up the conversation context at the beginning of a Wicket request, "
@@ -111,7 +88,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:58
 #, no-c-format
 msgid ""
 "Storing the id of any long-running conversation in Wicket's metadata when "
@@ -119,7 +95,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:64
 #, no-c-format
 msgid ""
 "Activating the correct long-running conversation based upon which page is "
@@ -127,7 +102,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:69
 #, no-c-format
 msgid ""
 "Propagating the conversation context for any long-running conversation to "
@@ -135,13 +109,11 @@
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:76
 #, no-c-format
 msgid "Starting and stopping conversations in Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:77
 #, no-c-format
 msgid ""
 "As in JSF applications, a conversation <emphasis>always</emphasis> exists "
@@ -153,27 +125,12 @@
 "</literal> methods:"
 msgstr ""
 
-#. Tag: programlisting
-#: viewlayers.xml:86
-#, no-c-format
-msgid ""
-"<![CDATA[private @Inject Conversation conversation;\n"
-"...\n"
-"// begin a conversation\n"
-"conversation.begin();\n"
-"...\n"
-"// end a conversation\n"
-"conversation.end();]]>"
-msgstr ""
-
 #. Tag: title
-#: viewlayers.xml:91
 #, no-c-format
 msgid "Long running conversation propagation in Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:92
 #, no-c-format
 msgid ""
 "When a conversation is marked as long-running, the id of that conversation "

Modified: doc/trunk/reference/ko-KR/weldexamples.po
===================================================================
--- doc/trunk/reference/ko-KR/weldexamples.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/weldexamples.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: weldexamples.xml:5
 #, no-c-format
 msgid "Diving into the Weld examples"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:7
 #, no-c-format
 msgid ""
 "It's time to pull the covers back and dive into the internals of Weld "
@@ -29,13 +27,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:13
 #, no-c-format
 msgid "The numberguess example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:15
 #, no-c-format
 msgid ""
 "In the numberguess application you get 10 attempts to guess a number between "
@@ -44,16 +40,14 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:20
 #, no-c-format
 msgid ""
 "The numberguess example is comprised of a number of beans, configuration "
-"files and Facelets (JSF) views, packaged as a WAR module. Let's start by "
+"files and Facelets (JSF) views, packaged as a war module. Let's start by "
 "examining the configuration files."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:25
 #, no-c-format
 msgid ""
 "All the configuration files for this example are located in <literal>WEB-INF/"
@@ -64,21 +58,7 @@
 "to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:33
-#, no-c-format
-msgid ""
-"<![CDATA[<faces-config version=\"2.0\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd\">\n"
-"</faces-config>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:35
 #, no-c-format
 msgid ""
 "There's also an empty <literal>beans.xml</literal> file, which tells the "
@@ -87,212 +67,120 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:40
 #, no-c-format
 msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:42
+#. Tag: para
 #, no-c-format
+msgid "Enable and initialize the JSF servlet"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"faces.servlet\" coords=\"10\"/> "
-"<area id=\"faces.servlet.mapping\" coords=\"16\"/> <area id=\"faces.default."
-"suffix\" coords=\"21\"/> <area id=\"session.timeout\" coords=\"26\"/> </"
-"areaspec> <programlisting role=\"XML\"><![CDATA[<web-app version=\"2.5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n"
-"   \n"
-"   <display-name>weld-jsf-numberguess-war</display-name>\n"
-"   <description>Weld JSF numberguess example (WAR)</description>\n"
-"\n"
-"   <servlet>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>\n"
-"      <load-on-startup>1</load-on-startup>\n"
-"   </servlet>\n"
-"\n"
-"   <servlet-mapping>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <url-pattern>*.jsf</url-pattern>\n"
-"   </servlet-mapping>\n"
-"   \n"
-"   <context-param>\n"
-"      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>\n"
-"      <param-value>.xhtml</param-value>\n"
-"   </context-param>\n"
-"\n"
-"   <session-config>\n"
-"      <session-timeout>10</session-timeout>\n"
-"   </session-config>\n"
-"\n"
-"</web-app>]]></programlisting> <calloutlist> <callout arearefs=\"faces."
-"servlet\"> <para> Enable and initialize the JSF servlet </para> </callout> "
-"<callout arearefs=\"faces.servlet.mapping\"> <para> Configure requests for "
-"URLs ending in <literal>.jsf</literal> to be handled by JSF </para> </"
-"callout> <callout arearefs=\"faces.default.suffix\"> <para> Tell JSF that we "
-"will be giving our JSF views (Facelets templates) an extension of <literal>."
-"xhtml</literal> </para> </callout> <callout arearefs=\"session.timeout\"> "
-"<para> Configure a session timeout of 10 minutes </para> </callout> </"
-"calloutlist> </programlistingco> <note> <para> This demo uses JSF 2 as the "
-"view framework, but you can use Weld with any servlet-based web framework, "
-"such as JSF 1.2 or Wicket. </para> </note> <para> Let's take a look at the "
-"main JSF view, <literal>src/main/webapp/home.xhtml</literal>. </para> "
-"<programlistingco> <areaspec> <area id=\"template\" coords=\"8\"/> <area id="
-"\"statusMessages\" coords=\"12\"/> <area id=\"instructions\" coords=\"20\"/> "
-"<area id=\"guess\" coords=\"27\"/> <area id=\"validator\" coords=\"29\"/> "
-"<area id=\"submit\" coords=\"30\"/> </areaspec> <programlisting role=\"XML"
-"\"><![CDATA[<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN"
-"\"\n"
-"   \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
-"<html xmlns=\"http://www.w3.org/1999/xhtml\"\n"
-"   xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n"
-"   xmlns:h=\"http://java.sun.com/jsf/html\"\n"
-"   xmlns:f=\"http://java.sun.com/jsf/core\">\n"
-"\n"
-"   <ui:composition template=\"/template.xhtml\">\n"
-"      <ui:define name=\"content\">\n"
-"         <h1>Guess a number...</h1>\n"
-"         <h:form id=\"numberGuess\">\n"
-"            <div style=\"color: red\">\n"
-"               <h:messages id=\"messages\" globalOnly=\"false\"/>\n"
-"               <h:outputText id=\"Higher\" value=\"Higher!\"\n"
-"                  rendered=\"#{game.number gt game.guess and game.guess ne 0}"
-"\"/>\n"
-"               <h:outputText id=\"Lower\" value=\"Lower!\"\n"
-"                  rendered=\"#{game.number lt game.guess and game.guess ne 0}"
-"\"/>\n"
-"            </div>\n"
-"    \n"
-"            <div>\n"
-"               I'm thinking of a number between #{game.smallest} and #{game."
-"biggest}.\n"
-"               You have #{game.remainingGuesses} guesses remaining.\n"
-"            </div>\n"
-"       \n"
-"            <div>\n"
-"               Your guess: \n"
-"               <h:inputText id=\"inputGuess\" value=\"#{game.guess}\"\n"
-"                  size=\"3\" required=\"true\" disabled=\"#{game.number eq "
-"game.guess}\"\n"
-"                  validator=\"#{game.validateNumberRange}\"/>\n"
-"               <h:commandButton id=\"guessButton\" value=\"Guess\" \n"
-"                  action=\"#{game.check}\" disabled=\"#{game.number eq game."
-"guess}\"/>\n"
-"            </div>\n"
-"            <div>\n"
-"              <h:commandButton id=\"restartButton\" value=\"Reset\" action="
-"\"#{game.reset}\" immediate=\"true\"/>\n"
-"            </div>\n"
-"         </h:form>\n"
-"      </ui:define>\n"
-"   </ui:composition>\n"
-"</html>]]></programlisting> <calloutlist> <callout arearefs=\"template\"> "
-"<para> Facelets is the built-in templating language for JSF. Here we are "
-"wrapping our page in a template which defines the layout. </para> </callout> "
-"<callout arearefs=\"statusMessages\"> <para> There are a number of messages "
-"which can be sent to the user, \"Higher!\", \"Lower!\" and \"Correct!\" </"
-"para> </callout> <callout arearefs=\"instructions\"> <para> As the user "
-"guesses, the range of numbers they can guess gets smaller - this sentence "
-"changes to make sure they know the number range of a valid guess. </para> </"
-"callout> <callout arearefs=\"guess\"> <para> This input field is bound to a "
-"bean property using a value expression. </para> </callout> <callout arearefs="
-"\"validator\"> <para> A validator binding is used to make sure the user "
-"doesn't accidentally input a number outside of the range in which they can "
-"guess - if the validator wasn't here, the user might use up a guess on an "
-"out of bounds number. </para> </callout> <callout arearefs=\"submit\"> "
-"<para> And, of course, there must be a way for the user to send their guess "
-"to the server. Here we bind to an action method on the bean. </para> </"
-"callout> </calloutlist> </programlistingco>"
+"Configure requests for URLs ending in <literal>.jsf</literal> to be handled "
+"by JSF"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:142
 #, no-c-format
 msgid ""
-"The example exists of 4 classes, the first two of which are qualifiers. "
-"First, there is the <literal>@Random</literal> qualifier, used for injecting "
-"a random number:"
+"Tell JSF that we will be giving our JSF views (Facelets templates) an "
+"extension of <literal>.xhtml</literal>"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:147
+#. Tag: para
 #, no-c-format
+msgid "Configure a session timeout of 10 minutes"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Random {}]]>"
+"This demo uses JSF 2 as the view framework, but you can use Weld with any "
+"servlet-based web framework, such as JSF 1.2 or Wicket."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:149
 #, no-c-format
 msgid ""
-"There is also the <literal>@MaxNumber</literal> qualifier, used for "
-"injecting the maximum number that can be injected:"
+"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
+"literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:154
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface MaxNumber {}\n"
-"]]>"
+"Facelets is the built-in templating language for JSF. Here we are wrapping "
+"our page in a template which defines the layout."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:156
 #, no-c-format
 msgid ""
-"The application-scoped <literal>Generator</literal> class is responsible for "
-"creating the random number, via a producer method. It also exposes the "
-"maximum possible number via a producer method:"
+"There are a number of messages which can be sent to the user, \"Higher!\", "
+"\"Lower!\" and \"Correct!\""
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:161
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class Generator implements Serializable {\n"
-"\n"
-"   private java.util.Random random = new java.util.Random(System."
-"currentTimeMillis());\n"
-"   \n"
-"   private int maxNumber = 100;\n"
-"   \n"
-"   java.util.Random getRandom() {\n"
-"      return random;\n"
-"   }\n"
-"   \n"
-"   @Produces @Random int next() { \n"
-"      return getRandom().nextInt(maxNumber); \n"
-"   }\n"
-"   \n"
-"   @Produces @MaxNumber int getMaxNumber() {\n"
-"      return maxNumber;\n"
-"   }\n"
-"\n"
-"}]]>"
+"As the user guesses, the range of numbers they can guess gets smaller - this "
+"sentence changes to make sure they know the number range of a valid guess."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:163
 #, no-c-format
+msgid "This input field is bound to a bean property using a value expression."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
+"A validator binding is used to make sure the user doesn't accidentally input "
+"a number outside of the range in which they can guess - if the validator "
+"wasn't here, the user might use up a guess on an out of bounds number."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"And, of course, there must be a way for the user to send their guess to the "
+"server. Here we bind to an action method on the bean."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The example exists of 4 classes, the first two of which are qualifiers. "
+"First, there is the <literal>@Random</literal> qualifier, used for injecting "
+"a random number:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"There is also the <literal>@MaxNumber</literal> qualifier, used for "
+"injecting the maximum number that can be injected:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The application-scoped <literal>Generator</literal> class is responsible for "
+"creating the random number, via a producer method. It also exposes the "
+"maximum possible number via a producer method:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The <literal>Generator</literal> is application scoped, so we don't get a "
 "different random each time."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:168
 #, no-c-format
 msgid ""
 "The package declaration and imports have been excluded from these listings. "
@@ -300,7 +188,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:174
 #, no-c-format
 msgid ""
 "The final bean in the application is the session-scoped <literal>Game</"
@@ -313,7 +200,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:182
 #, no-c-format
 msgid ""
 "You'll notice that we've also added the <literal>@Named</literal> annotation "
@@ -321,123 +207,32 @@
 "bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:187
-#, no-c-format
-msgid ""
-"<![CDATA[@Named\n"
-"@SessionScoped\n"
-"public class Game implements Serializable {\n"
-"\n"
-"   private int number;\n"
-"   private int guess;\n"
-"   private int smallest;\n"
-"   private int biggest;\n"
-"   private int remainingGuesses;\n"
-"\n"
-"   @Inject @MaxNumber private int maxNumber;\n"
-"   @Inject @Random Instance<Integer> randomNumber;\n"
-"   \n"
-"   public Game() {}\n"
-"   \n"
-"   public void check() {\n"
-"      if (guess > number) {\n"
-"         biggest = guess - 1;\n"
-"      }\n"
-"      else if (guess < number) {\n"
-"         smallest = guess + 1;\n"
-"      }\n"
-"      else if (guess == number) {\n"
-"         FacesContext.getCurrentInstance().addMessage(null, new FacesMessage"
-"(\"Correct!\"));\n"
-"      }\n"
-"      remainingGuesses--;\n"
-"   }\n"
-"   \n"
-"   @PostConstruct\n"
-"   public void reset() {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = randomNumber.get();\n"
-"   }\n"
-"   \n"
-"   public void validateNumberRange(FacesContext context,  UIComponent "
-"toValidate, Object value) {\n"
-"      if (remainingGuesses <= 0) {\n"
-"         FacesMessage message = new FacesMessage(\"No guesses left!\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"         return;\n"
-"      }\n"
-"      int input = (Integer) value;\n"
-"\n"
-"      if (input < smallest || input > biggest) {\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"\n"
-"         FacesMessage message = new FacesMessage(\"Invalid guess\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"      }\n"
-"   }\n"
-"\n"
-"   public int getNumber() {\n"
-"      return number;\n"
-"   }\n"
-"   \n"
-"   public int getGuess() {\n"
-"      return guess;\n"
-"   }\n"
-"   \n"
-"   public void setGuess(int guess) {\n"
-"      this.guess = guess;\n"
-"   }\n"
-"   \n"
-"   public int getSmallest() {\n"
-"      return smallest;\n"
-"   }\n"
-"   \n"
-"   public int getBiggest() {\n"
-"      return biggest;\n"
-"   }\n"
-"   \n"
-"   public int getRemainingGuesses() {\n"
-"      return remainingGuesses;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: weldexamples.xml:190
 #, no-c-format
 msgid "The numberguess example in Apache Tomcat or Jetty"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:192
 #, no-c-format
 msgid ""
 "A couple of modifications must be made to the numberguess artifact in order "
 "to deploy it to Tomcat or Jetty. First, Weld must be deployed as a Web "
 "Application library under <literal>WEB-INF/lib</literal> since the servlet "
 "container does not provide the CDI services. For your convenience we provide "
-"a single JAR suitable for running Weld in any servlet container (including "
+"a single jar suitable for running Weld in any servlet container (including "
 "Jetty), <literal>weld-servlet.jar</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:200
 #, no-c-format
 msgid ""
-"You must also include the JARs for JSF, EL, and the common annotations "
+"You must also include the jars for JSF, EL, and the common annotations "
 "(<literal>jsr250-api.jar</literal>), all of which are provided by the Java "
 "EE platform (a Java EE application server). Are you starting to appreciate "
 "why a Java EE platform is worth using?"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:207
 #, no-c-format
 msgid ""
 "Second, we need to explicitly specify the servlet listener in <literal>web."
@@ -445,18 +240,7 @@
 "The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:213
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:215
 #, no-c-format
 msgid ""
 "When Weld boots, it places the <literal>javax.enterprise.inject.spi."
@@ -467,13 +251,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:226
 #, no-c-format
 msgid "The numberguess example for Apache Wicket"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:227
 #, no-c-format
 msgid ""
 "Weld includes a number of portable extensions for JSR-299, including an "
@@ -483,7 +265,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:234
 #, no-c-format
 msgid ""
 "You may want to review the Wicket documentation at <ulink url=\"http://"
@@ -492,7 +273,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:241
 #, no-c-format
 msgid ""
 "Wicket is another environment that relies on the Weld servlet extension. The "
@@ -503,7 +283,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:249
 #, no-c-format
 msgid ""
 "We'll also be using the Eclipse IDE in these examples. Instructions are "
@@ -513,13 +292,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:257
 #, no-c-format
 msgid "Creating the Eclipse project"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:259
 #, no-c-format
 msgid ""
 "To use the Wicket example in Eclipse, you have one of two choices. You can "
@@ -531,17 +308,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:267
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -> Import... -> Maven Projects</"
-"emphasis>. Then, browse to the location of the Wicket numberguess example. "
-"You should see that Eclipse recognizes the existence of a Maven project."
+"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
+"Projects</emphasis>. Then, browse to the location of the Wicket numberguess "
+"example. You should see that Eclipse recognizes the existence of a Maven "
+"project."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:279
 #, no-c-format
 msgid ""
 "This will create a project in your workspace called <literal>weld-wicket-"
@@ -549,7 +325,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:283
 #, no-c-format
 msgid ""
 "You'll notice after importing, the project has a build error. That's because "
@@ -557,21 +332,24 @@
 "<emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> "
 "tab in the window that appears. In the form field labeled \"Active Maven "
 "Profiles (comma separated):\", type <literal>jetty</literal>. That will "
-"enable some extra dependencies that allow the project to compile. You're now "
-"ready to develop!"
+"enable some extra dependencies that allow the project to compile. "
+"Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven "
+"compile plugin when processing resources (recommended)\". That solves an "
+"incompatiblity between the m2eclipse plugin and the Maven enforcer plugin "
+"that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:292
 #, no-c-format
 msgid ""
-"You are also advised to uncheck the box \"Skip Maven compiler when "
-"processing resources\" in the Maven properties screen because of conflicts "
-"with the Maven enforcer plugin."
+"Be sure to uncheck the box \"Skip Maven compile plugin when processing "
+"resources (recommended)\" in the Maven properties screen or else the example "
+"might not run in Eclipse because beans.xml will be missing from the "
+"classpath! See the <ulink url=\"https://issues.sonatype.org/browse/"
+"MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:298
 #, no-c-format
 msgid ""
 "If you are not using the m2eclipse plugin, you have to follow different "
@@ -580,38 +358,26 @@
 "activated, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:304
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/wicket/numberguess\n"
-"mvn -Pjetty eclipse:eclipse]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:306
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -> Import... -> General -> "
-"Existing Projects into Workspace</emphasis>, select the root directory of "
-"the numberguess example, and click Finish. This will create a project in "
+"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
+"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
+"of the numberguess example, and click Finish. This will create a project in "
 "your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:318
 #, no-c-format
 msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:325
 #, no-c-format
 msgid "Running the example from Eclipse"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:327
 #, no-c-format
 msgid ""
 "This project follows the <literal>wicket-quickstart</literal> approach of "
@@ -626,13 +392,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:338
 #, no-c-format
 msgid "Running the example from the command line in JBoss AS or Tomcat"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:340
 #, no-c-format
 msgid ""
 "This example can also be deployed from the command line in a (similar to the "
@@ -642,26 +406,12 @@
 "run:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:346
-#, no-c-format
-msgid "<![CDATA[$> ant deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:348
 #, no-c-format
 msgid "to deploy the example to JBoss AS, and:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:350
-#, no-c-format
-msgid "<![CDATA[$> ant tomcat.deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:352
 #, no-c-format
 msgid ""
 "to deploy the example to Tomcat. You can then access application at <ulink "
@@ -670,33 +420,23 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:357
 #, no-c-format
 msgid ""
 "Alternatively, you can run the application in place on an embedded Jetty "
 "container using the following Maven command:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:362
-#, no-c-format
-msgid "<![CDATA[$> mvn jetty:run -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:364
 #, no-c-format
 msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:371
 #, no-c-format
 msgid "Understanding the code"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:373
 #, no-c-format
 msgid ""
 "The code in the wicket numberguess example is very similar to the JSF-based "
@@ -710,7 +450,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:382
 #, no-c-format
 msgid ""
 "The integration of Weld with Wicket takes advantage of the same qualifier "
@@ -720,13 +459,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:388
 #, no-c-format
 msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:394
 #, no-c-format
 msgid ""
 "Each wicket application must have a <literal>WeldApplication</literal> "
@@ -734,19 +471,7 @@
 "<literal>NumberGuessApplication</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:398
-#, no-c-format
-msgid ""
-"<![CDATA[public class NumberGuessApplication extends WeldApplication {\n"
-"   @Override public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:399
 #, no-c-format
 msgid ""
 "This class specifies which page Wicket should treat as our home page, in our "
@@ -754,7 +479,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:405
 #, no-c-format
 msgid ""
 "In <literal>HomePage</literal>, we see typical Wicket code to set up page "
@@ -762,52 +486,14 @@
 "literal> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:410
-#, no-c-format
-msgid "<![CDATA[@Inject Game game;]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:412
 #, no-c-format
 msgid ""
 "The <literal>Game</literal> bean is can then be used, for example, by the "
 "code for submitting a guess:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:417
-#, no-c-format
-msgid ""
-"<![CDATA[final Component guessButton = new AjaxButton(\"GuessButton\") {\n"
-"   protected void onSubmit(AjaxRequestTarget target, Form form) {\n"
-"      if (game.check()) {\n"
-"         info(\"Correct!\");\n"
-"         setVisible(false);\n"
-"         prompt.setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == 0) {\n"
-"         info(\"Sorry, the answer was \" + game.getNumber());\n"
-"         setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getNumber() > game.getGuess()) {\n"
-"         info(\"Higher!\");\n"
-"      }\n"
-"      else if (game.getNumber() < game.getGuess()) {\n"
-"         info(\"Lower\");\n"
-"      }\n"
-"      target.addComponent(form);\n"
-"   } \n"
-"};      ]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:420
 #, no-c-format
 msgid ""
 "All injections may be serialized; actual storage of the bean is managed by "
@@ -816,7 +502,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:425
 #, no-c-format
 msgid ""
 "Wicket components allow injection, but they <emphasis>cannot</emphasis> use "
@@ -826,7 +511,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:433
 #, no-c-format
 msgid ""
 "The example uses AJAX for processing of button events, and dynamically hides "
@@ -835,7 +519,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:440
 #, no-c-format
 msgid ""
 "In order to activate Wicket for this webapp, the Wicket filter is added to "
@@ -843,29 +526,7 @@
 "<literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:445
-#, no-c-format
-msgid ""
-"<![CDATA[<filter>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-"
-"class>\n"
-"   <init-param>\n"
-"      <param-name>applicationClassName</param-name>\n"
-"      <param-value>org.jboss.weld.examples.wicket.NumberGuessApplication</"
-"param-value>\n"
-"   </init-param>\n"
-"</filter>\n"
-"\n"
-"<filter-mapping>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <url-pattern>/*</url-pattern>\n"
-"</filter-mapping>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:447
 #, no-c-format
 msgid ""
 "The servlet listener is still required, as in the Tomcat example, to "
@@ -876,26 +537,12 @@
 "descriptor to be appended to the <literal>web.xml</literal> configuration."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:455
-#, no-c-format
-msgid ""
-"<![CDATA[<web-app version=\"2.4\" ...>\n"
-"   <listener>\n"
-"      <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"   </listener>\n"
-"</web-app>]]>"
-msgstr ""
-
 #. Tag: title
-#: weldexamples.xml:464
 #, no-c-format
 msgid "The numberguess example for Java SE with Swing"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:466
 #, no-c-format
 msgid ""
 "This example shows how to use the Weld SE extension to in a Java SE based "
@@ -905,19 +552,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:473
 #, no-c-format
 msgid "To run the example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:479
 #, no-c-format
 msgid "Ensure that Maven 2 (version 2.0.10+) is installed and in your PATH"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:484
 #, no-c-format
 msgid ""
 "Ensure that the <literal>JAVA_HOME</literal> environment variable is "
@@ -925,7 +569,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:490
 #, no-c-format
 msgid ""
 "Open a command line or terminal window in the <literal>examples/se/"
@@ -933,19 +576,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:496
 #, no-c-format
 msgid "Execute the following command"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:499
-#, no-c-format
-msgid "mvn -Drun"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:503
 #, no-c-format
 msgid ""
 "Let's have a look at the significant code and configuration files that make "
@@ -953,7 +588,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:508
 #, no-c-format
 msgid ""
 "As usual, there is an empty <literal>beans.xml</literal> file in the root "
@@ -962,7 +596,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:514
 #, no-c-format
 msgid ""
 "The game's main logic is located in <literal>Game.java</literal>. Here is "
@@ -970,293 +603,170 @@
 "the web application version:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:518
+#. Tag: para
 #, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"scope\" coords=\"1\"/> <area id="
-"\"name\" coords=\"2\"/> <area id=\"messages1\" coords=\"26\"/> <area id="
-"\"validation\" coords=\"41\"/> <area id=\"reset\" coords=\"73\"/> </"
-"areaspec> <programlisting role=\"JAVA\"><![CDATA[@ApplicationScoped\n"
-"public class Game\n"
-"{\n"
-"\n"
-"   public static final int MAX_NUM_GUESSES = 10;\n"
-"\n"
-"   private Integer number;\n"
-"   private int guess = 0;\n"
-"   private int smallest = 0;\n"
-"\n"
-"   @Inject\n"
-"   @MaxNumber\n"
-"   private int maxNumber;\n"
-"\n"
-"   private int biggest;\n"
-"   private int remainingGuesses = MAX_NUM_GUESSES;\n"
-"   private boolean validNumberRange = true;\n"
-"\n"
-"   @Inject\n"
-"   Generator rndGenerator;\n"
-"\n"
-"   public Game()\n"
-"   {\n"
-"   }\n"
-"\n"
-"   ...\n"
-"\n"
-"   public boolean isValidNumberRange()\n"
-"   {\n"
-"      return validNumberRange;\n"
-"   }\n"
-"\n"
-"   public boolean isGameWon()\n"
-"   {\n"
-"      return guess == number;\n"
-"   }\n"
-"\n"
-"   public boolean isGameLost()\n"
-"   {\n"
-"      return guess != number && remainingGuesses <= 0;\n"
-"   }\n"
-"\n"
-"   public boolean check()\n"
-"   {\n"
-"      boolean result = false;\n"
-"\n"
-"      if (checkNewNumberRangeIsValid())\n"
-"      {\n"
-"         if (guess > number)\n"
-"         {\n"
-"            biggest = guess - 1;\n"
-"         }\n"
-"\n"
-"         if (guess < number)\n"
-"         {\n"
-"            smallest = guess + 1;\n"
-"         }\n"
-"\n"
-"         if (guess == number)\n"
-"         {\n"
-"            result = true;\n"
-"         }\n"
-"\n"
-"         remainingGuesses--;\n"
-"      }\n"
-"\n"
-"      return result;\n"
-"   }\n"
-"\n"
-"   private boolean checkNewNumberRangeIsValid()\n"
-"   {\n"
-"      return validNumberRange = ((guess >= smallest) && (guess <= "
-"biggest));\n"
-"   }\n"
-"\n"
-"   @PostConstruct\n"
-"   public void reset()\n"
-"   {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = rndGenerator.next();\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"scope\"> <para> The "
-"bean is application scoped rather than session scoped, since an instance of "
-"a Swing application typically represents a single 'session'. </para> </"
-"callout> <callout arearefs=\"name\"> <para> Notice that the bean is not "
-"named, since it doesn't need to be accessed via EL. </para> </callout> "
-"<callout arearefs=\"messages1\"> <para> In Java SE there is no JSF "
-"<literal>FacesContext</literal> to which messages can be added. Instead the "
-"<literal>Game</literal> class provides additional information about the "
-"state of the current game including: </para> <itemizedlist> <listitem> "
-"<para> If the game has been won or lost </para> </listitem> <listitem> "
-"<para> If the most recent guess was invalid </para> </listitem> </"
-"itemizedlist> <para> This allows the Swing UI to query the state of the "
-"game, which it does indirectly via a class called <literal>MessageGenerator</"
-"literal>, in order to determine the appropriate messages to display to the "
-"user during the game. </para> </callout> <callout arearefs=\"validation\"> "
-"<para> Since there is no dedicated validation phase, validation of user "
-"input is performed during the <literal>check()</literal> method. </para> </"
-"callout> <callout arearefs=\"reset\"> <para> The <literal>reset()</literal> "
-"method makes a call to the injected <literal>rndGenerator</literal> in order "
-"to get the random number at the start of each game. Note that it can't use "
-"<literal>Instance.get()</literal> like the JSF example does because there "
-"will not be any active contexts like there are during a JSF request. </para> "
-"</callout> </calloutlist> </programlistingco> <para> The "
-"<literal>MessageGenerator</literal> class depends on the current instance of "
-"<literal>Game</literal> and queries its state in order to determine the "
-"appropriate messages to provide as the prompt for the user's next guess and "
-"the response to the previous guess. The code for <literal>MessageGenerator</"
-"literal> is as follows: </para> <programlistingco> <areaspec> <area id=\"game"
-"\" coords=\"3\"/> <area id=\"challenge\" coords=\"6\"/> <area id=\"result\" "
-"coords=\"17\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA[public "
-"class MessageGenerator\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   public String getChallengeMessage()\n"
-"   {\n"
-"      StringBuilder challengeMsg = new StringBuilder(\"I'm thinking of a "
-"number between \");\n"
-"      challengeMsg.append(game.getSmallest());\n"
-"      challengeMsg.append(\" and \");\n"
-"      challengeMsg.append(game.getBiggest());\n"
-"      challengeMsg.append(\". Can you guess what it is?\");\n"
-"\n"
-"      return challengeMsg.toString();\n"
-"   }\n"
-"\n"
-"   public String getResultMessage()\n"
-"   {\n"
-"      if (game.isGameWon())\n"
-"      {\n"
-"         return \"You guessed it! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (game.isGameLost())\n"
-"      {\n"
-"         return \"You are fail! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (!game.isValidNumberRange())\n"
-"      {\n"
-"         return \"Invalid number range!\";\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == Game.MAX_NUM_GUESSES)\n"
-"      {\n"
-"         return \"What is your first guess?\";\n"
-"      }\n"
-"      else\n"
-"      {\n"
-"         String direction = null;\n"
-"\n"
-"         if (game.getGuess() < game.getNumber())\n"
-"         {\n"
-"            direction = \"Higher\";\n"
-"         }\n"
-"         else\n"
-"         {\n"
-"            direction = \"Lower\";\n"
-"         }\n"
-"\n"
-"         return direction + \"! You have \" + game.getRemainingGuesses() + "
-"\" guesses left.\";\n"
-"      }\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"game\"> <para> The "
-"instance of <literal>Game</literal> for the application is injected here. </"
-"para> </callout> <callout arearefs=\"challenge\"> <para> The <literal>Game</"
-"literal>'s state is interrogated to determine the appropriate challenge "
-"message ... </para> </callout> <callout arearefs=\"result\"> <para> ... and "
-"again to determine whether to congratulate, console or encourage the user to "
-"continue. </para> </callout> </calloutlist> </programlistingco> <para> "
+"The bean is application scoped rather than session scoped, since an instance "
+"of a Swing application typically represents a single 'session'."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Notice that the bean is not named, since it doesn't need to be accessed via "
+"EL."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"In Java SE there is no JSF <literal>FacesContext</literal> to which messages "
+"can be added. Instead the <literal>Game</literal> class provides additional "
+"information about the state of the current game including:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the game has been won or lost"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the most recent guess was invalid"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This allows the Swing UI to query the state of the game, which it does "
+"indirectly via a class called <literal>MessageGenerator</literal>, in order "
+"to determine the appropriate messages to display to the user during the game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Since there is no dedicated validation phase, validation of user input is "
+"performed during the <literal>check()</literal> method."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>reset()</literal> method makes a call to the injected "
+"<literal>rndGenerator</literal> in order to get the random number at the "
+"start of each game. Note that it can't use <literal>Instance.get()</literal> "
+"like the JSF example does because there will not be any active contexts like "
+"there are during a JSF request."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>MessageGenerator</literal> class depends on the current "
+"instance of <literal>Game</literal> and queries its state in order to "
+"determine the appropriate messages to provide as the prompt for the user's "
+"next guess and the response to the previous guess. The code for "
+"<literal>MessageGenerator</literal> is as follows:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The instance of <literal>Game</literal> for the application is injected here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>Game</literal>'s state is interrogated to determine the "
+"appropriate challenge message ..."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"... and again to determine whether to congratulate, console or encourage the "
+"user to continue."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "Finally we come to the <literal>NumberGuessFrame</literal> class which "
-"provides the Swing front end to our guessing game. </para> "
-"<programlistingco> <areaspec> <area id=\"gameIn\" coords=\"3\"/> <area id="
-"\"messagesIn\" coords=\"6\"/> <area id=\"start\" coords=\"9\"/> <area id="
-"\"init\" coords=\"21\"/> <area id=\"guess1\" coords=\"38\"/> <area id="
-"\"replay\" coords=\"48\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA"
-"[public class NumberGuessFrame extends javax.swing.JFrame\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   @Inject\n"
-"   private MessageGenerator msgGenerator;\n"
-"\n"
-"   public void start(@Observes ContainerInitialized event)\n"
-"   {\n"
-"      java.awt.EventQueue.invokeLater(new Runnable()\n"
-"      {\n"
-"         public void run()\n"
-"         {\n"
-"            initComponents();\n"
-"            setVisible(true);\n"
-"         }\n"
-"      });\n"
-"   }\n"
-"\n"
-"   private void initComponents()\n"
-"   {\n"
-"\n"
-"      buttonPanel = new javax.swing.JPanel();\n"
-"      mainMsgPanel = new javax.swing.JPanel();\n"
-"      mainLabel = new javax.swing.JLabel();\n"
-"      messageLabel = new javax.swing.JLabel();\n"
-"      guessText = new javax.swing.JTextField();\n"
-"      ...\n"
-"      mainLabel.setText(msgGenerator.getChallengeMessage());\n"
-"      mainMsgPanel.add(mainLabel);\n"
-"\n"
-"      messageLabel.setText(msgGenerator.getResultMessage());\n"
-"      mainMsgPanel.add(messageLabel);\n"
-"      ...\n"
-"   }\n"
-"\n"
-"   private void guessButtonActionPerformed( java.awt.event.ActionEvent "
-"evt )\n"
-"   {\n"
-"      int guess =  Integer.parseInt(guessText.getText());\n"
-"      game.setGuess( guess );\n"
-"      game.check();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void replayBtnActionPerformed(java.awt.event.ActionEvent evt)\n"
-"   {\n"
-"      game.reset();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void refreshUI() {\n"
-"      mainLabel.setText( msgGenerator.getChallengeMessage() );\n"
-"      messageLabel.setText( msgGenerator.getResultMessage() );\n"
-"      guessText.setText( \"\" );\n"
-"      guessesLeftBar.setValue( game.getRemainingGuesses() );\n"
-"      guessText.requestFocus();\n"
-"   }\n"
-"\n"
-"   // swing components\n"
-"   private javax.swing.JPanel borderPanel;\n"
-"   ...\n"
-"   private javax.swing.JButton replayBtn;\n"
-"\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"gameIn\"> <para> The "
-"injected instance of the game (logic and state). </para> </callout> <callout "
-"arearefs=\"messagesIn\"> <para> The injected message generator for UI "
-"messages. </para> </callout> <callout arearefs=\"start\"> <para> This "
-"application is started in the prescribed Weld SE way, by observing the "
-"<literal>ContainerInitialized</literal> event. </para> </callout> <callout "
-"arearefs=\"init\"> <para> This method initializes all of the Swing "
-"components. Note the use of the <literal>msgGenerator</literal> here. </"
-"para> </callout> <callout arearefs=\"guess1\"> <para> "
+"provides the Swing front end to our guessing game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected instance of the game (logic and state)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected message generator for UI messages."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This application is started in the prescribed Weld SE way, by observing the "
+"<literal>ContainerInitialized</literal> event."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This method initializes all of the Swing components. Note the use of the "
+"<literal>msgGenerator</literal> here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
-"button is clicked, and it does the following: </para> <itemizedlist> "
-"<listitem> <para> Gets the guess entered by the user and sets it as the "
-"current guess in the <literal>Game</literal> </para> </listitem> <listitem> "
-"<para> Calls <literal>game.check()</literal> to validate and perform one "
-"'turn' of the game </para> </listitem> <listitem> <para> Calls "
-"<literal>refreshUI</literal>. If there were validation errors with the "
+"button is clicked, and it does the following:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Gets the guess entered by the user and sets it as the current guess in the "
+"<literal>Game</literal>"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
+"the game"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>refreshUI</literal>. If there were validation errors with the "
 "input, this will have been captured during <literal>game.check()</literal> "
 "and as such will be reflected in the messages returned by "
 "<literal>MessageGenerator</literal> and subsequently presented to the user. "
 "If there are no validation errors then the user will be told to guess again "
 "(higher or lower) or that the game has ended either in a win (correct guess) "
-"or a loss (ran out of guesses). </para> </listitem> </itemizedlist> </"
-"callout> <callout arearefs=\"replay\"> <para> "
+"or a loss (ran out of guesses)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>replayBtnActionPerformed</literal> simply calls <literal>game.reset"
-"()</literal> to start a new game and refreshes the messages in the UI. </"
-"para> </callout> </calloutlist> </programlistingco>"
+"()</literal> to start a new game and refreshes the messages in the UI."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:716
 #, no-c-format
 msgid "The translator example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:718
 #, no-c-format
 msgid ""
 "The translator example will take any sentences you enter, and translate them "
@@ -1265,52 +775,29 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:723
 #, no-c-format
 msgid ""
-"The translator example is built as an EAR and contains EJBs. As a result, "
+"The translator example is built as an ear and contains EJBs. As a result, "
 "it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:729
 #, no-c-format
 msgid ""
-"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a WAR, which "
+"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a war, which "
 "will make this structure much simpler! Still, there are other advantages of "
-"using an EAR."
+"using an ear."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:735
 #, no-c-format
 msgid ""
-"First, let's take a look at the EAR aggregator, which is located in the "
+"First, let's take a look at the ear aggregator, which is located in the "
 "example's <literal>ear</literal> directory. Maven automatically generates "
 "the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:740
-#, no-c-format
-msgid ""
-"<![CDATA[<plugin>\n"
-"   <groupId>org.apache.maven.plugins</groupId>\n"
-"   <artifactId>maven-ear-plugin</artifactId>\n"
-"   <configuration>\n"
-"      <modules>\n"
-"         <webModule>\n"
-"            <groupId>org.jboss.weld.examples.jsf.translator</groupId>\n"
-"            <artifactId>weld-jsf-translator-war</artifactId>\n"
-"            <contextRoot>/weld-translator</contextRoot>\n"
-"         </webModule>\n"
-"      </modules>\n"
-"   </configuration>\n"
-"</plugin>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:742
 #, no-c-format
 msgid ""
 "This configuration overrides the web context path, resulting in this "
@@ -1319,44 +806,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:748
 #, no-c-format
 msgid ""
 "If you weren't using Maven to generate these files, you would need "
 "<literal>META-INF/application.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:753
-#, no-c-format
-msgid ""
-"<![CDATA[<application version=\"5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/application_5.xsd\">\n"
-"\n"
-"  <display-name>weld-jsf-translator-ear</display-name>\n"
-"  <description>The Weld JSF translator example (EAR)</description>\n"
-"  \n"
-"  <module>\n"
-"    <web>\n"
-"      <web-uri>weld-translator.war</web-uri>\n"
-"      <context-root>/weld-translator</context-root>\n"
-"    </web>\n"
-"  </module>\n"
-"  <module>\n"
-"    <ejb>weld-translator.jar</ejb>\n"
-"  </module>\n"
-"</application>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:756
 #, no-c-format
 msgid ""
-"Next, lets look at the WAR, which is located in the example's <literal>war</"
+"Next, lets look at the war, which is located in the example's <literal>war</"
 "literal> directory. Just as in the numberguess example, we have a "
 "<literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</"
 "literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/"
@@ -1364,7 +823,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:762
 #, no-c-format
 msgid ""
 "More interesting is the JSF view used to translate text. Just as in the "
@@ -1372,41 +830,7 @@
 "here for brevity):"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:767
-#, no-c-format
-msgid ""
-"<![CDATA[<h:form id=\"translator\">\n"
-"\n"
-"   <table>\n"
-"      <tr align=\"center\" style=\"font-weight: bold\">\n"
-"         <td>\n"
-"            Your text\n"
-"         </td>\n"
-"         <td>\n"
-"            Translation\n"
-"         </td>\n"
-"      </tr>\n"
-"      <tr>\n"
-"         <td>\n"
-"            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
-"required=\"true\" rows=\"5\" cols=\"80\"/>\n"
-"         </td>\n"
-"         <td>\n"
-"            <h:outputText value=\"#{translator.translatedText}\"/>\n"
-"         </td>\n"
-"      </tr>\n"
-"   </table>\n"
-"   <div>\n"
-"      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
-"{translator.translate}\"/>\n"
-"   </div>\n"
-"   \n"
-"</h:form>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:769
 #, no-c-format
 msgid ""
 "The user can enter some text in the left-hand textarea, and hit the "
@@ -1414,7 +838,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:774
 #, no-c-format
 msgid ""
 "Finally, let's look at the EJB module, which is located in the example's "
@@ -1424,7 +847,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:780
 #, no-c-format
 msgid ""
 "We've saved the most interesting bit to last, the code! The project has two "
@@ -1436,7 +858,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:787
 #, no-c-format
 msgid ""
 "Both <literal>SentenceParser</literal> and <literal>TextTranslator</literal> "
@@ -1444,33 +865,7 @@
 "injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:792
-#, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator implements Serializable { \n"
-"\n"
-"   private SentenceParser sentenceParser; \n"
-"\n"
-"   @EJB private Translator translator; \n"
-"   \n"
-"   @Inject public TextTranslator(SentenceParser sentenceParser) { \n"
-"      this.sentenceParser = sentenceParser; \n"
-"   }\n"
-"   \n"
-"   public String translate(String text) { \n"
-"      StringBuilder sb = new StringBuilder(); \n"
-"      for (String sentence: sentenceParser.parse(text)) { \n"
-"         sb.append(translator.translate(sentence)).append(\". \"); \n"
-"      } \n"
-"      return sb.toString().trim(); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:794
 #, no-c-format
 msgid ""
 "<literal>TextTranslator</literal> uses the simple bean (really just a plain "
@@ -1481,22 +876,7 @@
 "convincing enough to anyone who doesn't understand Latin!"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:802
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator { \n"
-"\n"
-"   public String translate(String sentence) { \n"
-"      return \"Lorem ipsum dolor sit amet\"; \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:804
 #, no-c-format
 msgid ""
 "Finally, there is UI orientated controller. This is a request scoped, named, "
@@ -1505,44 +885,7 @@
 "and setters for all the fields on the page."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:810
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"@RequestScoped\n"
-"@Named(\"translator\")\n"
-"public class TranslatorControllerBean implements TranslatorController {\n"
-"\n"
-"   @Inject private TextTranslator translator;\n"
-"   \n"
-"   private String inputText;\n"
-"   \n"
-"   private String translatedText;\n"
-"   \n"
-"   public void translate() {\n"
-"      translatedText = translator.translate(inputText);\n"
-"   }\n"
-"   \n"
-"   public String getText() {\n"
-"      return inputText;\n"
-"   }\n"
-"   \n"
-"   public void setText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"   \n"
-"   public String getTranslatedText() {\n"
-"      return translatedText;\n"
-"   }\n"
-"   \n"
-"   @Remove public void remove() {}\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:814
 #, no-c-format
 msgid ""
 "That concludes our short tour of the Weld starter examples. For more "

Modified: doc/trunk/reference/ko-KR/xml.po
===================================================================
--- doc/trunk/reference/ko-KR/xml.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/ko-KR/xml.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-23 11:16+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -25,13 +25,11 @@
 "\n"
 
 #. Tag: title
-#: xml.xml:5
 #, fuzzy, no-c-format
 msgid "Defining beans using XML"
 msgstr "XML을 사용하여 Web Beans 정의 "
 
 #. Tag: para
-#: xml.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "So far, we've seen plenty of examples of beans declared using annotations. "
@@ -43,19 +41,16 @@
 "있습니다: "
 
 #. Tag: para
-#: xml.xml:14
 #, no-c-format
 msgid "when the implementation class comes from some preexisting library, or"
 msgstr "구현 클래스가 일부 기존 라이브러에서 비롯되었을 경우, "
 
 #. Tag: para
-#: xml.xml:19
 #, fuzzy, no-c-format
 msgid "when there should be multiple beans with the same implementation class."
 msgstr "동일한 구현 클래스를 갖는 다수의 Web Beans이 있을 경우 "
 
 #. Tag: para
-#: xml.xml:25
 #, no-c-format
 msgid ""
 "One way to address these problems is to write a producer method. Weld offers "
@@ -65,7 +60,6 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:31
 #, fuzzy, no-c-format
 msgid ""
 "Many frameworks use XML to provide metadata relating to Java classes. "
@@ -81,7 +75,6 @@
 "멤버 이름을 사용하게 합니다. "
 
 #. Tag: para
-#: xml.xml:38
 #, no-c-format
 msgid ""
 "The advantage of this approach is that you can write an XML schema that "
@@ -96,13 +89,11 @@
 "생성 단계를 거치지 않고 동일한 검증을 실행할 수 있습니다.  "
 
 #. Tag: title
-#: xml.xml:46
 #, fuzzy, no-c-format
 msgid "Declaring beans"
 msgstr "Web Bean 클래스 명시 "
 
 #. Tag: para
-#: xml.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "For each Java package, Weld defines a corresponding XML namespace. The "
@@ -116,7 +107,6 @@
 "는 <literal>urn:java:com.mydomain.myapp</literal>입니다. "
 
 #. Tag: para
-#: xml.xml:54
 #, no-c-format
 msgid ""
 "Java types belonging to a package are referred to using an XML element in "
@@ -131,7 +121,6 @@
 "을 경우, 멤버는 요소의 속성에 의해 지정됩니다.  "
 
 #. Tag: para
-#: xml.xml:61
 #, no-c-format
 msgid ""
 "For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
@@ -140,24 +129,7 @@
 "예를 들어, 다음의 XML 부분에 있는 <literal>&lt;util:Date/&gt;</literal> 요소"
 "는 <literal>java.util.Date</literal> 클래스를 참조합니다:  "
 
-#. Tag: programlisting
-#: xml.xml:66
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:util=\"urn:java:java.util\">\n"
-"   <util:Date/>\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
-"          xmlns:util=\"urn:java:java.util\">\n"
-"\n"
-"    <util:Date/>\n"
-"\n"
-"</WebBeans>]]>"
-
 #. Tag: para
-#: xml.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "And this is all the code we need to declare that <literal>Date</literal> is "
@@ -168,20 +140,12 @@
 "<literal>Date</literal>의 인스턴스는 기타 다른 Web Bean에 의해 삽입될 수 있습"
 "니다:   "
 
-#. Tag: programlisting
-#: xml.xml:73
-#, fuzzy, no-c-format
-msgid "<![CDATA[private @Inject Date date;]]>"
-msgstr "<![CDATA[@Current Date date]]>"
-
 #. Tag: title
-#: xml.xml:78
 #, fuzzy, no-c-format
 msgid "Declaring bean metadata"
 msgstr "Web Bean 메타데이터 명시 "
 
 #. Tag: para
-#: xml.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "We can declare the scope, deployment type and interceptor binding types "
@@ -190,66 +154,12 @@
 "Web Bean 명시의 직접적인 자식 요소를 사용하여 범위, 배치 유형, 인터셉터 바인"
 "딩 유형을 명시할 수 있습니다:     "
 
-#. Tag: programlisting
-#: xml.xml:85
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"   <SessionScoped/>\n"
-"   <myfwk:Transactional requiresNew=\"true\"/>\n"
-"   <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
-msgstr ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"    <SessionScoped/>\n"
-"    <myfwk:Transactional requiresNew=\"true\"/>\n"
-"    <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
-
 #. Tag: para
-#: xml.xml:87
 #, fuzzy, no-c-format
 msgid "We use exactly the same approach to specify names and qualifiers:"
 msgstr "이름 및 바인딩 유형을 지정하기 위해 동일한 방법을 사용합니다:  "
 
-#. Tag: programlisting
-#: xml.xml:89
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<util:Date>\n"
-"   <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <SessionScoped/>\n"
-"   <myapp:Login/>\n"
-"   <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:SystemStart/>\n"
-"   <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
-msgstr ""
-"<![CDATA[<util:Date>\n"
-"    <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"    <SessionScoped/>\n"
-"    <myapp:Login/>\n"
-"    <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"    <ApplicationScoped/>\n"
-"    <myapp:SystemStart/>\n"
-"    <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
-
 #. Tag: para
-#: xml.xml:91
 #, fuzzy, no-c-format
 msgid ""
 "Where <literal>@Login</literal> and <literal>@SystemStart</literal> are "
@@ -258,40 +168,12 @@
 "여기서 <literal>@Login</literal> 및 <literal>@SystemStart</literal>는 바인딩 "
 "어노테이션 유형입니다.  "
 
-#. Tag: programlisting
-#: xml.xml:95
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[private @Inject Date currentTime;\n"
-"private @Login Date loginTime;\n"
-"private @SystemStart Date systemStartTime;]]>"
-msgstr ""
-"<![CDATA[@Current Date currentTime;\n"
-"@Login Date loginTime;\n"
-"@SystemStart Date systemStartTime;]]>"
-
 #. Tag: para
-#: xml.xml:97
 #, fuzzy, no-c-format
 msgid "As usual, a bean may support multiple qualifier types:"
 msgstr "일반적으로 Web Bean은 여러 바인딩 유형을 지원할 수 있습니다:  "
 
-#. Tag: programlisting
-#: xml.xml:99
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"   <myapp:PayByCheque/>\n"
-"   <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
-msgstr ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"    <myapp:PayByCheque/>\n"
-"    <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
-
 #. Tag: para
-#: xml.xml:101
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors and decorators are beans as well, so they may be declared just "
@@ -300,72 +182,27 @@
 "인터셉터 및 데코레이터는 심플 Web Beans이므로, 기타 다른 심플 Web Bean같이 나"
 "타낼 수 있습니다:    "
 
-#. Tag: programlisting
-#: xml.xml:105
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"   <Interceptor/>\n"
-"   <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
-msgstr ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"    <Interceptor/>\n"
-"    <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
-
 #. Tag: title
-#: xml.xml:110
 #, fuzzy, no-c-format
 msgid "Declaring bean members"
 msgstr "Web Bean 멤버 명시 "
 
 #. Tag: para
-#: xml.xml:112
 #, no-c-format
 msgid "TODO!"
 msgstr "처리해야 할 사항! "
 
 #. Tag: title
-#: xml.xml:119
 #, fuzzy, no-c-format
 msgid "Declaring inline beans"
 msgstr "인라인 Web Beans 명시 "
 
 #. Tag: para
-#: xml.xml:121
 #, fuzzy, no-c-format
 msgid "Weld lets us define a bean at an injection point. For example:"
 msgstr "Web Beans는 삽입 지점에서 Web Bean을 지정할 수 있게 합니다. 예: "
 
-#. Tag: programlisting
-#: xml.xml:123
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:System>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:admin>\n"
-"      <myapp:Name>\n"
-"         <myapp:firstname>Gavin</myapp:firstname>\n"
-"         <myapp:lastname>King</myapp:lastname>\n"
-"         <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"      </myapp:Name>\n"
-"   </myapp:admin>\n"
-"</myapp:System>]]>"
-msgstr ""
-"<![CDATA[<myapp:System>\n"
-"    <ApplicationScoped/>\n"
-"    <myapp:admin>\n"
-"        <myapp:Name>\n"
-"            <myapp:firstname>Gavin</myapp:firstname>\n"
-"            <myapp:lastname>King</myapp:lastname>\n"
-"            <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"        </myapp:Name>\n"
-"    </myapp:admin>\n"
-"</myapp:System>]]>"
-
 #. Tag: para
-#: xml.xml:125
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
@@ -380,7 +217,6 @@
 "로 명시된 특정 삽입 지점에만 삽입할 수 있습니다.     "
 
 #. Tag: para
-#: xml.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "This simple but powerful feature allows the Weld XML format to be used to "
@@ -392,13 +228,11 @@
 "접한 솔루션입니다! "
 
 #. Tag: title
-#: xml.xml:139
 #, no-c-format
 msgid "Using a schema"
 msgstr "스키마 사용 "
 
 #. Tag: para
-#: xml.xml:141
 #, fuzzy, no-c-format
 msgid ""
 "If we want our XML document format to be authored by people who aren't Java "
@@ -409,39 +243,7 @@
 "서 형식을 원하실 경우, 스키마를 제공해야 합니다. 스키마를 사용 또는 작성에 관"
 "해 Web Beans에 특정한 사항이 없습니다.  "
 
-#. Tag: programlisting
-#: xml.xml:147
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/beans-"
-"1.0.xsd\n"
-"   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"   <myapp:System>\n"
-"      ...\n"
-"   </myapp:System>\n"
-"\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
-"          xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"          xsi:schemaLocation=\"urn:java:javax.webbeans http://java.sun.com/"
-"jee/web-beans-1.0.xsd\n"
-"                              urn:java:com.mydomain.myapp http://mydomain."
-"com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"    <myapp:System>\n"
-"        ...\n"
-"    </myapp:System>\n"
-"\n"
-"</WebBeans>]]>"
-
 #. Tag: para
-#: xml.xml:149
 #, fuzzy, no-c-format
 msgid ""
 "Writing an XML schema is quite tedious. Therefore, the Weld project will "
@@ -451,6 +253,159 @@
 "XML 스키마 작성은 다소 장황합니다. 따라서 Web Beans RI 프로젝트는 컴파일된 자"
 "바 코드에서 XML 스키마를 자동으로 생성하는 도구를 제공하게 됩니다. "
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:util=\"urn:java:java.util\">\n"
+#~ "   <util:Date/>\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
+#~ "          xmlns:util=\"urn:java:java.util\">\n"
+#~ "\n"
+#~ "    <util:Date/>\n"
+#~ "\n"
+#~ "</WebBeans>]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[private @Inject Date date;]]>"
+#~ msgstr "<![CDATA[@Current Date date]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "   <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "    <SessionScoped/>\n"
+#~ "    <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "    <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "   <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myapp:Login/>\n"
+#~ "   <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:SystemStart/>\n"
+#~ "   <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "    <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "    <SessionScoped/>\n"
+#~ "    <myapp:Login/>\n"
+#~ "    <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "    <ApplicationScoped/>\n"
+#~ "    <myapp:SystemStart/>\n"
+#~ "    <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[private @Inject Date currentTime;\n"
+#~ "private @Login Date loginTime;\n"
+#~ "private @SystemStart Date systemStartTime;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Current Date currentTime;\n"
+#~ "@Login Date loginTime;\n"
+#~ "@SystemStart Date systemStartTime;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "   <myapp:PayByCheque/>\n"
+#~ "   <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "    <myapp:PayByCheque/>\n"
+#~ "    <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "   <Interceptor/>\n"
+#~ "   <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "    <Interceptor/>\n"
+#~ "    <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:admin>\n"
+#~ "      <myapp:Name>\n"
+#~ "         <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "         <myapp:lastname>King</myapp:lastname>\n"
+#~ "         <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "      </myapp:Name>\n"
+#~ "   </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "    <ApplicationScoped/>\n"
+#~ "    <myapp:admin>\n"
+#~ "        <myapp:Name>\n"
+#~ "            <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "            <myapp:lastname>King</myapp:lastname>\n"
+#~ "            <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "        </myapp:Name>\n"
+#~ "    </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/"
+#~ "beans-1.0.xsd\n"
+#~ "   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "   <myapp:System>\n"
+#~ "      ...\n"
+#~ "   </myapp:System>\n"
+#~ "\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
+#~ "          xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "          xsi:schemaLocation=\"urn:java:javax.webbeans http://java.sun."
+#~ "com/jee/web-beans-1.0.xsd\n"
+#~ "                              urn:java:com.mydomain.myapp http://mydomain."
+#~ "com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "    <myapp:System>\n"
+#~ "        ...\n"
+#~ "    </myapp:System>\n"
+#~ "\n"
+#~ "</WebBeans>]]>"
+
 #~ msgid "In either of these cases, Web Beans gives us two options:"
 #~ msgstr "이러한 경우, Web Beans는 두 가지 옵션을 제공합니다: "
 

Modified: doc/trunk/reference/pot/Author_Group.pot
===================================================================
--- doc/trunk/reference/pot/Author_Group.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/Author_Group.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,117 +1,99 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"PO-Revision-Date: 2010-03-02T13:07:17\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Tag: author
-#: Author_Group.xml:5
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Gavin</firstname> <surname>King</surname>"
+msgid "Gavin"
 msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:8
 #, no-c-format
 msgid "JSR-299: Contexts and Dependency Injection Lead"
 msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:14
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
+msgid "Pete"
 msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:17
 #, no-c-format
 msgid "Weld (JSR-299 RI) Lead"
 msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:24
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
+msgid "Dan"
 msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:31
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>David</firstname> <surname>Allen</surname>"
+msgid "David"
 msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:35
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+msgid "Nicola"
 msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:38 Author_Group.xml:67
 #, no-c-format
 msgid "Italian Translation"
 msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:40
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+msgid "Gladys"
 msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:43
 #, no-c-format
 msgid "Spanish Translation"
 msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:48
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+msgid "Eun-Ju"
 msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:51
 #, no-c-format
 msgid "Korean Translation"
 msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:56
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
+msgid "Terry"
 msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:59
 #, no-c-format
 msgid "Traditional Chinese Translation"
 msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:64
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+msgid "Francesco"
 msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:69
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
+msgid "Sean"
 msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:72
 #, no-c-format
 msgid "Simplified Chinese Translation"
 msgstr ""
+

Modified: doc/trunk/reference/pot/Book_Info.pot
===================================================================
--- doc/trunk/reference/pot/Book_Info.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/Book_Info.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,29 +1,24 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"PO-Revision-Date: 2010-03-02T13:07:17\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: Book_Info.xml:4
 #, no-c-format
 msgid "Weld - JSR-299 Reference Implementation"
 msgstr ""
 
 #. Tag: subtitle
-#: Book_Info.xml:5
 #, no-c-format
-msgid ""
-"JSR-299: The new Java standard for dependency injection and contextual "
-"lifecycle management"
+msgid "JSR-299: The new Java standard for dependency injection and contextual lifecycle management"
 msgstr ""
+

Modified: doc/trunk/reference/pot/beans.pot
===================================================================
--- doc/trunk/reference/pot/beans.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/beans.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,1647 +1,629 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"PO-Revision-Date: 2010-03-02T13:07:17\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: beans.xml:4
 #, no-c-format
 msgid "More about beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:6
 #, no-c-format
-msgid ""
-"A bean is usually an application class that contains business logic. It may "
-"be called directly from Java code, or it may be invoked via the Unified EL. "
-"A bean may access transactional resources. Dependencies between beans are "
-"managed automatically by the container. Most beans are <emphasis>stateful</"
-"emphasis> and <emphasis>contextual</emphasis>. The lifecycle of a bean is "
-"always managed by the container."
+msgid "A bean is usually an application class that contains business logic. It may be called directly from Java code, or it may be invoked via the Unified EL. A bean may access transactional resources. Dependencies between beans are managed automatically by the container. Most beans are <emphasis>stateful</emphasis> and <emphasis>contextual</emphasis>. The lifecycle of a bean is always managed by the container."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:13
 #, no-c-format
-msgid ""
-"Let's back up a second. What does it really mean to be <emphasis>contextual</"
-"emphasis>? Since beans may be stateful, it matters <emphasis>which</"
-"emphasis> bean instance I have. Unlike a stateless component model (for "
-"example, stateless session beans) or a singleton component model (such as "
-"servlets, or singleton beans), different clients of a bean see the bean in "
-"different states. The client-visible state depends upon which instance of "
-"the bean the client has a reference to."
+msgid "Let's back up a second. What does it really mean to be <emphasis>contextual</emphasis>? Since beans may be stateful, it matters <emphasis>which</emphasis> bean instance I have. Unlike a stateless component model (for example, stateless session beans) or a singleton component model (such as servlets, or singleton beans), different clients of a bean see the bean in different states. The client-visible state depends upon which instance of the bean the client has a reference to."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:21
 #, no-c-format
-msgid ""
-"However, like a stateless or singleton model, but <emphasis>unlike</"
-"emphasis> stateful session beans, the client does not control the lifecycle "
-"of the instance by explicitly creating and destroying it. Instead, the "
-"<emphasis>scope</emphasis> of the bean determines:"
+msgid "However, like a stateless or singleton model, but <emphasis>unlike</emphasis> stateful session beans, the client does not control the lifecycle of the instance by explicitly creating and destroying it. Instead, the <emphasis>scope</emphasis> of the bean determines:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:29
 #, no-c-format
 msgid "the lifecycle of each instance of the bean and"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:32
 #, no-c-format
 msgid "which clients share a reference to a particular instance of the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:36
 #, no-c-format
-msgid ""
-"For a given thread in a CDI application, there may be an <emphasis>active "
-"context</emphasis> associated with the scope of the bean. This context may "
-"be unique to the thread (for example, if the bean is request scoped), or it "
-"may be shared with certain other threads (for example, if the bean is "
-"session scoped) or even all other threads (if it is application scoped)."
+msgid "For a given thread in a CDI application, there may be an <emphasis>active context</emphasis> associated with the scope of the bean. This context may be unique to the thread (for example, if the bean is request scoped), or it may be shared with certain other threads (for example, if the bean is session scoped) or even all other threads (if it is application scoped)."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:43
 #, no-c-format
-msgid ""
-"Clients (for example, other beans) executing in the same context will see "
-"the same instance of the bean. But clients in a different context may see a "
-"different instance (depending on the relationship between the contexts)."
+msgid "Clients (for example, other beans) executing in the same context will see the same instance of the bean. But clients in a different context may see a different instance (depending on the relationship between the contexts)."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:49
 #, no-c-format
-msgid ""
-"One great advantage of the contextual model is that it allows stateful beans "
-"to be treated like services! The client need not concern itself with "
-"managing the lifecycle of the bean it's using, <emphasis>nor does it even "
-"need to know what that lifecycle is.</emphasis> Beans interact by passing "
-"messages, and the bean implementations define the lifecycle of their own "
-"state. The beans are loosely coupled because:"
+msgid "One great advantage of the contextual model is that it allows stateful beans to be treated like services! The client need not concern itself with managing the lifecycle of the bean it's using, <emphasis>nor does it even need to know what that lifecycle is.</emphasis> Beans interact by passing messages, and the bean implementations define the lifecycle of their own state. The beans are loosely coupled because:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:58
 #, no-c-format
 msgid "they interact via well-defined public APIs"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:61
 #, no-c-format
 msgid "their lifecycles are completely decoupled"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:65
 #, no-c-format
-msgid ""
-"We can replace one bean with another different bean that implements the same "
-"interface and has a different lifecycle (a different scope) without "
-"affecting the other bean implementation. In fact, CDI defines a simple "
-"facility for overriding bean implementations at deployment time, as we will "
-"see in <xref linkend=\"alternatives\"/>."
+msgid "We can replace one bean with another different bean that implements the same interface and has a different lifecycle (a different scope) without affecting the other bean implementation. In fact, CDI defines a simple facility for overriding bean implementations at deployment time, as we will see in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:71
 #, no-c-format
-msgid ""
-"Note that not all clients of a bean are beans themselves. Other objects such "
-"as servlets or message-driven beans&#8212;which are by nature not "
-"injectable, contextual objects&#8212;may also obtain references to beans by "
-"injection."
+msgid "Note that not all clients of a bean are beans themselves. Other objects such as servlets or message-driven beans—which are by nature not injectable, contextual objects—may also obtain references to beans by injection."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:78
 #, no-c-format
 msgid "The anatomy of a bean"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:80
 #, no-c-format
-msgid ""
-"Enough hand-waving. More formally, the anatomy of a bean, according to the "
-"spec:"
+msgid "Enough hand-waving. More formally, the anatomy of a bean, according to the spec:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:84
 #, no-c-format
 msgid "A bean comprises the following attributes:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:87
 #, no-c-format
 msgid "A (nonempty) set of bean types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:88
 #, no-c-format
 msgid "A (nonempty) set of qualifiers"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:89
 #, no-c-format
 msgid "A scope"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:90
 #, no-c-format
 msgid "Optionally, a bean EL name"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:91
 #, no-c-format
 msgid "A set of interceptor bindings"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:92
 #, no-c-format
 msgid "A bean implementation"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:95
 #, no-c-format
 msgid "Furthermore, a bean may or may not be an alternative."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:99
 #, no-c-format
 msgid "Let's see what all this new terminology means."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:102
 #, no-c-format
 msgid "Bean types, qualifiers and dependency injection"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:104
 #, no-c-format
-msgid ""
-"Beans usually acquire references to other beans via dependency injection. "
-"Any injected attribute specifies a \"contract\" that must be satisfied by "
-"the bean to be injected. The contract is:"
+msgid "Beans usually acquire references to other beans via dependency injection. Any injected attribute specifies a \"contract\" that must be satisfied by the bean to be injected. The contract is:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:110
 #, no-c-format
 msgid "a bean type, together with"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:111
 #, no-c-format
 msgid "a set of qualifiers."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:114
 #, no-c-format
-msgid ""
-"A bean type is a user-defined class or interface; a type that is client-"
-"visible. If the bean is an EJB session bean, the bean type is the "
-"<literal>@Local</literal> interface or bean-class local view. A bean may "
-"have multiple bean types. For example, the following bean has four bean "
-"types:"
+msgid "A bean type is a user-defined class or interface; a type that is client-visible. If the bean is an EJB session bean, the bean type is the <literal>@Local</literal> interface or bean-class local view. A bean may have multiple bean types. For example, the following bean has four bean types:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:120
-#, no-c-format
-msgid ""
-"<![CDATA[public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:122
 #, no-c-format
-msgid ""
-"The bean types are <literal>BookShop</literal>, <literal>Business</literal> "
-"and <literal>Shop&lt;Book&gt;</literal>, as well as the implicit type "
-"<literal>java.lang.Object</literal>. (Notice that a parameterized type is a "
-"legal bean type)."
+msgid "The bean types are <literal>BookShop</literal>, <literal>Business</literal> and <literal>Shop&lt;Book&gt;</literal>, as well as the implicit type <literal>java.lang.Object</literal>. (Notice that a parameterized type is a legal bean type)."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:128
 #, no-c-format
-msgid ""
-"Meanwhile, this session bean has only the local interfaces "
-"<literal>BookShop</literal>, <literal>Auditable</literal> and <literal>java."
-"lang.Object</literal> as bean types, since the bean class, "
-"<literal>BookShopBean</literal> is not a client-visible type."
+msgid "Meanwhile, this session bean has only the local interfaces <literal>BookShop</literal>, <literal>Auditable</literal> and <literal>java.lang.Object</literal> as bean types, since the bean class, <literal>BookShopBean</literal> is not a client-visible type."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"public class BookShopBean \n"
-"      extends Business \n"
-"      implements BookShop, Auditable {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:137
 #, no-c-format
-msgid ""
-"Most bean types you can probably figure out. One gotcha is primitive types. "
-"All primitive types are assumed to be identical to their corresponding "
-"wrapper types in <literal>java.lang</literal>."
+msgid "The bean types of a session bean include local interfaces and the bean class local view (if any). EJB remote interfaces are not considered bean types of a session bean. You can't inject an EJB using its remote interface unless you define a <emphasis>resource</emphasis>, which we'll meet in <xref linkend=\"resources\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:143
 #, no-c-format
-msgid ""
-"Bean types may be restricted to an explicit set by annotating the bean with "
-"the <literal>@Typed</literal> annotation and listing the classes that should "
-"be bean types. For instance, the bean types of this bean have been "
-"restricted to <literal>Shop&lt;Book&gt;</literal>, together with "
-"<literal>java.lang.Object</literal>:"
+msgid "Bean types may be restricted to an explicit set by annotating the bean with the <literal>@Typed</literal> annotation and listing the classes that should be bean types. For instance, the bean types of this bean have been restricted to <literal>Shop&lt;Book&gt;</literal>, together with <literal>java.lang.Object</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:149
-#, no-c-format
-msgid ""
-"<![CDATA[@Typed(Shop.class)\n"
-"public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:151
 #, no-c-format
-msgid ""
-"Sometimes, a bean type alone does not provide enough information for the "
-"container to know which bean to inject. For instance, suppose we have two "
-"implementations of the <literal>PaymentProcessor</literal> interface: "
-"<literal>CreditCardPaymentProcessor</literal> and "
-"<literal>DebitPaymentProcessor</literal>. Injecting a field of type "
-"<literal>PaymentProcessor</literal> introduces an ambiguous condition. In "
-"these cases, the client must specify some additional quality of the "
-"implementation it is interested in. We model this kind of \"quality\" using "
-"a qualifier."
+msgid "Sometimes, a bean type alone does not provide enough information for the container to know which bean to inject. For instance, suppose we have two implementations of the <literal>PaymentProcessor</literal> interface: <literal>CreditCardPaymentProcessor</literal> and <literal>DebitPaymentProcessor</literal>. Injecting a field of type <literal>PaymentProcessor</literal> introduces an ambiguous condition. In these cases, the client must specify some additional quality of the implementation it is interested in. We model this kind of \"quality\" using a qualifier."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:160
 #, no-c-format
-msgid ""
-"A qualifier is a user-defined annotation that is itself annotated "
-"<literal>@Qualifer</literal>. A qualifier annotation is an extension of the "
-"type system. It lets us disambiguate a type without having to fall back to "
-"string-based names. Here's an example of a qualifier annotation:"
+msgid "A qualifier is a user-defined annotation that is itself annotated <literal>@Qualifer</literal>. A qualifier annotation is an extension of the type system. It lets us disambiguate a type without having to fall back to string-based names. Here's an example of a qualifier annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:166
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface CreditCard {}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:168
 #, no-c-format
-msgid ""
-"You may not be used to seeing the definition of an annotation. In fact, this "
-"might be the first time you've encountered one. With CDI, annotation "
-"definitions will become a familiar artifact as you'll be creating them from "
-"time to time."
+msgid "You may not be used to seeing the definition of an annotation. In fact, this might be the first time you've encountered one. With CDI, annotation definitions will become a familiar artifact as you'll be creating them from time to time."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:175
 #, no-c-format
-msgid ""
-"Pay attention to the names of the built-in annotations in CDI and EJB. "
-"You'll notice that they are often adjectives. We encourage you to follow "
-"this convention when creating your custom annotations, since they serve to "
-"describe the behaviors and roles of the class."
+msgid "Pay attention to the names of the built-in annotations in CDI and EJB. You'll notice that they are often adjectives. We encourage you to follow this convention when creating your custom annotations, since they serve to describe the behaviors and roles of the class."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:182
 #, no-c-format
-msgid ""
-"Now that we have defined a qualifier annotation, we can use it to "
-"disambiguate an injection point. The following injection point has the bean "
-"type <literal>PaymentProcessor</literal> and qualifier <literal>@CreditCard</"
-"literal>:"
+msgid "Now that we have defined a qualifier annotation, we can use it to disambiguate an injection point. The following injection point has the bean type <literal>PaymentProcessor</literal> and qualifier <literal>@CreditCard</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:188
-#, no-c-format
-msgid "<![CDATA[@Inject @CreditCard PaymentProcessor paymentProcessor]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:191
 #, no-c-format
-msgid ""
-"If an injection point does not explicitly specify a qualifier, it has the "
-"default qualifier, <literal>@Default</literal>."
+msgid "If an injection point does not explicitly specify a qualifier, it has the default qualifier, <literal>@Default</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:197
 #, no-c-format
-msgid ""
-"For each injection point, the container searches for a bean which satisfies "
-"the contract, one which has the bean type and all the qualifiers. If it "
-"finds exactly one matching bean, it injects an instance of that bean. If it "
-"doesn't, it reports an error to the user."
+msgid "For each injection point, the container searches for a bean which satisfies the contract, one which has the bean type and all the qualifiers. If it finds exactly one matching bean, it injects an instance of that bean. If it doesn't, it reports an error to the user."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:203
 #, no-c-format
-msgid ""
-"How do we specify that qualifiers of a bean? By annotating the bean class, "
-"of course! The following bean has the qualifier <literal>@CreditCard</"
-"literal> and implements the bean type <literal>PaymentProcessor</literal>. "
-"Therefore, it satisfies our qualified injection point:"
+msgid "How do we specify that qualifiers of a bean? By annotating the bean class, of course! The following bean has the qualifier <literal>@CreditCard</literal> and implements the bean type <literal>PaymentProcessor</literal>. Therefore, it satisfies our qualified injection point:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:209
-#, no-c-format
-msgid ""
-"<![CDATA[@CreditCard\n"
-"public class CreditCardPaymentProcessor \n"
-"    implements PaymentProcessor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:212
 #, no-c-format
-msgid ""
-"If a bean does not explicitly specify a qualifier, it has the default "
-"qualifier, <literal>@Default</literal>."
+msgid "If a bean does not explicitly specify a qualifier, it has the default qualifier, <literal>@Default</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:225
 #, no-c-format
-msgid ""
-"That's not quite the end of the story. CDI also defines a simple "
-"<emphasis>resolution rule</emphasis> that helps the container decide what to "
-"do if there is more than one bean that satisfies a particular contract. "
-"We'll get into the details in <xref linkend=\"injection\"/>."
+msgid "That's not quite the end of the story. CDI also defines a simple <emphasis>resolution rule</emphasis> that helps the container decide what to do if there is more than one bean that satisfies a particular contract. We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:245
 #, no-c-format
 msgid "Scope"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:248
 #, no-c-format
-msgid ""
-"The <emphasis>scope</emphasis> of a bean defines the lifecycle and "
-"visibility of its instances. The CDI context model is extensible, "
-"accommodating arbitrary scopes. However, certain important scopes are built "
-"into the specification, and provided by the container. Each scope is "
-"represented by an annotation type."
+msgid "The <emphasis>scope</emphasis> of a bean defines the lifecycle and visibility of its instances. The CDI context model is extensible, accommodating arbitrary scopes. However, certain important scopes are built into the specification, and provided by the container. Each scope is represented by an annotation type."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:255
 #, no-c-format
-msgid ""
-"For example, any web application may have <emphasis>session scoped</"
-"emphasis> bean:"
+msgid "For example, any web application may have <emphasis>session scoped</emphasis> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:259
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:261
 #, no-c-format
-msgid ""
-"An instance of a session-scoped bean is bound to a user session and is "
-"shared by all requests that execute in the context of that session."
+msgid "An instance of a session-scoped bean is bound to a user session and is shared by all requests that execute in the context of that session."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:265
 #, no-c-format
-msgid ""
-"Keep in mind that once a bean is bound to a context, it remains in that "
-"context until the context is destroyed. There is no way to manually remove a "
-"bean from a context. If you don't want the bean to sit in the session "
-"indefinitely, consider using another scope with a shorted lifespan, such as "
-"the request or conversation scope."
+msgid "Keep in mind that once a bean is bound to a context, it remains in that context until the context is destroyed. There is no way to manually remove a bean from a context. If you don't want the bean to sit in the session indefinitely, consider using another scope with a shorted lifespan, such as the request or conversation scope."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:273
 #, no-c-format
-msgid ""
-"If a scope is not explicitly specified, then the bean belongs to a special "
-"scope called the <emphasis>dependent pseudo-scope</emphasis>. Beans with "
-"this scope live to serve the object into which they were injected, which "
-"means their lifecycle is bound to the lifecycle of that object."
+msgid "If a scope is not explicitly specified, then the bean belongs to a special scope called the <emphasis>dependent pseudo-scope</emphasis>. Beans with this scope live to serve the object into which they were injected, which means their lifecycle is bound to the lifecycle of that object."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:279
 #, no-c-format
-msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\"/>."
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:284
 #, no-c-format
 msgid "EL name"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:286
 #, no-c-format
-msgid ""
-"If you want to reference a bean in non-Java code that supports Unified EL "
-"expressions, for example, in a JSP or JSF page, you must assign the bean an "
-"<emphasis>EL name</emphasis>."
+msgid "If you want to reference a bean in non-Java code that supports Unified EL expressions, for example, in a JSP or JSF page, you must assign the bean an <emphasis>EL name</emphasis>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:291
 #, no-c-format
-msgid ""
-"The EL name is specified using the <literal>@Named</literal> annotation, as "
-"shown here:"
+msgid "The EL name is specified using the <literal>@Named</literal> annotation, as shown here:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:295
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named(\"cart\")\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:297
 #, no-c-format
 msgid "Now we can easily use the bean in any JSF or JSP page:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:299
-#, no-c-format
-msgid ""
-"<![CDATA[<h:dataTable value=\"#{cart.lineItems}\" var=\"item\">\n"
-"   ...\n"
-"</h:dataTable>]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:302
 #, no-c-format
-msgid ""
-"The <literal>@Named</literal> annotation is not what makes the class a bean. "
-"Most classes in a bean archive are already recognized as beans. The "
-"<literal>@Named</literal> annotation just makes it possible to reference the "
-"bean from the EL, most commonly from a JSF view."
+msgid "The <literal>@Named</literal> annotation is not what makes the class a bean. Most classes in a bean archive are already recognized as beans. The <literal>@Named</literal> annotation just makes it possible to reference the bean from the EL, most commonly from a JSF view."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:309
 #, no-c-format
-msgid ""
-"We can let CDI choose a name for us by leaving off the value of the "
-"<literal>@Named</literal> annotation:"
+msgid "We can let CDI choose a name for us by leaving off the value of the <literal>@Named</literal> annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:313
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:315
 #, no-c-format
-msgid ""
-"The name defaults to the unqualified class name, decapitalized; in this "
-"case, <literal>shoppingCart</literal>."
+msgid "The name defaults to the unqualified class name, decapitalized; in this case, <literal>shoppingCart</literal>."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:325
 #, no-c-format
 msgid "Alternatives"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:327
 #, no-c-format
-msgid ""
-"We've already seen how qualifiers let us choose between multiple "
-"implementations of an interface at development time. But sometimes we have "
-"an interface (or other bean type) whose implementation varies depending upon "
-"the deployment environment. For example, we may want to use a mock "
-"implementation in a testing environment. An <emphasis>alternative</emphasis> "
-"may be declared by annotating the bean class with the <literal>@Alternative</"
-"literal> annotation."
+msgid "We've already seen how qualifiers let us choose between multiple implementations of an interface at development time. But sometimes we have an interface (or other bean type) whose implementation varies depending upon the deployment environment. For example, we may want to use a mock implementation in a testing environment. An <emphasis>alternative</emphasis> may be declared by annotating the bean class with the <literal>@Alternative</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:335
-#, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class MockPaymentProcessor extends PaymentProcessorImpl { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:337
 #, no-c-format
-msgid ""
-"We normally annotate a bean <literal>@Alternative</literal> only when there "
-"is some other implementation of an interface it implements (or of any of its "
-"bean types). We can choose between alternatives at deployment time by "
-"<emphasis>selecting</emphasis> an alternative in the CDI deployment "
-"descriptor <literal>META-INF/beans.xml</literal> of the JAR or Java EE "
-"module that uses it. Different modules can specify that they use different "
-"alternatives."
+msgid "We normally annotate a bean <literal>@Alternative</literal> only when there is some other implementation of an interface it implements (or of any of its bean types). We can choose between alternatives at deployment time by <emphasis>selecting</emphasis> an alternative in the CDI deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or Java EE module that uses it. Different modules can specify that they use different alternatives."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:345
 #, no-c-format
-msgid ""
-"We cover alternatives in more detail in <xref linkend=\"alternatives\"/>."
+msgid "We cover alternatives in more detail in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:352
 #, no-c-format
 msgid "Interceptor binding types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:354
 #, no-c-format
-msgid ""
-"You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, "
-"this functionality has been generalized to work with other managed beans. "
-"That's right, you no longer have to make your bean an EJB just to intercept "
-"its methods. Holler. So what does CDI have to offer above and beyond that? "
-"Well, quite a lot actually. Let's cover some background."
+msgid "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, this functionality has been generalized to work with other managed beans. That's right, you no longer have to make your bean an EJB just to intercept its methods. Holler. So what does CDI have to offer above and beyond that? Well, quite a lot actually. Let's cover some background."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:361
 #, no-c-format
-msgid ""
-"The way that interceptors were defined in Java EE 5 was counter-intuitive. "
-"You were required to specify the <emphasis>implementation</emphasis> of the "
-"interceptor directly on the <emphasis>implementation</emphasis> of the EJB, "
-"either in the <literal>@Interceptors</literal> annotation or in the XML "
-"descriptor. You might as well just put the interceptor code <emphasis>in</"
-"emphasis> the implementation! Second, the order in which the interceptors "
-"are applied is taken from the order in which they are declared in the "
-"annotation or the XML descriptor. Perhaps this isn't so bad if you're "
-"applying the interceptors to a single bean. But, if you are applying them "
-"repeatedly, then there's a good chance that you'll inadvertently define a "
-"different order for different beans. Now that's a problem."
+msgid "The way that interceptors were defined in Java EE 5 was counter-intuitive. You were required to specify the <emphasis>implementation</emphasis> of the interceptor directly on the <emphasis>implementation</emphasis> of the EJB, either in the <literal>@Interceptors</literal> annotation or in the XML descriptor. You might as well just put the interceptor code <emphasis>in</emphasis> the implementation! Second, the order in which the interceptors are applied is taken from the order in which they are declared in the annotation or the XML descriptor. Perhaps this isn't so bad if you're applying the interceptors to a single bean. But, if you are applying them repeatedly, then there's a good chance that you'll inadvertently define a different order for different beans. Now that's a problem."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:372
 #, no-c-format
-msgid ""
-"CDI provides a new approach to binding interceptors to beans that introduces "
-"a level of indirection (and thus control). We must define an "
-"<emphasis>interceptor binding type</emphasis> to describe the behavior "
-"implemented by the interceptor."
+msgid "CDI provides a new approach to binding interceptors to beans that introduces a level of indirection (and thus control). We must define an <emphasis>interceptor binding type</emphasis> to describe the behavior implemented by the interceptor."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:378
 #, no-c-format
-msgid ""
-"An interceptor binding type is a user-defined annotation that is itself "
-"annotated <literal>@InterceptorBinding</literal>. It lets us bind "
-"interceptor classes to bean classes with no direct dependency between the "
-"two classes."
+msgid "An interceptor binding type is a user-defined annotation that is itself annotated <literal>@InterceptorBinding</literal>. It lets us bind interceptor classes to bean classes with no direct dependency between the two classes."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:383
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Inherited\n"
-"@Target( { TYPE, METHOD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:385
 #, no-c-format
-msgid ""
-"The interceptor that implements transaction management declares this "
-"annotation:"
+msgid "The interceptor that implements transaction management declares this annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[public @Transactional @Interceptor\n"
-"class TransactionInterceptor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:391
 #, no-c-format
-msgid ""
-"We can apply the interceptor to a bean by annotating the bean class with the "
-"same interceptor binding type:"
+msgid "We can apply the interceptor to a bean by annotating the bean class with the same interceptor binding type:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:395
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Transactional\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:397
 #, no-c-format
-msgid ""
-"Notice that <literal>ShoppingCart</literal> and "
-"<literal>TransactionInterceptor</literal> don't know anything about each "
-"other."
+msgid "Notice that <literal>ShoppingCart</literal> and <literal>TransactionInterceptor</literal> don't know anything about each other."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:402
 #, no-c-format
-msgid ""
-"Interceptors are deployment-specific. (We don't need a "
-"<literal>TransactionInterceptor</literal> in our unit tests!) By default, an "
-"interceptor is disabled. We can enable an interceptor using the CDI "
-"deployment descriptor <literal>META-INF/beans.xml</literal> of the JAR or "
-"Java EE module. This is also where we specify the interceptor ordering."
+msgid "Interceptors are deployment-specific. (We don't need a <literal>TransactionInterceptor</literal> in our unit tests!) By default, an interceptor is disabled. We can enable an interceptor using the CDI deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or Java EE module. This is also where we specify the interceptor ordering."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:409
 #, no-c-format
-msgid ""
-"We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
-"\"interceptors\"/> and <xref linkend=\"decorators\"/>."
+msgid "We'll discuss interceptors, and their cousins, decorators, in <xref linkend=\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:419
 #, no-c-format
 msgid "What kinds of classes are beans?"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:421
 #, no-c-format
-msgid ""
-"We've already seen two types of beans: JavaBeans and EJB session beans. Is "
-"that the whole story? Actually, it's just the beginning. Let's explore the "
-"various kinds of beans that CDI implementations must support out-of-the-box."
+msgid "We've already seen two types of beans: JavaBeans and EJB session beans. Is that the whole story? Actually, it's just the beginning. Let's explore the various kinds of beans that CDI implementations must support out-of-the-box."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:428
 #, no-c-format
 msgid "Managed beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:430
 #, no-c-format
-msgid ""
-"A managed bean is a Java class. The basic lifecycle and semantics of a "
-"managed bean are defined by the Managed Beans specification. You can "
-"explicitly declare a managed bean by annotating the bean class "
-"<literal>@ManagedBean</literal>, but in CDI you don't need to. According to "
-"the specification, the CDI container treats any class that satisfies the "
-"following conditions as a managed bean:"
+msgid "A managed bean is a Java class. The basic lifecycle and semantics of a managed bean are defined by the Managed Beans specification. You can explicitly declare a managed bean by annotating the bean class <literal>@ManagedBean</literal>, but in CDI you don't need to. According to the specification, the CDI container treats any class that satisfies the following conditions as a managed bean:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:441
 #, no-c-format
 msgid "It is not a non-static inner class."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:444
 #, no-c-format
 msgid "It is a concrete class, or is annotated <literal>@Decorator</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:447
 #, no-c-format
-msgid ""
-"It is not annotated with an EJB component-defining annotation or declared as "
-"an EJB bean class in <literal>ejb-jar.xml</literal>."
+msgid "It is not annotated with an EJB component-defining annotation or declared as an EJB bean class in <literal>ejb-jar.xml</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:453
 #, no-c-format
-msgid ""
-"It does not implement <literal>javax.enterprise.inject.spi.Extension</"
-"literal>."
+msgid "It does not implement <literal>javax.enterprise.inject.spi.Extension</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:456
 #, no-c-format
-msgid "It has an appropriate constructor&#8212;either:"
+msgid "It has an appropriate constructor—either:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:461
 #, no-c-format
 msgid "the class has a constructor with no parameters, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:464
 #, no-c-format
 msgid "the class declares a constructor annotated <literal>@Inject</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:472
 #, no-c-format
-msgid ""
-"The unrestricted set of bean types for a managed bean contains the bean "
-"class, every superclass and all interfaces it implements directly or "
-"indirectly."
+msgid "According to this definition, JPA entities are technically managed beans. However, entities have their own special lifecycle, state and identity model and are usually instantiated by JPA or using <literal>new</literal>. Therefore we don't recommend directly injecting an entity class. We especially recommend against assigning a scope other than <literal>@Dependent</literal> to an entity class, since JPA is not able to persist injected CDI proxies."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:475
 #, no-c-format
-msgid ""
-"If a managed bean has a public field, it must have the default scope "
-"<literal>@Dependent</literal>."
+msgid "The unrestricted set of bean types for a managed bean contains the bean class, every superclass and all interfaces it implements directly or indirectly."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:477
 #, no-c-format
-msgid ""
-"Managed beans support the <literal>@PostConstruct</literal> and "
-"<literal>@PreDestroy</literal> lifecycle callbacks."
+msgid "If a managed bean has a public field, it must have the default scope <literal>@Dependent</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:480
 #, no-c-format
-msgid ""
-"Session beans are also, technically, managed beans. However, since they have "
-"their own special lifecycle and take advantage of additional enterprise "
-"services, the CDI specification considers them to be a different kind of "
-"bean."
+msgid "Managed beans support the <literal>@PostConstruct</literal> and <literal>@PreDestroy</literal> lifecycle callbacks."
 msgstr ""
 
+#. Tag: para
+#, no-c-format
+msgid "Session beans are also, technically, managed beans. However, since they have their own special lifecycle and take advantage of additional enterprise services, the CDI specification considers them to be a different kind of bean."
+msgstr ""
+
 #. Tag: title
-#: beans.xml:489
 #, no-c-format
 msgid "Session beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:491
 #, no-c-format
-msgid ""
-"Session beans belong to the EJB specification. They have a special "
-"lifecycle, state management and concurrency model that is different to other "
-"managed beans and non-managed Java objects. But session beans participate in "
-"CDI just like any other bean. You can inject one session bean into another "
-"session bean, a managed bean into a session bean, a session bean into a "
-"managed bean, have a managed bean observe an event raised by a session bean, "
-"and so on."
+msgid "Session beans belong to the EJB specification. They have a special lifecycle, state management and concurrency model that is different to other managed beans and non-managed Java objects. But session beans participate in CDI just like any other bean. You can inject one session bean into another session bean, a managed bean into a session bean, a session bean into a managed bean, have a managed bean observe an event raised by a session bean, and so on."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:500
 #, no-c-format
-msgid ""
-"Message-driven and entity beans are by nature non-contextual objects and may "
-"not be injected into other objects. However, message-driven beans can take "
-"advantage of some CDI functionality, such as dependency injection, "
-"interceptors and decorators. In fact, CDI will perform injection into any "
-"session or message-driven bean, even those which are not contextual "
-"instances."
+msgid "Message-driven and entity beans are by nature non-contextual objects and may not be injected into other objects. However, message-driven beans can take advantage of some CDI functionality, such as dependency injection, interceptors and decorators. In fact, CDI will perform injection into any session or message-driven bean, even those which are not contextual instances."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:508
 #, no-c-format
-msgid ""
-"The unrestricted set of bean types for a session bean contains all local "
-"interfaces of the bean and their superinterfaces. If the session bean has a "
-"bean class local view, the unrestricted set of bean types contains the bean "
-"class and all superclasses. In addition, <literal>java.lang.Object</literal> "
-"is a bean type of every session bean. But remote interfaces are "
-"<emphasis>not</emphasis> included in the set of bean types."
+msgid "The unrestricted set of bean types for a session bean contains all local interfaces of the bean and their superinterfaces. If the session bean has a bean class local view, the unrestricted set of bean types contains the bean class and all superclasses. In addition, <literal>java.lang.Object</literal> is a bean type of every session bean. But remote interfaces are <emphasis>not</emphasis> included in the set of bean types."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:516
 #, no-c-format
-msgid ""
-"There's no reason to explicitly declare the scope of a stateless session "
-"bean or singleton session bean. The EJB container controls the lifecycle of "
-"these beans, according to the semantics of the <literal>@Stateless</literal> "
-"or <literal>@Singleton</literal> declaration. On the other hand, a stateful "
-"session bean may have any scope."
+msgid "There's no reason to explicitly declare the scope of a stateless session bean or singleton session bean. The EJB container controls the lifecycle of these beans, according to the semantics of the <literal>@Stateless</literal> or <literal>@Singleton</literal> declaration. On the other hand, a stateful session bean may have any scope."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:520
 #, no-c-format
-msgid ""
-"Stateful session beans may define a <emphasis>remove method</emphasis>, "
-"annotated <literal>@Remove</literal>, that is used by the application to "
-"indicate that an instance should be destroyed. However, for a contextual "
-"instance of the bean&#8212;an instance under the control of CDI&#8212;this "
-"method may only be called by the application if the bean has scope "
-"<literal>@Dependent</literal>. For beans with other scopes, the application "
-"must let the container destroy the bean."
+msgid "Stateful session beans may define a <emphasis>remove method</emphasis>, annotated <literal>@Remove</literal>, that is used by the application to indicate that an instance should be destroyed. However, for a contextual instance of the bean—an instance under the control of CDI—this method may only be called by the application if the bean has scope <literal>@Dependent</literal>. For beans with other scopes, the application must let the container destroy the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:528
 #, no-c-format
-msgid ""
-"So, when should we use a session bean instead of a plain managed bean? "
-"Whenever we need the advanced enterprise services offered by EJB, such as:"
+msgid "So, when should we use a session bean instead of a plain managed bean? Whenever we need the advanced enterprise services offered by EJB, such as:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:535
 #, no-c-format
 msgid "method-level transaction management and security,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:538
 #, no-c-format
 msgid "concurrency management,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:541
 #, no-c-format
-msgid ""
-"instance-level passivation for stateful session beans and instance-pooling "
-"for stateless session beans,"
+msgid "instance-level passivation for stateful session beans and instance-pooling for stateless session beans,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:545
 #, no-c-format
 msgid "remote or web service invocation, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:548
 #, no-c-format
 msgid "timers and asynchronous methods,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:552
 #, no-c-format
-msgid ""
-"When we don't need any of these things, an ordinary managed bean will serve "
-"just fine."
+msgid "When we don't need any of these things, an ordinary managed bean will serve just fine."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:554
 #, no-c-format
-msgid ""
-"Many beans (including any <literal>@SessionScoped</literal> or "
-"<literal>@ApplicationScoped</literal> beans) are available for concurrent "
-"access. Therefore, the concurrency management provided by EJB 3.1 is "
-"especially useful. Most session and application scoped beans should be EJBs."
+msgid "Many beans (including any <literal>@SessionScoped</literal> or <literal>@ApplicationScoped</literal> beans) are available for concurrent access. Therefore, the concurrency management provided by EJB 3.1 is especially useful. Most session and application scoped beans should be EJBs."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:560
 #, no-c-format
-msgid ""
-"Beans which hold references to heavy-weight resources, or hold a lot of "
-"internal state benefit from the advanced container-managed lifecycle defined "
-"by the EJB stateless/stateful/singleton model, with its support for "
-"passivation and instance pooling."
+msgid "Beans which hold references to heavy-weight resources, or hold a lot of internal state benefit from the advanced container-managed lifecycle defined by the EJB stateless/stateful/singleton model, with its support for passivation and instance pooling."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:566
 #, no-c-format
-msgid ""
-"Finally, it's usually obvious when method-level transaction management, "
-"method-level security, timers, remote methods or asynchronous methods are "
-"needed."
+msgid "Finally, it's usually obvious when method-level transaction management, method-level security, timers, remote methods or asynchronous methods are needed."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:571
 #, no-c-format
-msgid ""
-"The point we're trying to make is: use a session bean when you need the "
-"services it provides, not just because you want to use dependency injection, "
-"lifecycle management, or interceptors. Java EE 6 provides a graduated "
-"programming model. It's usually easy to start with an ordinary managed bean, "
-"and later turn it into an EJB just by adding one of the following "
-"annotations: <literal>@Stateless</literal>, <literal>@Stateful</literal> or "
-"<literal>@Singleton</literal>."
+msgid "The point we're trying to make is: use a session bean when you need the services it provides, not just because you want to use dependency injection, lifecycle management, or interceptors. Java EE 6 provides a graduated programming model. It's usually easy to start with an ordinary managed bean, and later turn it into an EJB just by adding one of the following annotations: <literal>@Stateless</literal>, <literal>@Stateful</literal> or <literal>@Singleton</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:579
 #, no-c-format
-msgid ""
-"On the other hand, don't be scared to use session beans just because you've "
-"heard your friends say they're \"heavyweight\". It's nothing more than "
-"superstition to think that something is \"heavier\" just because it's hosted "
-"natively within the Java EE container, instead of by a proprietary bean "
-"container or dependency injection framework that runs as an additional layer "
-"of obfuscation. And as a general principle, you should be skeptical of folks "
-"who use vaguely defined terminology like \"heavyweight\"."
+msgid "On the other hand, don't be scared to use session beans just because you've heard your friends say they're \"heavyweight\". It's nothing more than superstition to think that something is \"heavier\" just because it's hosted natively within the Java EE container, instead of by a proprietary bean container or dependency injection framework that runs as an additional layer of obfuscation. And as a general principle, you should be skeptical of folks who use vaguely defined terminology like \"heavyweight\"."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:590
 #, no-c-format
 msgid "Producer methods"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:592
 #, no-c-format
-msgid ""
-"Not everything that needs to be injected can be boiled down to a bean class "
-"instantiated by the container using <literal>new</literal>. There are plenty "
-"of cases where we need additional control. What if we need to decide at "
-"runtime which implementation of a type to instantiate and inject? What if we "
-"need to inject an object that is obtained by querying a service or "
-"transactional resource, for example by executing a JPA query?"
+msgid "Not everything that needs to be injected can be boiled down to a bean class instantiated by the container using <literal>new</literal>. There are plenty of cases where we need additional control. What if we need to decide at runtime which implementation of a type to instantiate and inject? What if we need to inject an object that is obtained by querying a service or transactional resource, for example by executing a JPA query?"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:600
 #, no-c-format
-msgid ""
-"A <emphasis>producer method</emphasis> is a method that acts as a source of "
-"bean instances. The method declaration itself describes the bean and the "
-"container invokes the method to obtain an instance of the bean when no "
-"instance exists in the specified context. A producer method lets the "
-"application take full control of the bean instantiation process."
+msgid "A <emphasis>producer method</emphasis> is a method that acts as a source of bean instances. The method declaration itself describes the bean and the container invokes the method to obtain an instance of the bean when no instance exists in the specified context. A producer method lets the application take full control of the bean instantiation process."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:607
 #, no-c-format
-msgid ""
-"A producer method is declared by annotating a method of a bean class with "
-"the <literal>@Produces</literal> annotation."
+msgid "A producer method is declared by annotating a method of a bean class with the <literal>@Produces</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:612
-#, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class RandomNumberGenerator {\n"
-"   \n"
-"   private Random random = new Random(System.currentTimeMillis());\n"
-"       \n"
-"   @Produces @Named @Random int getRandomNumber() {\n"
-"      return random.nextInt(100);\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:614
 #, no-c-format
-msgid ""
-"We can't write a bean class that is itself a random number. But we can "
-"certainly write a method that returns a random number. By making the method "
-"a producer method, we allow the return value of the method&#8212;in this "
-"case an <literal>Integer</literal>&#8212;to be injected. We can even specify "
-"a qualifier&#8212;in this case <literal>@Random</literal>, a scope&#8212;"
-"which in this case defaults to <literal>@Dependent</literal>, and an EL "
-"name&#8212;which in this case defaults to <literal>randomNumber</literal> "
-"according to the JavaBeans property name convention. Now we can get a random "
-"number anywhere:"
+msgid "We can't write a bean class that is itself a random number. But we can certainly write a method that returns a random number. By making the method a producer method, we allow the return value of the method—in this case an <literal>Integer</literal>—to be injected. We can even specify a qualifier—in this case <literal>@Random</literal>, a scope—which in this case defaults to <literal>@Dependent</literal>, and an EL name—which in this case defaults to <literal>randomNumber</literal> according to the JavaBeans property name convention. Now we can get a random number anywhere:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:623
-#, no-c-format
-msgid "<![CDATA[@Inject @Random int randomNumber;]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:625
 #, no-c-format
 msgid "Even in a Unified EL expression:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:629
-#, no-c-format
-msgid "<![CDATA[<p>Your raffle number is #{randomNumber}.</p>]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:631
 #, no-c-format
-msgid ""
-"A producer method must be a non-abstract method of a managed bean class or "
-"session bean class. A producer method may be either static or non-static. If "
-"the bean is a session bean, the producer method must be either a business "
-"method of the EJB or a static method of the bean class."
+msgid "A producer method must be a non-abstract method of a managed bean class or session bean class. A producer method may be either static or non-static. If the bean is a session bean, the producer method must be either a business method of the EJB or a static method of the bean class."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:637
 #, no-c-format
 msgid "The bean types of a producer method depend upon the method return type:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:643
 #, no-c-format
-msgid ""
-"If the return type is an interface, the unrestricted set of bean types "
-"contains the return type, all interfaces it extends directly or indirectly "
-"and <literal>java.lang.Object</literal>."
+msgid "If the return type is an interface, the unrestricted set of bean types contains the return type, all interfaces it extends directly or indirectly and <literal>java.lang.Object</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:649
 #, no-c-format
-msgid ""
-"If a return type is primitive or is a Java array type, the unrestricted set "
-"of bean types contains exactly two types: the method return type and "
-"<literal>java.lang.Object</literal>."
+msgid "If a return type is primitive or is a Java array type, the unrestricted set of bean types contains exactly two types: the method return type and <literal>java.lang.Object</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:655
 #, no-c-format
-msgid ""
-"If the return type is a class, the unrestricted set of bean types contains "
-"the return type, every superclass and all interfaces it implements directly "
-"or indirectly."
+msgid "If the return type is a class, the unrestricted set of bean types contains the return type, every superclass and all interfaces it implements directly or indirectly."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:662
 #, no-c-format
-msgid ""
-"If the producer method has method parameters, the container will look for a "
-"bean that satisfies the type and qualifiers of each parameter and pass it to "
-"the method automatically&#8212;another form of dependency injection."
+msgid "Producer methods and fields may have a primitive bean type. For the purpose of resolving dependencies, primitive types are considered to be identical to their corresponding wrapper types in <literal>java.lang</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:668
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[@Produces Set<Roles> getRoles(User user) {\n"
-"   return user.getRoles();\n"
-"}]]>"
+msgid "If the producer method has method parameters, the container will look for a bean that satisfies the type and qualifiers of each parameter and pass it to the method automatically—another form of dependency injection."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:670
 #, no-c-format
-msgid ""
-"We'll talk much more about producer methods in <xref linkend="
-"\"producermethods\"/>."
+msgid "We'll talk much more about producer methods in <xref linkend=\"producermethods\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:675
 #, no-c-format
 msgid "Producer fields"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:677
 #, no-c-format
-msgid ""
-"A <emphasis>producer field</emphasis> is a simpler alternative to a producer "
-"method. A producer field is declared by annotating a field of a bean class "
-"with the <literal>@Produces</literal> annotation&#8212;the same annotation "
-"used for producer methods."
+msgid "A <emphasis>producer field</emphasis> is a simpler alternative to a producer method. A producer field is declared by annotating a field of a bean class with the <literal>@Produces</literal> annotation—the same annotation used for producer methods."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:683
-#, no-c-format
-msgid ""
-"<![CDATA[public class Shop {\n"
-"   @Produces PaymentProcessor paymentProcessor = ....;\n"
-"   @Produces @Catalog List<Product> products = ....;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:685
 #, no-c-format
-msgid ""
-"The rules for determining the bean types of a producer field parallel the "
-"rules for producer methods."
+msgid "The rules for determining the bean types of a producer field parallel the rules for producer methods."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:689
 #, no-c-format
-msgid ""
-"A producer field is really just a shortcut that lets us avoid writing a "
-"useless getter method. However, in addition to convenience, producer fields "
-"serve a specific purpose as an adaptor for Java EE component environment "
-"injection, but to learn more about that, you'll have to wait until <xref "
-"linkend=\"resources\"/>. Because we can't wait to get to work on some "
-"examples."
+msgid "A producer field is really just a shortcut that lets us avoid writing a useless getter method. However, in addition to convenience, producer fields serve a specific purpose as an adaptor for Java EE component environment injection, but to learn more about that, you'll have to wait until <xref linkend=\"resources\" />. Because we can't wait to get to work on some examples."
 msgstr ""
 
-#. Tag: title
-#: beans.xml:701
-#, no-c-format
-msgid "The (minimal) bean descriptor"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:703
-#, no-c-format
-msgid ""
-"First, it's important to understand that the XML bean descriptor in CDI "
-"(beans.xml) is not there to define beans in XML, like in other popular bean "
-"containers. Rather, you use this file to enable CDI services for the current "
-"bean archive that is difficult to define consistently in Java or which you "
-"don't want to define in Java (e.g., to accomodate testing)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:710
-#, no-c-format
-msgid ""
-"For example, the XML is used to enable interceptors (which are disabled by "
-"default) and define interceptor ordering. So the bean descriptor "
-"<emphasis>complements</emphasis> the metadata that is provided in the Java "
-"language syntax. (You may still want to define beans in XML for other "
-"reasons, but that is the concern of an extension)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:717
-#, no-c-format
-msgid ""
-"Let's first ask why the beans.xml is required, then look at what services it "
-"is used used to enable."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:722
-#, no-c-format
-msgid "Why is beans.xml required?"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:724
-#, no-c-format
-msgid ""
-"You may be wondering, if beans are not described using XML, why do we need "
-"beans.xml at all, particularly if you don't have anything that you would "
-"need the bean descriptor to enable (alternatives, interceptors or "
-"decorators)?"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:730
-#, no-c-format
-msgid "There are two things about CDI that we need to keep in mind:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:736
-#, no-c-format
-msgid ""
-"CDI does not require any special declaration for a Java class to be injected "
-"- that's right, no annotation or XML declaration at all!"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:742
-#, no-c-format
-msgid ""
-"CDI does not define any special kind of module - CDI beans can be deployed "
-"in a library JAR, EJB JAR, WAR, RAR, or JVM classpath directory."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:749
-#, no-c-format
-msgid ""
-"The CDI specification calls the process of identifying beans in modules "
-"<emphasis>bean discovery</emphasis>."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:753
-#, no-c-format
-msgid ""
-"So there are potentially a lot of classes in the classpath which might be "
-"beans! We don't want to force the container to scan every one of those "
-"classes at startup and build its internal metamodel for each of them. This "
-"really could make bean discovery very slow."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:759
-#, no-c-format
-msgid ""
-"But there's another reason we need to give the user some control over which "
-"classes are available for injection. We don't want every class in the "
-"classpath to potentially match an injection point, including classes that "
-"were never intended to be injected into things. This would force the "
-"developer to have to use qualifiers much more often to disambiguate "
-"injection points."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:766
-#, no-c-format
-msgid "So we have two choices. We could have the developer:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:772
-#, no-c-format
-msgid "explicitly exclude modules which do not contain beans, or"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:775
-#, no-c-format
-msgid "explicitly declare modules which do contain beans."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:779
-#, no-c-format
-msgid ""
-"It should be clear that the second option is a much better way to go. Thus, "
-"CDI has the notion of a bean archive. A bean archive is just a module that "
-"has a file named beans.xml in the META-INF directory. The container looks "
-"for beans in bean archives. It ignores other modules."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:785
-#, no-c-format
-msgid ""
-"Now, you might be wondering if we've got the granularity wrong here. Why "
-"should module be the right criteria to use for including/excluding a class. "
-"Why not consider:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:792
-#, no-c-format
-msgid "a class-level annotation,"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:795
-#, no-c-format
-msgid "the package,"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:798
-#, no-c-format
-msgid "some type it implements or extends, or"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:801
-#, no-c-format
-msgid "some naming convention."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:805
-#, no-c-format
-msgid ""
-"We've got the first option covered. Annotate a bean <literal>@Alternative</"
-"literal>, or with an alternative stereotype, and it will be considered "
-"disabled by CDI, as long as you don't explicitly enable it in beans.xml. "
-"That's not quite the same thing as excluding the class from scanning "
-"altogether, but it's close. (One difference is that a portable extension "
-"with still get a <literal>ProcessAnnotatedType</literal> event for that "
-"class)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:813
-#, no-c-format
-msgid ""
-"A future version of CDI might allow you to declare excluded packages in "
-"beans.xml. Excluding a bean by type or naming convention isn't really that "
-"appealing. In the world of CDI, we use stereotypes for identifying "
-"architectural roles. We don't use marker interfaces or naming conventions. "
-"Names really shouldn't affect functionality as it is too fragile."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:820
-#, no-c-format
-msgid "Enough theory, what elements are available in beans.xml?"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:826
-#, no-c-format
-msgid "Bean descriptor schema"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:828
-#, no-c-format
-msgid ""
-"If you don't need to activate any interceptors, decorators or alternatives "
-"(you just have plain beans that you need to use in an archive), the beans."
-"xml file can be <emphasis>empty</emphasis>. If you do have one of these "
-"requirements, then you need to start popularing the descriptor."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:834
-#, no-c-format
-msgid ""
-"The root element of a beans.xml file is <literal>beans</literal>, with the "
-"following <ulink url=\"http://anonsvn.jboss.org/repos/weld/api/trunk/cdi/src/"
-"main/resources/beans.xsd\">schema</ulink>:"
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:839
-#, no-c-format
-msgid ""
-"<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<beans xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee \n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"</beans>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:841
-#, no-c-format
-msgid ""
-"The <literal>beans</literal> element can have one or more of each of the "
-"following children:"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:847
-#, no-c-format
-msgid "interceptors"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:850
-#, no-c-format
-msgid "decorators"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:853
-#, no-c-format
-msgid "alternatives"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:857
-#, no-c-format
-msgid "Let's look at each element in detail."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:862
-#, no-c-format
-msgid "&lt;interceptors&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:864
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled interceptors bound via interceptor "
-"bindings. An interceptor must be explicitly enabled by listing the fully "
-"qualified class name in a child &lt;class&gt; element of &lt;"
-"interceptors&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:870
-#, no-c-format
-msgid ""
-"There may be zero or more interceptor class elements. The order of the class "
-"declarations determines the interceptor ordering. Interceptors which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an interceptor "
-"class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:877
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.intercept.SecurityInterceptor</class>\n"
-"   <class>com.acme.intercept.TransactionInterceptor</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:883
-#, no-c-format
-msgid "&lt;decorators&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:885
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled decorators. A decorator must be "
-"explicitly enabled by listing the fully qualified class name in a child &lt;"
-"class&gt; element of &lt;decorators&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:891
-#, no-c-format
-msgid ""
-"There may be zero or more decorator class elements. The order of the class "
-"declarations determines the decorator ordering. Decorators which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an decorator class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:898
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.decorate.BigAccountDecorator</class>\n"
-"   <class>com.acme.decorate.SpecialGiftDecorator</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:903
-#, no-c-format
-msgid "&lt;alternatives&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:905
-#, no-c-format
-msgid ""
-"An alternative is a bean that must be explicitly declared in the beans.xml "
-"file if it should be available for lookup, injection or EL resolution. By "
-"default, a bean archive has no active alternatives. An alternative must be "
-"explicitly declared using the fully qualified bean class name or stereotype "
-"class name in either a child &lt;class&gt; or &lt;stereotype&gt; element of "
-"&lt;alternatives&gt;, respectively."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:913
-#, no-c-format
-msgid ""
-"An alternative is selected for the bean archive if either: the alternative "
-"is a managed bean or session bean and the bean class of the bean is listed, "
-"or the alternative is a producer method, field or resource, and the bean "
-"class that declares the method or field is listed, or any "
-"<literal>@Alternative</literal> stereotype of the alternative is listed."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:920
-#, no-c-format
-msgid ""
-"There may be zero or more alternative bean class elements. The same class "
-"may not be listed twice. And of course, the class must exist and it must be "
-"an alternative bean class."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:925
-#, no-c-format
-msgid ""
-"There may also be zero or more <literal>@Alternative</literal> stereotype "
-"elements. The same stereotype may not be listed twice. And of course, the "
-"stereotype class must exist and it must be an stereotype annotation."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:931
-#, no-c-format
-msgid ""
-"<![CDATA[<stereotypes>\n"
-"   <class>com.acme.business.MockPaymentProcessor</class>\n"
-"   <stereotype>com.acme.stereotype.Mock</stereotype>\n"
-"</stereotypes>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:935
-#, no-c-format
-msgid ""
-"And that's it! A very simple schema, used only to activate and order CDI "
-"services."
-msgstr ""

Modified: doc/trunk/reference/pot/decorators.pot
===================================================================
--- doc/trunk/reference/pot/decorators.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/decorators.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,307 +1,124 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"PO-Revision-Date: 2010-03-02T13:07:17\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: decorators.xml:5
 #, no-c-format
 msgid "Decorators"
 msgstr ""
 
 #. Tag: para
-#: decorators.xml:7
 #, no-c-format
-msgid ""
-"Interceptors are a powerful way to capture and separate concerns which are "
-"<emphasis>orthogonal</emphasis> to the application (and type system). Any "
-"interceptor is able to intercept invocations of any Java type. This makes "
-"them perfect for solving technical concerns such as transaction management, "
-"security and call logging. However, by nature, interceptors are unaware of "
-"the actual semantics of the events they intercept. Thus, interceptors aren't "
-"an appropriate tool for separating business-related concerns."
+msgid "Interceptors are a powerful way to capture and separate concerns which are <emphasis>orthogonal</emphasis> to the application (and type system). Any interceptor is able to intercept invocations of any Java type. This makes them perfect for solving technical concerns such as transaction management, security and call logging. However, by nature, interceptors are unaware of the actual semantics of the events they intercept. Thus, interceptors aren't an appropriate tool for separating business-related concerns."
 msgstr ""
 
 #. Tag: para
-#: decorators.xml:15
 #, no-c-format
-msgid ""
-"The reverse is true of <emphasis>decorators</emphasis>. A decorator "
-"intercepts invocations only for a certain Java interface, and is therefore "
-"aware of all the semantics attached to that interface. Since decorators "
-"directly implement operations with business semantics, it makes them the "
-"perfect tool for modeling some kinds of business concerns. It also means "
-"that a decorator doesn't have the generality of an interceptor. Decorators "
-"aren't able to solve technical concerns that cut across many disparate "
-"types. Interceptors and decorators, though similar in many ways, are "
-"complementary. Let's look at some cases where decorators fit the bill."
+msgid "The reverse is true of <emphasis>decorators</emphasis>. A decorator intercepts invocations only for a certain Java interface, and is therefore aware of all the semantics attached to that interface. Since decorators directly implement operations with business semantics, it makes them the perfect tool for modeling some kinds of business concerns. It also means that a decorator doesn't have the generality of an interceptor. Decorators aren't able to solve technical concerns that cut across many disparate types. Interceptors and decorators, though similar in many ways, are complementary. Let's look at some cases where decorators fit the bill."
 msgstr ""
 
 #. Tag: para
-#: decorators.xml:24
 #, no-c-format
 msgid "Suppose we have an interface that represents accounts:"
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:26
-#, no-c-format
-msgid ""
-"<![CDATA[public interface Account {\n"
-"   public BigDecimal getBalance();\n"
-"   public User getOwner();\n"
-"   public void withdraw(BigDecimal amount);\n"
-"   public void deposit(BigDecimal amount);\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:28
 #, no-c-format
-msgid ""
-"Several different beans in our system implement the <literal>Account</"
-"literal> interface. However, we have a common legal requirement that; for "
-"any kind of account, large transactions must be recorded by the system in a "
-"special log. This is a perfect job for a decorator."
+msgid "Several different beans in our system implement the <literal>Account</literal> interface. However, we have a common legal requirement that; for any kind of account, large transactions must be recorded by the system in a special log. This is a perfect job for a decorator."
 msgstr ""
 
 #. Tag: para
-#: decorators.xml:34
 #, no-c-format
-msgid ""
-"A decorator is a bean (possibly even an abstract class) that implements the "
-"type it decorates and is annotated <literal>@Decorator</literal>."
+msgid "A decorator is a bean (possibly even an abstract class) that implements the type it decorates and is annotated <literal>@Decorator</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:39
-#, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:41
 #, no-c-format
-msgid ""
-"The decorator implements the methods of the decorated type that it wants to "
-"intercept."
+msgid "The decorator implements the methods of the decorated type that it wants to intercept."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:45
-#, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      ...\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:47
 #, no-c-format
-msgid ""
-"Unlike other beans, a decorator may be an abstract class. Therefore, if "
-"there's nothing special the decorator needs to do for a particular method of "
-"the decorated interface, you don't need to implement that method."
+msgid "Unlike other beans, a decorator may be an abstract class. Therefore, if there's nothing special the decorator needs to do for a particular method of the decorated interface, you don't need to implement that method."
 msgstr ""
 
 #. Tag: para
-#: decorators.xml:52
 #, no-c-format
-msgid ""
-"Interceptors for a method are called before decorators that apply to the "
-"method."
+msgid "Interceptors for a method are called before decorators that apply to the method."
 msgstr ""
 
 #. Tag: title
-#: decorators.xml:57
 #, no-c-format
 msgid "Delegate object"
 msgstr ""
 
 #. Tag: para
-#: decorators.xml:59
 #, no-c-format
-msgid ""
-"Decorators have a special injection point, called the <emphasis>delegate "
-"injection point</emphasis>, with the same type as the beans they decorate, "
-"and the annotation <literal>@Delegate</literal>. There must be exactly one "
-"delegate injection point, which can be a constructor parameter, initializer "
-"method parameter or injected field."
+msgid "Decorators have a special injection point, called the <emphasis>delegate injection point</emphasis>, with the same type as the beans they decorate, and the annotation <literal>@Delegate</literal>. There must be exactly one delegate injection point, which can be a constructor parameter, initializer method parameter or injected field."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:67
 #, no-c-format
 msgid "A decorator is bound to any bean which:"
 msgstr ""
 
 #. Tag: para
-#: decorators.xml:71
 #, no-c-format
 msgid "has the type of the delegate injection point as a bean type, and"
 msgstr ""
 
 #. Tag: para
-#: decorators.xml:74
 #, no-c-format
 msgid "has all qualifiers that are declared at the delegate injection point."
 msgstr ""
 
 #. Tag: para
-#: decorators.xml:78
 #, no-c-format
-msgid ""
-"This delegate injection point specifies that the decorator is bound to all "
-"beans that implement <literal>Account</literal>:"
+msgid "This delegate injection point specifies that the decorator is bound to all beans that implement <literal>Account</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:83
-#, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:85
 #, no-c-format
-msgid ""
-"A delegate injection point may specify any number of qualifier annotations. "
-"The decorator will only be bound to beans with the same qualifiers."
+msgid "A delegate injection point may specify any number of qualifier annotations. The decorator will only be bound to beans with the same qualifiers."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:90
-#, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:92
 #, no-c-format
-msgid ""
-"The decorator may invoke the delegate object, which has much the same effect "
-"as calling <literal>InvocationContext.proceed()</literal> from an "
-"interceptor. The main difference is that the decorator can invoke "
-"<emphasis>any</emphasis> business method on the delegate object."
+msgid "The decorator may invoke the delegate object, which has much the same effect as calling <literal>InvocationContext.proceed()</literal> from an interceptor. The main difference is that the decorator can invoke <emphasis>any</emphasis> business method on the delegate object."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:98
-#, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      account.withdraw(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedWithdrawl(amount) );\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      account.deposit(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedDeposit(amount) );\n"
-"      }\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: decorators.xml:103
 #, no-c-format
 msgid "Enabling decorators"
 msgstr ""
 
 #. Tag: para
-#: decorators.xml:105
 #, no-c-format
-msgid ""
-"By default, all decorators are disabled. We need to <emphasis>enable</"
-"emphasis> our decorator in the <literal>beans.xml</literal> descriptor of a "
-"bean archive. This activation only applies to the beans in that archive."
+msgid "By default, all decorators are disabled. We need to <emphasis>enable</emphasis> our decorator in the <literal>beans.xml</literal> descriptor of a bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:111
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <decorators>\n"
-"         <class>org.mycompany.myapp.LargeTransactionDecorator</class>\n"
-"   </decorators>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:113
 #, no-c-format
-msgid ""
-"This declaration serves the same purpose for decorators that the "
-"<literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
+msgid "This declaration serves the same purpose for decorators that the <literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
 msgstr ""
 
 #. Tag: para
-#: decorators.xml:120
 #, no-c-format
-msgid ""
-"it enables us to specify a total ordering for all decorators in our system, "
-"ensuring deterministic behavior, and"
+msgid "it enables us to specify a total ordering for all decorators in our system, ensuring deterministic behavior, and"
 msgstr ""
 
 #. Tag: para
-#: decorators.xml:126
 #, no-c-format
 msgid "it lets us enable or disable decorator classes at deployment time."
 msgstr ""
+

Modified: doc/trunk/reference/pot/dependencies.pot
===================================================================
--- doc/trunk/reference/pot/dependencies.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/dependencies.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,135 +1,109 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"PO-Revision-Date: 2010-03-02T13:07:17\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: dependencies.xml:5
 #, no-c-format
 msgid "Weld project dependencies"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:7
 #, no-c-format
-msgid ""
-"This section lists compile-time and runtime dependencies for Weld. This list "
-"is currently maintained in the <ulink url=\"https://jira.jboss.org/jira/"
-"browse/WELD-222\">WELD-222</ulink> issue report as well as here in this "
-"appendix."
+msgid "This section lists compile-time and runtime dependencies for Weld. This list is currently maintained in the <ulink url=\"https://jira.jboss.org/jira/browse/WELD-222\">WELD-222</ulink> issue report as well as here in this appendix."
 msgstr ""
 
 #. Tag: title
-#: dependencies.xml:13
 #, no-c-format
 msgid "Artifacts coming from Sun"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:21 dependencies.xml:110
 #, no-c-format
 msgid "Artifact"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:24 dependencies.xml:113
 #, no-c-format
 msgid "Scope"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:33
+#. Tag: para
 #, no-c-format
-msgid "javax.ejb:ejb-api:3.1"
+msgid "<literal>javax.ejb:ejb-api:3.1</literal>"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:36 dependencies.xml:44 dependencies.xml:52
-#: dependencies.xml:60 dependencies.xml:68 dependencies.xml:76
-#: dependencies.xml:128
 #, no-c-format
 msgid "compile"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:41
+#. Tag: para
 #, no-c-format
-msgid "javax.faces:jsf-api:2.0"
+msgid "<literal>javax.faces:jsf-api:2.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:49
+#. Tag: para
 #, no-c-format
-msgid "javax.el:el-api:2.1"
+msgid "<literal>javax.el:el-api:2.1</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:57
+#. Tag: para
 #, no-c-format
-msgid "javax.persistence:persistence-api:2.0"
+msgid "<literal>javax.persistence:persistence-api:2.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:65
+#. Tag: para
 #, no-c-format
-msgid "javax.servlet:servlet-api:3.0"
+msgid "<literal>javax.servlet:servlet-api:3.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:73
+#. Tag: para
 #, no-c-format
-msgid "javax.interceptor:interceptor-api:1.1"
+msgid "<literal>javax.interceptor:interceptor-api:1.1</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:81
+#. Tag: para
 #, no-c-format
-msgid "org.glasfish.web:el-impl:2.1.2"
+msgid "<literal>org.glasfish.web:el-impl:2.1.2</literal>"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:84 dependencies.xml:92
 #, no-c-format
 msgid "runtime"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:89
+#. Tag: para
 #, no-c-format
-msgid "javax.faces:jsf-impl:2.0.x"
+msgid "<literal>javax.faces:jsf-impl:2.0.x</literal>"
 msgstr ""
 
 #. Tag: title
-#: dependencies.xml:101
 #, no-c-format
 msgid "Artifacts coming from Hibernate"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:116
 #, no-c-format
 msgid "Notes"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:125
+#. Tag: para
 #, no-c-format
-msgid "javax.validation:validation-api"
+msgid "<literal>javax.validation:validation-api</literal>"
 msgstr ""
 
-#. Tag: ulink
-#: dependencies.xml:131
+#. Tag: para
 #, no-c-format
-msgid "BVAL-193"
+msgid "<ulink url=\"http://opensource.atlassian.com/projects/hibernate/browse/BVAL-193\">BVAL-193</ulink>"
 msgstr ""
+

Modified: doc/trunk/reference/pot/ee.pot
===================================================================
--- doc/trunk/reference/pot/ee.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/ee.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,412 +1,164 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"PO-Revision-Date: 2010-03-02T13:07:17\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: ee.xml:4
 #, no-c-format
 msgid "Java EE integration"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:6
 #, no-c-format
-msgid ""
-"CDI is fully integrated into the Java EE environment. Beans have access to "
-"Java EE resources and JPA persistence contexts. They may be used in Unified "
-"EL expressions in JSF and JSP pages. They may even be injected into other "
-"platform components, such as servlets and message-driven Beans, which are "
-"not beans themselves."
+msgid "CDI is fully integrated into the Java EE environment. Beans have access to Java EE resources and JPA persistence contexts. They may be used in Unified EL expressions in JSF and JSP pages. They may even be injected into other platform components, such as servlets and message-driven Beans, which are not beans themselves."
 msgstr ""
 
 #. Tag: title
-#: ee.xml:13
 #, no-c-format
 msgid "Built-in beans"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:15
 #, no-c-format
-msgid ""
-"In the Java EE environment, the container provides the following built-in "
-"beans, all with the qualifier <literal>@Default</literal>:"
+msgid "In the Java EE environment, the container provides the following built-in beans, all with the qualifier <literal>@Default</literal>:"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:22
 #, no-c-format
 msgid "the current JTA <literal>UserTransaction</literal>,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:27
 #, no-c-format
-msgid ""
-"a <literal>Principal</literal> representing the current caller identity,"
+msgid "a <literal>Principal</literal> representing the current caller identity,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:32
 #, no-c-format
-msgid ""
-"the default <ulink url=\"http://jcp.org/en/jsr/detail?id=303\">Bean "
-"Validation</ulink> <literal>ValidationFactory</literal>, and"
+msgid "the default <ulink url=\"http://jcp.org/en/jsr/detail?id=303\">Bean Validation</ulink> <literal>ValidationFactory</literal>, and"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:38
 #, no-c-format
-msgid ""
-"a <literal>Validator</literal> for the default <literal>ValidationFactory</"
-"literal>."
+msgid "a <literal>Validator</literal> for the default <literal>ValidationFactory</literal>."
 msgstr ""
 
 #. Tag: para
-#: ee.xml:45
 #, no-c-format
-msgid ""
-"The CDI specification does not require the servlet context objects, "
-"<literal>HttpServletRequest</literal>, <literal>HttpSession</literal> and "
-"<literal>ServletContext</literal> to be exposed as injectable beans. If you "
-"really want to be able to inject these objects, it's easy to create a "
-"portable extension to expose them as beans. However, we recommend that "
-"direct access to these objects be limited to servlets, servlet filters and "
-"servlet event listeners, where they may be obtained in the usual way as "
-"defined by the Java Servlets spec. The <literal>FacesContext</literal> is "
-"also not injectable. You can get at it by calling <literal>FacesContext."
-"getCurrentInstance()</literal>."
+msgid "The CDI specification does not require the servlet context objects, <literal>HttpServletRequest</literal>, <literal>HttpSession</literal> and <literal>ServletContext</literal> to be exposed as injectable beans. If you really want to be able to inject these objects, it's easy to create a portable extension to expose them as beans. However, we recommend that direct access to these objects be limited to servlets, servlet filters and servlet event listeners, where they may be obtained in the usual way as defined by the Java Servlets spec. The <literal>FacesContext</literal> is also not injectable. You can get at it by calling <literal>FacesContext.getCurrentInstance()</literal>."
 msgstr ""
 
 #. Tag: para
-#: ee.xml:57
 #, no-c-format
-msgid ""
-"Oh, you <emphasis>really</emphasis> want to inject the "
-"<literal>FacesContext</literal>? Alright then, try this producer method:"
+msgid "Oh, you <emphasis>really</emphasis> want to inject the <literal>FacesContext</literal>? Alright then, try this producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[class FacesContextProducer {\n"
-"   @Produces @RequestScoped FacesContext getFacesContext() {\n"
-"      return FacesContext.getCurrentInstance();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: ee.xml:67
 #, no-c-format
 msgid "Injecting Java EE resources into a bean"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:69
 #, no-c-format
-msgid ""
-"All managed beans may take advantage of Java EE component environment "
-"injection using <literal>@Resource</literal>, <literal>@EJB</literal>, "
-"<literal>@PersistenceContext</literal>, <literal>@PeristenceUnit</literal> "
-"and <literal>@WebServiceRef</literal>. We've already seen a couple of "
-"examples of this, though we didn't pay much attention at the time:"
+msgid "All managed beans may take advantage of Java EE component environment injection using <literal>@Resource</literal>, <literal>@EJB</literal>, <literal>@PersistenceContext</literal>, <literal>@PeristenceUnit</literal> and <literal>@WebServiceRef</literal>. We've already seen a couple of examples of this, though we didn't pay much attention at the time:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:76
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @Resource UserTransaction transaction;\n"
-"\n"
-"   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"throws Exception { ... }\n"
-"}]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: ee.xml:78
-#, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Login implements Serializable {\n"
-"   @Inject Credentials credentials;\n"
-"   @PersistenceContext EntityManager userDatabase;\n"
-"    ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: ee.xml:80
 #, no-c-format
-msgid ""
-"The Java EE <literal>@PostConstruct</literal> and <literal>@PreDestroy</"
-"literal> callbacks are also supported for all managed beans. The "
-"<literal>@PostConstruct</literal> method is called after <emphasis>all</"
-"emphasis> injection has been performed."
+msgid "The Java EE <literal>@PostConstruct</literal> and <literal>@PreDestroy</literal> callbacks are also supported for all managed beans. The <literal>@PostConstruct</literal> method is called after <emphasis>all</emphasis> injection has been performed."
 msgstr ""
 
 #. Tag: para
-#: ee.xml:86
 #, no-c-format
-msgid ""
-"Of course, we advise that component environment injection be used to define "
-"CDI resources, and that typesafe injection be used in application code."
+msgid "Of course, we advise that component environment injection be used to define CDI resources, and that typesafe injection be used in application code."
 msgstr ""
 
 #. Tag: title
-#: ee.xml:94
 #, no-c-format
 msgid "Calling a bean from a servlet"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:96
 #, no-c-format
-msgid ""
-"It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
-"using field or initializer method injection."
+msgid "It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean using field or initializer method injection."
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:101
-#, no-c-format
-msgid ""
-"<![CDATA[public class Login extends HttpServlet {\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject Login login;\n"
-"\n"
-"   @Override\n"
-"   public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"      throws ServletException, IOException {\n"
-"      credentials.setUsername(request.getParameter(\"username\")):\n"
-"      credentials.setPassword(request.getParameter(\"password\")):\n"
-"      login.login();\n"
-"      if ( login.isLoggedIn() ) {\n"
-"         response.sendRedirect(\"/home.jsp\");\n"
-"      }\n"
-"      else {\n"
-"         response.sendRedirect(\"/loginError.jsp\");\n"
-"      }\n"
-"   }\n"
-"            \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: ee.xml:103
 #, no-c-format
-msgid ""
-"Since instances of servlets are shared across all incoming threads, the bean "
-"client proxy takes care of routing method invocations from the servlet to "
-"the correct instances of <literal>Credentials</literal> and <literal>Login</"
-"literal> for the current request and HTTP session."
+msgid "Since instances of servlets are shared across all incoming threads, the bean client proxy takes care of routing method invocations from the servlet to the correct instances of <literal>Credentials</literal> and <literal>Login</literal> for the current request and HTTP session."
 msgstr ""
 
 #. Tag: title
-#: ee.xml:112
 #, no-c-format
 msgid "Calling a bean from a message-driven bean"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:114
 #, no-c-format
-msgid ""
-"CDI injection applies to all EJBs, even when they aren't managed beans. In "
-"particular, you can use CDI injection in message-driven beans, which are by "
-"nature not contextual objects."
+msgid "CDI injection applies to all EJBs, even when they aren't managed beans. In particular, you can use CDI injection in message-driven beans, which are by nature not contextual objects."
 msgstr ""
 
 #. Tag: para
-#: ee.xml:119
 #, no-c-format
 msgid "You can even use CDI interceptor bindings for message-driven Beans."
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:121
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"   @Inject Inventory inventory;\n"
-"   @PersistenceContext EntityManager em;\n"
-"\n"
-"   public void onMessage(Message message) {\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: ee.xml:123
 #, no-c-format
-msgid ""
-"Please note that there is no session or conversation context available when "
-"a message is delivered to a message-driven bean. Only "
-"<literal>@RequestScoped</literal> and <literal>@ApplicationScoped</literal> "
-"beans are available."
+msgid "Please note that there is no session or conversation context available when a message is delivered to a message-driven bean. Only <literal>@RequestScoped</literal> and <literal>@ApplicationScoped</literal> beans are available."
 msgstr ""
 
 #. Tag: para
-#: ee.xml:129
 #, no-c-format
 msgid "But how about beans which <emphasis>send</emphasis> JMS messages?"
 msgstr ""
 
 #. Tag: title
-#: ee.xml:136
 #, no-c-format
 msgid "JMS endpoints"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:138
 #, no-c-format
-msgid ""
-"Sending messages using JMS can be quite complex, because of the number of "
-"different objects you need to deal with. For queues we have <literal>Queue</"
-"literal>, <literal>QueueConnectionFactory</literal>, "
-"<literal>QueueConnection</literal>, <literal>QueueSession</literal> and "
-"<literal>QueueSender</literal>. For topics we have <literal>Topic</literal>, "
-"<literal>TopicConnectionFactory</literal>, <literal>TopicConnection</"
-"literal>, <literal>TopicSession</literal> and <literal>TopicPublisher</"
-"literal>. Each of these objects has its own lifecycle and threading model "
-"that we need to worry about."
+msgid "Sending messages using JMS can be quite complex, because of the number of different objects you need to deal with. For queues we have <literal>Queue</literal>, <literal>QueueConnectionFactory</literal>, <literal>QueueConnection</literal>, <literal>QueueSession</literal> and <literal>QueueSender</literal>. For topics we have <literal>Topic</literal>, <literal>TopicConnectionFactory</literal>, <literal>TopicConnection</literal>, <literal>TopicSession</literal> and <literal>TopicPublisher</literal>. Each of these objects has its own lifecycle and threading model that we need to worry about."
 msgstr ""
 
 #. Tag: para
-#: ee.xml:147
 #, no-c-format
-msgid ""
-"You can use producer fields and methods to prepare all of these resources "
-"for injection into a bean:"
+msgid "You can use producer fields and methods to prepare all of these resources for injection into a bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[public class OrderResources {\n"
-"   @Resource(name=\"jms/ConnectionFactory\")\n"
-"   private ConnectionFactory connectionFactory;\n"
-"  \n"
-"   @Resource(name=\"jms/OrderQueue\")\n"
-"   private Queue orderQueue;\n"
-"  \n"
-"   @Produces @OrderConnection\n"
-"   public Connection createOrderConnection() throws JMSException {\n"
-"    return connectionFactory.createConnection();\n"
-"   }\n"
-"  \n"
-"   public void closeOrderConnection(@Disposes @OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      connection.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderSession\n"
-"   public Session createOrderSession(@OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      return connection.createSession(true, Session.AUTO_ACKNOWLEDGE);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderSession(@Disposes @OrderSession Session session)\n"
-"         throws JMSException {\n"
-"      session.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderMessageProducer\n"
-"   public MessageProducer createOrderMessageProducer(@OrderSession Session "
-"session)\n"
-"         throws JMSException {\n"
-"      return session.createProducer(orderQueue);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderMessageProducer(@Disposes @OrderMessageProducer "
-"MessageProducer producer)\n"
-"         throws JMSException {\n"
-"      producer.close();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: ee.xml:153
 #, no-c-format
-msgid ""
-"In this example, we can just inject the prepared <literal>MessageProducer</"
-"literal>, <literal>Connection</literal> or <literal>QueueSession</literal>:"
+msgid "In this example, we can just inject the prepared <literal>MessageProducer</literal>, <literal>Connection</literal> or <literal>QueueSession</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:158
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject Order order;\n"
-"@Inject @OrderMessageProducer MessageProducer producer;\n"
-"@Inject @OrderSession QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"   MapMessage msg = orderSession.createMapMessage();\n"
-"   msg.setLong(\"orderId\", order.getId());\n"
-"   ...\n"
-"   producer.send(msg);\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: ee.xml:164
 #, no-c-format
-msgid ""
-"The lifecycle of the injected JMS objects is completely controlled by the "
-"container."
+msgid "The lifecycle of the injected JMS objects is completely controlled by the container."
 msgstr ""
 
 #. Tag: title
-#: ee.xml:171
 #, no-c-format
 msgid "Packaging and deployment"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:173
 #, no-c-format
-msgid ""
-"CDI doesn't define any special deployment archive. You can package beans in "
-"JARs, EJB-JARs or WARs&#8212;any deployment location in the application "
-"classpath. However, the archive must be a \"bean archive\". That means each "
-"archive that contains beans <emphasis>must</emphasis> include a file named "
-"<literal>beans.xml</literal> in the <literal>META-INF</literal> directory of "
-"the classpath or <literal>WEB-INF</literal> directory of the web root (for "
-"WAR archives). The file may be empty. Beans deployed in archives that do not "
-"have a <literal>beans.xml</literal> file will not be available for use in "
-"the application."
+msgid "CDI doesn't define any special deployment archive. You can package beans in jars, ejb jars or wars—any deployment location in the application classpath. However, the archive must be a \"bean archive\". That means each archive that contains beans <emphasis>must</emphasis> include a file named <literal>beans.xml</literal> in the <literal>META-INF</literal> directory of the classpath or <literal>WEB-INF</literal> directory of the web root (for war archives). The file may be empty. Beans deployed in archives that do not have a <literal>beans.xml</literal> file will not be available for use in the application."
 msgstr ""
 
 #. Tag: para
-#: ee.xml:182
 #, no-c-format
-msgid ""
-"In an embeddable EJB container, beans may be deployed in any location in "
-"which EJBs may be deployed. Again, each location must contain a "
-"<literal>beans.xml</literal> file."
+msgid "In an embeddable EJB container, beans may be deployed in any location in which EJBs may be deployed. Again, each location must contain a <literal>beans.xml</literal> file."
 msgstr ""
+

Modified: doc/trunk/reference/pot/environments.pot
===================================================================
--- doc/trunk/reference/pot/environments.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/environments.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,652 +1,339 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"PO-Revision-Date: 2010-03-02T13:07:17\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: environments.xml:4
 #, no-c-format
 msgid "Application servers and environments supported by Weld"
 msgstr ""
 
 #. Tag: title
-#: environments.xml:7
 #, no-c-format
 msgid "Using Weld with JBoss AS"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:9
 #, no-c-format
-msgid ""
-"If you are using JBoss AS 5.2, no additional configuration is required to "
-"use Weld (or CDI for that matter). All you need to do is make your "
-"application a bean bean archive by adding <literal>META-INF/beans.xml</"
-"literal> to the classpath or <literal>WEB-INF/beans.xml</literal> to the web "
-"root!"
+msgid "If you are using JBoss AS 6.0, no additional configuration is required to use Weld (or CDI for that matter). All you need to do is make your application a bean bean archive by adding <literal>META-INF/beans.xml</literal> to the classpath or <literal>WEB-INF/beans.xml</literal> to the web root!"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:15
 #, no-c-format
-msgid ""
-"Unfortunately, you can't use Weld with earlier versions of JBoss AS since "
-"they are missing key libraries. If you want to learn how to upgrade the "
-"built-in support on JBoss AS 5.2, then read on."
+msgid "Unfortunately, you can't use Weld with earlier versions of JBoss AS since they are missing key libraries. If you want to learn how to upgrade the built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:20
 #, no-c-format
-msgid ""
-"Upgrading the Weld add-on is easy. The Weld distribution has a build that "
-"can take care of this task for you in a single command. First, we need to "
-"tell Weld where JBoss AS is located. Create a new file named <literal>local."
-"build.properties</literal> in the examples directory of the Weld "
-"distribution and assign the path of your JBoss AS installation to the "
-"property key <literal>jboss.home</literal>, as follows:"
+msgid "If there is a newer release of Weld than what is included in the latest JBoss AS 6 release, upgrading the Weld add-on is easy. The Weld distribution includes a build script that can take care of this task for you in a single command."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:27
+#. Tag: para
 #, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"
+msgid "First, we need to tell Weld where JBoss AS is located. This information is communicated by assigning the <literal>JBOSS_HOME</literal> environment variable. In a bash shell, you can assign the environment variable as follows:"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:29
 #, no-c-format
-msgid ""
-"Now we can install the Weld deployer from the <literal>jboss-as</literal> "
-"directory of the Weld distribution:"
+msgid "Now we can install the Weld deployer from the <literal>jboss-as</literal> directory of the Weld distribution:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:33
-#, no-c-format
-msgid ""
-"$> cd jboss-as\n"
-"$> ant update"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:36
 #, no-c-format
-msgid ""
-"A new deployer, <literal>weld.deployer</literal> is added to JBoss AS. This "
-"adds supports for JSR-299 deployments to JBoss AS, and allows Weld to query "
-"the EJB 3 container and discover which EJBs are installed in your "
-"application. It also performs an upgrade of the Javassist library, if "
-"necessary."
+msgid "A new deployer, <literal>weld.deployer</literal> is added to JBoss AS. This adds supports for JSR-299 deployments to JBoss AS, and allows Weld to query the EJB 3 container and discover which EJBs are installed in your application. It also performs an upgrade of the Javassist library, if necessary."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:46
 #, no-c-format
 msgid "GlassFish"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:48
 #, no-c-format
-msgid ""
-"Weld is also built into GlassFish from V3 onwards. Since GlassFish V3 is the "
-"Java EE 6 reference implementation, it must support all features of CDI. "
-"What better way for GlassFish to support these features than to use Weld, "
-"the JSR-299 reference implementation? Just package up your CDI application "
-"and deploy."
+msgid "Weld is also built into GlassFish from V3 onwards. Since GlassFish V3 is the Java EE 6 reference implementation, it must support all features of CDI. What better way for GlassFish to support these features than to use Weld, the JSR-299 reference implementation? Just package up your CDI application and deploy."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:56
 #, no-c-format
 msgid "Servlet containers (such as Tomcat or Jetty)"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:58
 #, no-c-format
-msgid ""
-"While JSR-299 does not require support for servlet environments, Weld can be "
-"used in any servlet container, such as Tomcat 6.0 or Jetty 6.1."
+msgid "While JSR-299 does not require support for servlet environments, Weld can be used in any servlet container, such as Tomcat 6.0 or Jetty 6.1."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:64
 #, no-c-format
-msgid ""
-"There is a major limitation to using a servlet container. Weld doesn't "
-"support deploying session beans, injection using <literal>@EJB</literal> or "
-"<literal>@PersistenceContext</literal>, or using transactional events in "
-"servlet containers. For enterprise features such as these, you should really "
-"be looking at a Java EE application server."
+msgid "There is a major limitation to using a servlet container. Weld doesn't support deploying session beans, injection using <literal>@EJB</literal> or <literal>@PersistenceContext</literal>, or using transactional events in servlet containers. For enterprise features such as these, you should really be looking at a Java EE application server."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:72
 #, no-c-format
-msgid ""
-"Weld should be used as a web application library in a servlet container. You "
-"should place <literal>weld-servlet.jar</literal> in <literal>WEB-INF/lib</"
-"literal> in the web root. <literal>weld-servlet.jar</literal> is an \"uber-"
-"jar\", meaning it bundles all the bits of Weld and CDI required for running "
-"in a servlet container, provided for your convenience. Alternatively, you "
-"could use its component jars:"
+msgid "Weld should be used as a web application library in a servlet container. You should place <literal>weld-servlet.jar</literal> in <literal>WEB-INF/lib</literal> in the web root. <literal>weld-servlet.jar</literal> is an \"uber-jar\", meaning it bundles all the bits of Weld and CDI required for running in a servlet container, provided for your convenience. Alternatively, you could use its component jars:"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:84
+#. Tag: para
 #, no-c-format
-msgid "jsr299-api.jar"
+msgid "<literal>jsr299-api.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:89
+#. Tag: para
 #, no-c-format
-msgid "weld-api.jar"
+msgid "<literal>weld-api.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:94
+#. Tag: para
 #, no-c-format
-msgid "weld-spi.jar"
+msgid "<literal>weld-spi.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:99
+#. Tag: para
 #, no-c-format
-msgid "weld-core.jar"
+msgid "<literal>weld-core.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:104
+#. Tag: para
 #, no-c-format
-msgid "weld-logging.jar"
+msgid "<literal>weld-logging.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:109
+#. Tag: para
 #, no-c-format
-msgid "weld-servlet-int.jar"
+msgid "<literal>weld-servlet-int.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:114
+#. Tag: para
 #, no-c-format
-msgid "javassist.jar"
+msgid "<literal>javassist.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:119
+#. Tag: para
 #, no-c-format
-msgid "dom4j.jar"
+msgid "<literal>dom4j.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:124
+#. Tag: para
 #, no-c-format
-msgid "google-collections.jar"
+msgid "<literal>google-collections.jar</literal>"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:129
 #, no-c-format
-msgid ""
-"You also need to explicitly specify the servlet listener (used to boot Weld, "
-"and control its interaction with requests) in <literal>WEB-INF/web.xml</"
-"literal> in the web root:"
+msgid "You also need to explicitly specify the servlet listener (used to boot Weld, and control its interaction with requests) in <literal>WEB-INF/web.xml</literal> in the web root:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:137
 #, no-c-format
 msgid "Tomcat"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:139
 #, no-c-format
-msgid ""
-"Tomcat has a read-only JNDI, so Weld can't automatically bind the "
-"BeanManager extension SPI. To bind the BeanManager into JNDI, you should "
-"populate <literal>META-INF/context.xml</literal> in the web root with the "
-"following contents:"
+msgid "Tomcat has a read-only JNDI, so Weld can't automatically bind the BeanManager extension SPI. To bind the BeanManager into JNDI, you should populate <literal>META-INF/context.xml</literal> in the web root with the following contents:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:145
-#, no-c-format
-msgid ""
-"<![CDATA[<Context>\n"
-"   <Resource name=\"BeanManager\" \n"
-"      auth=\"Container\"\n"
-"      type=\"javax.enterprise.inject.spi.BeanManager\"\n"
-"      factory=\"org.jboss.weld.resources.ManagerObjectFactory\"/>\n"
-"</Context>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:147
 #, no-c-format
-msgid ""
-"and make it available to your deployment by adding this to the bottom of "
-"<literal>web.xml</literal>:"
+msgid "and make it available to your deployment by adding this to the bottom of <literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[<resource-env-ref>\n"
-"   <resource-env-ref-name>BeanManager</resource-env-ref-name>\n"
-"   <resource-env-ref-type>\n"
-"      javax.enterprise.inject.spi.BeanManager\n"
-"   </resource-env-ref-type>\n"
-"</resource-env-ref>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:153
 #, no-c-format
-msgid ""
-"Tomcat only allows you to bind entries to <literal>java:comp/env</literal>, "
-"so the BeanManager will be available at <literal>java:comp/env/BeanManager</"
-"literal>"
+msgid "Tomcat only allows you to bind entries to <literal>java:comp/env</literal>, so the BeanManager will be available at <literal>java:comp/env/BeanManager</literal>"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:158
 #, no-c-format
-msgid ""
-"Weld also supports Servlet injection in Tomcat. To enable this, place the "
-"<literal>weld-tomcat-support.jar</literal> in <literal>$TOMCAT_HOME/lib</"
-"literal>, and add the following to <literal>META-INF/context.xml</literal>:"
+msgid "Weld also supports Servlet injection in Tomcat. To enable this, place the <literal>weld-tomcat-support.jar</literal> in <literal>$TOMCAT_HOME/lib</literal>, and add the following to <literal>META-INF/context.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:164
-#, no-c-format
-msgid ""
-"<![CDATA[<Listener className=\"org.jboss.weld.environment.tomcat."
-"WeldLifecycleListener\"/>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:169
 #, no-c-format
 msgid "Jetty"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:171
 #, no-c-format
-msgid ""
-"Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind "
-"the Manager. To bind the Manager to JNDI, you should populate <literal>WEB-"
-"INF/jetty-env.xml</literal> with the following contents:"
+msgid "Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind the Manager. To bind the Manager to JNDI, you should populate <literal>WEB-INF/jetty-env.xml</literal> with the following contents:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:176
-#, no-c-format
-msgid ""
-"<![CDATA[<!DOCTYPE Configure PUBLIC \"-//Mort Bay Consulting//DTD Configure//"
-"EN\"\n"
-"   \"http://jetty.mortbay.org/configure.dtd\">\n"
-"<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext"
-"\">\n"
-"   <New id=\"BeanManager\" class=\"org.mortbay.jetty.plus.naming.Resource"
-"\">\n"
-"      <Arg><Ref id=\"webAppCtx\"/></Arg> \n"
-"      <Arg>BeanManager</Arg>\n"
-"      <Arg>\n"
-"         <New class=\"javax.naming.Reference\">\n"
-"            <Arg>javax.enterprise.inject.spi.BeanManager</Arg> \n"
-"            <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>\n"
-"            <Arg/>\n"
-"         </New>\n"
-"      </Arg>\n"
-"   </New>\n"
-"</Configure>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:178
 #, no-c-format
-msgid ""
-"Notice that Jetty doesn't not have built-in support for an <literal>javax."
-"naming.spi.ObjectFactory</literal> like Tomcat, so it's necessary to "
-"manually create the <literal>javax.naming.Reference</literal> to wrap around "
-"it."
+msgid "Notice that Jetty doesn't not have built-in support for an <literal>javax.naming.spi.ObjectFactory</literal> like Tomcat, so it's necessary to manually create the <literal>javax.naming.Reference</literal> to wrap around it."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:184
 #, no-c-format
-msgid ""
-"Jetty only allows you to bind entries to <literal>java:comp/env</literal>, "
-"so the BeanManager will be available at <literal>java:comp/env/BeanManager</"
-"literal>"
+msgid "Jetty only allows you to bind entries to <literal>java:comp/env</literal>, so the BeanManager will be available at <literal>java:comp/env/BeanManager</literal>"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:189
 #, no-c-format
 msgid "Weld does not currently support Servlet injection in Jetty."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:198
 #, no-c-format
 msgid "Java SE"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:200
 #, no-c-format
-msgid ""
-"In addition to improved integration of the Enterprise Java stack, the "
-"\"Contexts and Dependency Injection for the Java EE platform\" specification "
-"also defines a state of the art typesafe, stateful dependency injection "
-"framework, which can prove useful in a wide range of application types. To "
-"help developers take advantage of this, Weld provides a simple means for "
-"being executed in the Java Standard Edition (SE) environment independently "
-"of any Java EE APIs."
+msgid "In addition to improved integration of the Enterprise Java stack, the \"Contexts and Dependency Injection for the Java EE platform\" specification also defines a state of the art typesafe, stateful dependency injection framework, which can prove useful in a wide range of application types. To help developers take advantage of this, Weld provides a simple means for being executed in the Java Standard Edition (SE) environment independently of any Java EE APIs."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:208
 #, no-c-format
-msgid ""
-"When executing in the SE environment the following features of Weld are "
-"available:"
+msgid "When executing in the SE environment the following features of Weld are available:"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:214
 #, no-c-format
-msgid ""
-"Managed beans with <literal>@PostConstruct</literal> and "
-"<literal>@PreDestroy</literal> lifecycle callbacks"
+msgid "Managed beans with <literal>@PostConstruct</literal> and <literal>@PreDestroy</literal> lifecycle callbacks"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:220
 #, no-c-format
 msgid "Dependency injection with qualifiers and alternatives"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:225
 #, no-c-format
-msgid ""
-"<literal>@Application</literal>, <literal>@Dependent</literal> and "
-"<literal>@Singleton</literal> scopes"
+msgid "<literal>@Application</literal>, <literal>@Dependent</literal> and <literal>@Singleton</literal> scopes"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:231
 #, no-c-format
 msgid "Interceptors and decorators"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:236
 #, no-c-format
 msgid "Stereotypes"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:241
 #, no-c-format
 msgid "Events"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:246
 #, no-c-format
 msgid "Portable extension support"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:252
 #, no-c-format
 msgid "EJB beans are not supported."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:257
 #, no-c-format
 msgid "CDI SE Module"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:259
 #, no-c-format
-msgid ""
-"Weld provides an extension which will boot a CDI bean manager in Java SE, "
-"automatically registering all simple beans found on the classpath. The "
-"command line parameters can be injected using either of the following:"
+msgid "Weld provides an extension which will boot a CDI bean manager in Java SE, automatically registering all simple beans found on the classpath. The command line parameters can be injected using either of the following:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:264
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters List<String> params;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: environments.xml:266
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters String[] paramsArray;]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:268
 #, no-c-format
 msgid "The second form is useful for compatibility with existing classes."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:273
 #, no-c-format
-msgid ""
-"The command line parameters do not become available for injection until the "
-"<literal>ContainerInitialized</literal> event is fired. If you need access "
-"to the parameters during initialization you can do so via the "
-"<literal>public static String[] getParameters()</literal> method in "
-"<literal>StartMain</literal>."
+msgid "The command line parameters do not become available for injection until the <literal>ContainerInitialized</literal> event is fired. If you need access to the parameters during initialization you can do so via the <literal>public static String[] getParameters()</literal> method in <literal>StartMain</literal>."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:282
 #, no-c-format
 msgid "Here's an example of a simple CDI SE application:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:286
-#, no-c-format
-msgid ""
-"<![CDATA[@Singleton\n"
-"public class HelloWorld\n"
-"{\n"
-"   public void printHello(@Observes ContainerInitialized event, @Parameters "
-"List<String> parameters) {\n"
-"       System.out.println(\"Hello \" + parameters.get(0));\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:292
 #, no-c-format
 msgid "Bootstrapping CDI SE"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:294
 #, no-c-format
 msgid "CDI SE applications can be bootstrapped in the following ways."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:300
 #, no-c-format
 msgid "The ContainerInitialized Event"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:302
 #, no-c-format
-msgid ""
-"Thanks to the power of CDI's typesafe event model, application developers "
-"need not write any bootstrapping code. The Weld SE module comes with a built-"
-"in main method which will bootstrap CDI for you and then fire a "
-"<literal>ContainerInitialized</literal> event. The entry point for your "
-"application code would therefore be a simple bean which observes the "
-"<literal>ContainerInitialized</literal> event, as in the previous example."
+msgid "Thanks to the power of CDI's typesafe event model, application developers need not write any bootstrapping code. The Weld SE module comes with a built-in main method which will bootstrap CDI for you and then fire a <literal>ContainerInitialized</literal> event. The entry point for your application code would therefore be a simple bean which observes the <literal>ContainerInitialized</literal> event, as in the previous example."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:310
 #, no-c-format
-msgid ""
-"In this case your application can be started by calling the provided main "
-"method like so:"
+msgid "In this case your application can be started by calling the provided main method like so:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:313
-#, no-c-format
-msgid "<![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:319
 #, no-c-format
 msgid "Programatic Bootstrap API"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:321
 #, no-c-format
-msgid ""
-"For added flexibility, CDI SE also comes with a bootstrap API which can be "
-"called from within your application in order to initialize CDI and obtain "
-"references to your application's beans and events. The API consists of two "
-"classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
+msgid "For added flexibility, CDI SE also comes with a bootstrap API which can be called from within your application in order to initialize CDI and obtain references to your application's beans and events. The API consists of two classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:327
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[public class Weld\n"
-"{\n"
-"\n"
-"   /** Boots Weld and creates and returns a WeldContainer instance, through "
-"which\n"
-"    * beans and events can be accesed. */\n"
-"   public WeldContainer initialize() {...}\n"
-"\n"
-"   /** Convenience method for shutting down the container. */\n"
-"   public void shutdown() {...}\n"
-"\n"
-"}]]>"
+msgid "Here's an example application main method which uses this API to initialize a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:329
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[public class WeldContainer\n"
-"{\n"
-"\n"
-"   /** Provides access to all beans within the application. */\n"
-"   public Instance<Object> instance() {...}\n"
-"\n"
-"   /** Provides access to all events within the application. */\n"
-"   public Event<Object> event() {...}\n"
-"\n"
-"   /** Provides direct access to the BeanManager. */\n"
-"   public BeanManager getBeanManager() {...}\n"
-"\n"
-"}]]>"
+msgid "Alternatively the application could be started by firing a custom event which would then be observed by another simple bean. The following example fires <literal>MyEvent</literal> on startup."
 msgstr ""
 
-#. Tag: para
-#: environments.xml:331
+#. Tag: title
 #, no-c-format
-msgid ""
-"Here's an example application main method which uses this API to initialize "
-"a bean of type <literal>MyApplicationBean</literal>."
+msgid "Thread Context"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:334
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.instance().select(MyApplicationBean.class).get();\n"
-"   weld.shutdown();\n"
-"}]]>"
+msgid "In contrast to Java EE applications, Java SE applications place no restrictions on developers regarding the creation and usage of threads. Therefore Weld SE provides a custom scope annotation, <literal>@ThreadScoped</literal>, and corresponding context implementation which can be used to bind bean instances to the current thread. It is intended to be used in scenarios where you might otherwise use <literal>ThreadLocal</literal>, and does in fact use <literal>ThreadLocal</literal> under the hood."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:336
 #, no-c-format
-msgid ""
-"Alternatively the application could be started by firing a custom event "
-"which would then be observed by another simple bean. The following example "
-"fires <literal>MyEvent</literal> on startup."
+msgid "To use the @ThreadScoped annotation you need to enable the <literal>RunnableDecorator</literal> which 'listens' for all executions of <literal>Runnable.run()</literal> and decorates them by setting up the thread context beforehand, bound to the current thread, and destroying the context afterwards."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:340
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.event().select(MyEvent.class).fire( new MyEvent() );\n"
-"   weld.shutdown();\n"
-"}]]>"
+msgid "It is not necessary to use @ThreadScoped in all multithreaded applications. The thread context is not intended as a replacement for defining your own application-specific contexts. It is generally only useful in situtations where you would otherwise have used ThreadLocal directly, which are typically rare."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:348
 #, no-c-format
 msgid "Setting the Classpath"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:350
 #, no-c-format
-msgid ""
-"Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld "
-"Core and all dependant classes bundled into a single jar. Therefore the only "
-"Weld jar you need on the classpath, in addition to your application's "
-"classes and dependant jars, is the Weld SE jar."
+msgid "Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld Core and all dependant classes bundled into a single jar. Therefore the only Weld jar you need on the classpath, in addition to your application's classes and dependant jars, is the Weld SE jar."
 msgstr ""
+

Modified: doc/trunk/reference/pot/events.pot
===================================================================
--- doc/trunk/reference/pot/events.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/events.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,685 +1,299 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"PO-Revision-Date: 2010-03-02T13:07:17\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: events.xml:4
 #, no-c-format
 msgid "Events"
 msgstr ""
 
 #. Tag: para
-#: events.xml:6
 #, no-c-format
-msgid ""
-"Dependency injection enables loose-coupling by allowing the implementation "
-"of the injected bean type to vary, either a deployment time or runtime. "
-"Events go one step further, allowing beans to interact with no compile time "
-"dependency at all. Event <emphasis>producers</emphasis> raise events that "
-"are delivered to event <emphasis>observers</emphasis> by the container."
+msgid "Dependency injection enables loose-coupling by allowing the implementation of the injected bean type to vary, either a deployment time or runtime. Events go one step further, allowing beans to interact with no compile time dependency at all. Event <emphasis>producers</emphasis> raise events that are delivered to event <emphasis>observers</emphasis> by the container."
 msgstr ""
 
 #. Tag: para
-#: events.xml:13
 #, no-c-format
-msgid ""
-"This basic schema might sound like the familiar observer/observable pattern, "
-"but there are a couple of twists:"
+msgid "This basic schema might sound like the familiar observer/observable pattern, but there are a couple of twists:"
 msgstr ""
 
 #. Tag: para
-#: events.xml:18
 #, no-c-format
-msgid ""
-"not only are event producers decoupled from observers; observers are "
-"completely decoupled from producers,"
+msgid "not only are event producers decoupled from observers; observers are completely decoupled from producers,"
 msgstr ""
 
 #. Tag: para
-#: events.xml:22
 #, no-c-format
-msgid ""
-"observers can specify a combination of \"selectors\" to narrow the set of "
-"event notifications they will receive, and"
+msgid "observers can specify a combination of \"selectors\" to narrow the set of event notifications they will receive, and"
 msgstr ""
 
 #. Tag: para
-#: events.xml:28
 #, no-c-format
-msgid ""
-"observers can be notified immediately, or can specify that delivery of the "
-"event should be delayed until the end of the current transaction."
+msgid "observers can be notified immediately, or can specify that delivery of the event should be delayed until the end of the current transaction."
 msgstr ""
 
 #. Tag: para
-#: events.xml:35
 #, no-c-format
-msgid ""
-"The CDI event notification facility uses more or less the same typesafe "
-"approach that we've already seen with the dependency injection service."
+msgid "The CDI event notification facility uses more or less the same typesafe approach that we've already seen with the dependency injection service."
 msgstr ""
 
 #. Tag: title
-#: events.xml:39
 #, no-c-format
 msgid "Event payload"
 msgstr ""
 
 #. Tag: para
-#: events.xml:41
 #, no-c-format
-msgid ""
-"The event object carries state from producer to consumer. The event object "
-"is nothing more than an instance of a concrete Java class. (The only "
-"restriction is that an event type may not contain type variables). An event "
-"may be assigned qualifiers, which allows observers to distinguish it from "
-"other events of the same type. The qualifiers function like topic selectors, "
-"allowing an observer to narrow the set of events it observes."
+msgid "The event object carries state from producer to consumer. The event object is nothing more than an instance of a concrete Java class. (The only restriction is that an event type may not contain type variables). An event may be assigned qualifiers, which allows observers to distinguish it from other events of the same type. The qualifiers function like topic selectors, allowing an observer to narrow the set of events it observes."
 msgstr ""
 
 #. Tag: para
-#: events.xml:48
 #, no-c-format
-msgid ""
-"An event qualifier is just a normal qualifier, defined using "
-"<literal>@Qualifier</literal>. Here's an example:"
+msgid "An event qualifier is just a normal qualifier, defined using <literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:52
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({FIELD, PARAMETER})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated {}]]>"
-msgstr ""
-
 #. Tag: title
-#: events.xml:57
 #, no-c-format
 msgid "Event observers"
 msgstr ""
 
 #. Tag: para
-#: events.xml:59
 #, no-c-format
-msgid ""
-"An <emphasis>observer method</emphasis> is a method of a bean with a "
-"parameter annotated <literal>@Observes</literal>."
+msgid "An <emphasis>observer method</emphasis> is a method of a bean with a parameter annotated <literal>@Observes</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:64
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: events.xml:66
 #, no-c-format
-msgid ""
-"The annotated parameter is called the <emphasis>event parameter</emphasis>. "
-"The type of the event parameter is the observed <emphasis>event type</"
-"emphasis>, in this case <literal>Document</literal>. The event parameter may "
-"also specify qualifiers."
+msgid "The annotated parameter is called the <emphasis>event parameter</emphasis>. The type of the event parameter is the observed <emphasis>event type</emphasis>, in this case <literal>Document</literal>. The event parameter may also specify qualifiers."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:72 events.xml:240
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: events.xml:74
 #, no-c-format
-msgid ""
-"An observer method need not specify any event qualifiers&#8212;in this case "
-"it is interested in <emphasis>all</emphasis> events of a particular type. If "
-"it does specify qualifiers, it's only interested in events which have those "
-"qualifiers."
+msgid "An observer method need not specify any event qualifiers—in this case it is interested in <emphasis>all</emphasis> events of a particular type. If it does specify qualifiers, it's only interested in events which have those qualifiers."
 msgstr ""
 
 #. Tag: para
-#: events.xml:80
 #, no-c-format
-msgid ""
-"The observer method may have additional parameters, which are injection "
-"points:"
+msgid "The observer method may have additional parameters, which are injection points:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:84
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document, User user) { ... }]]>"
-msgstr ""
-
 #. Tag: title
-#: events.xml:89
 #, no-c-format
 msgid "Event producers"
 msgstr ""
 
 #. Tag: para
-#: events.xml:91
 #, no-c-format
-msgid ""
-"Event producers fire events using an instance of the parameterized "
-"<literal>Event</literal> interface. An instance of this interface is "
-"obtained by injection:"
+msgid "Event producers fire events using an instance of the parameterized <literal>Event</literal> interface. An instance of this interface is obtained by injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:96
-#, no-c-format
-msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
-msgstr ""
-
 #. Tag: para
-#: events.xml:98
 #, no-c-format
-msgid ""
-"A producer raises events by calling the <literal>fire()</literal> method of "
-"the <literal>Event</literal> interface, passing the event object:"
+msgid "A producer raises events by calling the <literal>fire()</literal> method of the <literal>Event</literal> interface, passing the event object:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:103
-#, no-c-format
-msgid "<![CDATA[documentEvent.fire(document);]]>"
-msgstr ""
-
 #. Tag: para
-#: events.xml:105
 #, no-c-format
 msgid "This particular event will be delivered to every observer method that:"
 msgstr ""
 
 #. Tag: para
-#: events.xml:111
 #, no-c-format
-msgid ""
-"has an event parameter to which the event object (the <literal>Document</"
-"literal>) is assignable, and"
+msgid "has an event parameter to which the event object (the <literal>Document</literal>) is assignable, and"
 msgstr ""
 
 #. Tag: para
-#: events.xml:115
 #, no-c-format
 msgid "specifies no qualifiers."
 msgstr ""
 
 #. Tag: para
-#: events.xml:119
 #, no-c-format
-msgid ""
-"The container simply calls all the observer methods, passing the event "
-"object as the value of the event parameter. If any observer method throws an "
-"exception, the container stops calling observer methods, and the exception "
-"is rethrown by the <literal>fire()</literal> method."
+msgid "The container simply calls all the observer methods, passing the event object as the value of the event parameter. If any observer method throws an exception, the container stops calling observer methods, and the exception is rethrown by the <literal>fire()</literal> method."
 msgstr ""
 
 #. Tag: para
-#: events.xml:125
 #, no-c-format
 msgid "Qualifiers can be applied to an event in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: events.xml:131
 #, no-c-format
 msgid "by annotating the <literal>Event</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: events.xml:134
 #, no-c-format
-msgid ""
-"by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
-"literal>."
+msgid "by passing qualifiers to the <literal>select()</literal> of <literal>Event</literal>."
 msgstr ""
 
 #. Tag: para
-#: events.xml:138
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is far simpler:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:142
-#, no-c-format
-msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
-msgstr ""
-
 #. Tag: para
-#: events.xml:144
 #, no-c-format
-msgid ""
-"Then, every event fired via this instance of <literal>Event</literal> has "
-"the event qualifier <literal>@Updated</literal>. The event is delivered to "
-"every observer method that:"
+msgid "Then, every event fired via this instance of <literal>Event</literal> has the event qualifier <literal>@Updated</literal>. The event is delivered to every observer method that:"
 msgstr ""
 
 #. Tag: para
-#: events.xml:151
 #, no-c-format
 msgid "has an event parameter to which the event object is assignable, and"
 msgstr ""
 
 #. Tag: para
-#: events.xml:154
 #, no-c-format
-msgid ""
-"does not have any event qualifier <emphasis>except</emphasis> for the event "
-"qualifiers that match those specified at the <literal>Event</literal> "
-"injection point."
+msgid "does not have any event qualifier <emphasis>except</emphasis> for the event qualifiers that match those specified at the <literal>Event</literal> injection point."
 msgstr ""
 
 #. Tag: para
-#: events.xml:161
 #, no-c-format
-msgid ""
-"The downside of annotating the injection point is that we can't specify the "
-"qualifier dynamically. CDI lets us obtain a qualifier instance by "
-"subclassing the helper class <literal>AnnotationLiteral</literal>. That way, "
-"we can pass the qualifier to the <literal>select()</literal> method of "
-"<literal>Event</literal>."
+msgid "The downside of annotating the injection point is that we can't specify the qualifier dynamically. CDI lets us obtain a qualifier instance by subclassing the helper class <literal>AnnotationLiteral</literal>. That way, we can pass the qualifier to the <literal>select()</literal> method of <literal>Event</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:167
-#, no-c-format
-msgid ""
-"<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
-"(document);]]>"
-msgstr ""
-
 #. Tag: para
-#: events.xml:169
 #, no-c-format
-msgid ""
-"Events can have multiple event qualifiers, assembled using any combination "
-"of annotations at the <literal>Event</literal> injection point and qualifier "
-"instances passed to the <literal>select()</literal> method."
+msgid "Events can have multiple event qualifiers, assembled using any combination of annotations at the <literal>Event</literal> injection point and qualifier instances passed to the <literal>select()</literal> method."
 msgstr ""
 
 #. Tag: title
-#: events.xml:178
 #, no-c-format
 msgid "Conditional observer methods"
 msgstr ""
 
 #. Tag: para
-#: events.xml:180
 #, no-c-format
-msgid ""
-"By default, if there is no instance of an observer in the current context, "
-"the container will instantiate the observer in order to deliver an event to "
-"it. This behavior isn't always desirable. We may want to deliver events only "
-"to instances of the observer that already exist in the current contexts."
+msgid "By default, if there is no instance of an observer in the current context, the container will instantiate the observer in order to deliver an event to it. This behavior isn't always desirable. We may want to deliver events only to instances of the observer that already exist in the current contexts."
 msgstr ""
 
 #. Tag: para
-#: events.xml:186
 #, no-c-format
-msgid ""
-"A conditional observer is specified by adding <literal>receive = IF_EXISTS</"
-"literal> to the <literal>@Observes</literal> annotation."
+msgid "A conditional observer is specified by adding <literal>receive = IF_EXISTS</literal> to the <literal>@Observes</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:191
-#, no-c-format
-msgid ""
-"<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = IF_EXISTS) "
-"@Updated Document d) { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: events.xml:193
 #, no-c-format
-msgid ""
-"A bean with scope <literal>@Dependent</literal> cannot be a conditional "
-"observer, since it would never be called!"
+msgid "A bean with scope <literal>@Dependent</literal> cannot be a conditional observer, since it would never be called!"
 msgstr ""
 
 #. Tag: title
-#: events.xml:200
 #, no-c-format
 msgid "Event qualifiers with members"
 msgstr ""
 
 #. Tag: para
-#: events.xml:202
 #, no-c-format
 msgid "An event qualifier type may have annotation members:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:204
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"   RoleType value();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: events.xml:206
 #, no-c-format
-msgid ""
-"The member value is used to narrow the messages delivered to the observer:"
+msgid "The member value is used to narrow the messages delivered to the observer:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:208
-#, no-c-format
-msgid ""
-"<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
-"{ ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: events.xml:210
 #, no-c-format
-msgid ""
-"Event qualifier type members may be specified statically by the event "
-"producer, via annotations at the event notifier injection point:"
+msgid "Event qualifier type members may be specified statically by the event producer, via annotations at the event notifier injection point:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:215
-#, no-c-format
-msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
-msgstr ""
-
 #. Tag: para
-#: events.xml:217
 #, no-c-format
-msgid ""
-"Alternatively, the value of the event qualifier type member may be "
-"determined dynamically by the event producer. We start by writing an "
-"abstract subclass of <literal>AnnotationLiteral</literal>:"
+msgid "Alternatively, the value of the event qualifier type member may be determined dynamically by the event producer. We start by writing an abstract subclass of <literal>AnnotationLiteral</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:222
-#, no-c-format
-msgid ""
-"<![CDATA[abstract class RoleBinding \n"
-"   extends AnnotationLiteral<Role> \n"
-"   implements Role {}]]>"
-msgstr ""
-
 #. Tag: para
-#: events.xml:224
 #, no-c-format
-msgid ""
-"The event producer passes an instance of this class to <literal>select()</"
-"literal>:"
+msgid "The event producer passes an instance of this class to <literal>select()</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:226
-#, no-c-format
-msgid ""
-"<![CDATA[documentEvent.select(new RoleBinding() {\n"
-"   public void value() { return user.getRole(); }\n"
-"}).fire(document);]]>"
-msgstr ""
-
 #. Tag: title
-#: events.xml:231
 #, no-c-format
 msgid "Multiple event qualifiers"
 msgstr ""
 
 #. Tag: para
-#: events.xml:233
 #, no-c-format
 msgid "Event qualifier types may be combined, for example:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:235
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>(){})."
-"fire(document);]]>"
-msgstr ""
-
 #. Tag: para
-#: events.xml:237
 #, no-c-format
-msgid ""
-"When this event occurs, all of the following observer methods will be "
-"notified:"
+msgid "When this event occurs, all of the following observer methods will be notified:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:239
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
-"document) { ... }]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: events.xml:241
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
-"{ ... }]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: events.xml:242
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }}}]]>"
-msgstr ""
-
 #. Tag: title
-#: events.xml:247
 #, no-c-format
 msgid "Transactional observers"
 msgstr ""
 
 #. Tag: para
-#: events.xml:249
 #, no-c-format
-msgid ""
-"Transactional observers receive their event notifications during the before "
-"or after completion phase of the transaction in which the event was raised. "
-"For example, the following observer method needs to refresh a query result "
-"set that is cached in the application context, but only when transactions "
-"that update the <literal>Category</literal> tree succeed:"
+msgid "Transactional observers receive their event notifications during the before or after completion phase of the transaction in which the event was raised. For example, the following observer method needs to refresh a query result set that is cached in the application context, but only when transactions that update the <literal>Category</literal> tree succeed:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:256
-#, no-c-format
-msgid ""
-"<![CDATA[public void refreshCategoryTree(@Observes(during = AFTER_SUCCESS) "
-"CategoryUpdateEvent event) { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: events.xml:258
 #, no-c-format
 msgid "There are five kinds of transactional observers:"
 msgstr ""
 
 #. Tag: para
-#: events.xml:262
 #, no-c-format
-msgid ""
-"<literal>IN_PROGESS</literal> observers are called immediately (default)"
+msgid "<literal>IN_PROGESS</literal> observers are called immediately (default)"
 msgstr ""
 
 #. Tag: para
-#: events.xml:265
 #, no-c-format
-msgid ""
-"<literal>AFTER_SUCCESS</literal> observers are called during the after "
-"completion phase of the transaction, but only if the transaction completes "
-"successfully"
+msgid "<literal>AFTER_SUCCESS</literal> observers are called during the after completion phase of the transaction, but only if the transaction completes successfully"
 msgstr ""
 
 #. Tag: para
-#: events.xml:271
 #, no-c-format
-msgid ""
-"<literal>AFTER_FAILURE</literal> observers are called during the after "
-"completion phase of the transaction, but only if the transaction fails to "
-"complete successfully"
+msgid "<literal>AFTER_FAILURE</literal> observers are called during the after completion phase of the transaction, but only if the transaction fails to complete successfully"
 msgstr ""
 
 #. Tag: para
-#: events.xml:277
 #, no-c-format
-msgid ""
-"<literal>AFTER_COMPLETION</literal> observers are called during the after "
-"completion phase of the transaction"
+msgid "<literal>AFTER_COMPLETION</literal> observers are called during the after completion phase of the transaction"
 msgstr ""
 
 #. Tag: para
-#: events.xml:283
 #, no-c-format
-msgid ""
-"<literal>BEFORE_COMPLETION</literal> observers are called during the before "
-"completion phase of the transaction"
+msgid "<literal>BEFORE_COMPLETION</literal> observers are called during the before completion phase of the transaction"
 msgstr ""
 
 #. Tag: para
-#: events.xml:290
 #, no-c-format
-msgid ""
-"Transactional observers are very important in a stateful object model "
-"because state is often held for longer than a single atomic transaction."
+msgid "Transactional observers are very important in a stateful object model because state is often held for longer than a single atomic transaction."
 msgstr ""
 
 #. Tag: para
-#: events.xml:295
 #, no-c-format
-msgid ""
-"Imagine that we have cached a JPA query result set in the application scope:"
+msgid "Imagine that we have cached a JPA query result set in the application scope:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:297
-#, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   List<Product> products;\n"
-"\n"
-"   @Produces @Catalog \n"
-"   List<Product> getCatalog() {\n"
-"      if (products==null) {\n"
-"         products = em.createQuery(\"select p from Product p where p.deleted "
-"= false\")\n"
-"            .getResultList();\n"
-"      }\n"
-"      return products;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: events.xml:299
 #, no-c-format
-msgid ""
-"From time to time, a <literal>Product</literal> is created or deleted. When "
-"this occurs, we need to refresh the <literal>Product</literal> catalog. But "
-"we should wait until <emphasis>after</emphasis> the transaction completes "
-"successfully before performing this refresh!"
+msgid "From time to time, a <literal>Product</literal> is created or deleted. When this occurs, we need to refresh the <literal>Product</literal> catalog. But we should wait until <emphasis>after</emphasis> the transaction completes successfully before performing this refresh!"
 msgstr ""
 
 #. Tag: para
-#: events.xml:305
 #, no-c-format
-msgid ""
-"The bean that creates and deletes <literal>Product</literal>s could raise "
-"events, for example:"
+msgid "The bean that creates and deletes <literal>Product</literal>s could raise events, for example:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:309
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"   @PersistenceContext EntityManager em;\n"
-"   @Inject @Any Event<Product> productEvent;\n"
-"\n"
-"   public void delete(Product product) {\n"
-"      em.delete(product);\n"
-"      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
-"(product);\n"
-"   }\n"
-"    \n"
-"   public void persist(Product product) {\n"
-"      em.persist(product);\n"
-"      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
-"(product);\n"
-"   }\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: events.xml:311
 #, no-c-format
-msgid ""
-"And now <literal>Catalog</literal> can observe the events after successful "
-"completion of the transaction:"
+msgid "And now <literal>Catalog</literal> can observe the events after successful completion of the transaction:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:315
-#, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"   ...\n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
-"product) {\n"
-"      products.add(product);\n"
-"   }\n"
-"    \n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
-"product) {\n"
-"      products.remove(product);\n"
-"   }\n"
-"}]]>"
-msgstr ""

Modified: doc/trunk/reference/pot/example.pot
===================================================================
--- doc/trunk/reference/pot/example.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/example.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,252 +1,69 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"PO-Revision-Date: 2010-03-02T13:07:17\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: example.xml:4
 #, no-c-format
 msgid "JSF web application example"
 msgstr ""
 
 #. Tag: para
-#: example.xml:6
 #, no-c-format
-msgid ""
-"Let's illustrate these ideas with a full example. We're going to implement "
-"user login/logout for an application that uses JSF. First, we'll define a "
-"request-scoped bean to hold the username and password entered during login, "
-"with constraints defined using annotations from the Bean Validation "
-"specification:"
+msgid "Let's illustrate these ideas with a full example. We're going to implement user login/logout for an application that uses JSF. First, we'll define a request-scoped bean to hold the username and password entered during login, with constraints defined using annotations from the Bean Validation specification:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:12
-#, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    @NotNull @Length(min=3, max=25)\n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    @NotNull @Length(min=6, max=20)\n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:14
 #, no-c-format
 msgid "This bean is bound to the login prompt in the following JSF form:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:16
-#, no-c-format
-msgid ""
-"<![CDATA[<h:form>\n"
-"   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"      <f:validateBean>\n"
-"         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"         <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"         <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"      </f:validateBean>\n"
-"   </h:panelGrid>\n"
-"   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:18
 #, no-c-format
 msgid "Users are represented by a JPA entity:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:22
-#, no-c-format
-msgid ""
-"<![CDATA[@Entity\n"
-"public class User {\n"
-"   private @NotNull @Length(min=3, max=25) @Id String username;\n"
-"   private @NotNull @Length(min=6, max=20) String password;\n"
-"   \n"
-"   public String getUsername() { return username; }\n"
-"   public void setUsername(String username) { this.username = username; }\n"
-"   public String setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:24
 #, no-c-format
-msgid ""
-"(Note that we're also going to need a <literal>persistence.xml</literal> "
-"file to configure the JPA persistence unit containing <literal>User</"
-"literal>.)"
+msgid "(Note that we're also going to need a <literal>persistence.xml</literal> file to configure the JPA persistence unit containing <literal>User</literal>.)"
 msgstr ""
 
 #. Tag: para
-#: example.xml:29
 #, no-c-format
-msgid ""
-"The actual work is done by a session-scoped bean that maintains information "
-"about the currently logged-in user and exposes the <literal>User</literal> "
-"entity to other beans:"
+msgid "The actual work is done by a session-scoped bean that maintains information about the currently logged-in user and exposes the <literal>User</literal> entity to other beans:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:34
-#, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login implements Serializable {\n"
-"\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject @UserDatabase EntityManager userDatabase;\n"
-"\n"
-"   private User user;\n"
-"    \n"
-"   public void login() {\n"
-"      List<User> results = userDatabase.createQuery(\n"
-"         \"select u from User u where u.username = :username and u.password "
-"= :password\")\n"
-"         .setParameter(\"username\", credentials.getUsername())\n"
-"         .setParameter(\"password\", credentials.getPassword())\n"
-"         .getResultList();\n"
-"        \n"
-"      if (!results.isEmpty()) {\n"
-"         user = results.get(0);\n"
-"      }\n"
-"      else {\n"
-"         // perhaps add code here to report a failed login\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void logout() {\n"
-"      user = null;\n"
-"   }\n"
-"    \n"
-"   public boolean isLoggedIn() {\n"
-"      return user != null;\n"
-"   }\n"
-"    \n"
-"   @Produces @LoggedIn User getCurrentUser() {\n"
-"      return user;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:36
 #, no-c-format
-msgid ""
-"<literal>@LoggedIn</literal> and <literal>@UserDatabase</literal> are custom "
-"qualifier annotations:"
+msgid "<literal>@LoggedIn</literal> and <literal>@UserDatabase</literal> are custom qualifier annotations:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:38
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"public @interface LoggedIn {}]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: example.xml:40
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, PARAMETER, FIELD})\n"
-"public @interface UserDatabase {}]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:42
 #, no-c-format
-msgid ""
-"We need an adaptor bean to expose our typesafe <literal>EntityManager</"
-"literal>:"
+msgid "We need an adaptor bean to expose our typesafe <literal>EntityManager</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:46
-#, no-c-format
-msgid ""
-"<![CDATA[class UserDatabaseProducer {\n"
-"   @Produces @UserDatabase @PersistenceContext \n"
-"   static EntityManager userDatabase;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:48
 #, no-c-format
-msgid ""
-"Now <literal>DocumentEditor</literal>, or any other bean, can easily inject "
-"the current user:"
+msgid "Now <literal>DocumentEditor</literal>, or any other bean, can easily inject the current user:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:50
-#, no-c-format
-msgid ""
-"<![CDATA[public class DocumentEditor {\n"
-"   @Inject Document document;\n"
-"   @Inject @LoggedIn User currentUser;\n"
-"   @Inject @DocumentDatabase EntityManager docDatabase;\n"
-"    \n"
-"   public void save() {\n"
-"      document.setCreatedBy(currentUser);\n"
-"      docDatabase.persist(document);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:52
 #, no-c-format
 msgid "Or we can reference the current user in a JSF view:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:54
-#, no-c-format
-msgid ""
-"<![CDATA[<h:panelGroup rendered=\"#{login.loggedIn}\">\n"
-"   signed in as #{currentUser.username}\n"
-"</h:panelGroup>]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:56
 #, no-c-format
-msgid ""
-"Hopefully, this example gave you a taste of the CDI programming model. In "
-"the next chapter, we'll explore dependency injection in greater depth."
+msgid "Hopefully, this example gave you a taste of the CDI programming model. In the next chapter, we'll explore dependency injection in greater depth."
 msgstr ""
+

Modified: doc/trunk/reference/pot/extend.pot
===================================================================
--- doc/trunk/reference/pot/extend.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/extend.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,1001 +1,299 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"PO-Revision-Date: 2010-03-02T13:07:17\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: extend.xml:5
 #, no-c-format
 msgid "Portable extensions"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:7
 #, no-c-format
-msgid ""
-"CDI is intended to be a foundation for frameworks, extensions and "
-"integration with other technologies. Therefore, CDI exposes a set of SPIs "
-"for the use of developers of portable extensions to CDI. For example, the "
-"following kinds of extensions were envisaged by the designers of CDI:"
+msgid "CDI is intended to be a foundation for frameworks, extensions and integration with other technologies. Therefore, CDI exposes a set of SPIs for the use of developers of portable extensions to CDI. For example, the following kinds of extensions were envisaged by the designers of CDI:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:15
 #, no-c-format
 msgid "integration with Business Process Management engines,"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:18
 #, no-c-format
-msgid ""
-"integration with third-party frameworks such as Spring, Seam, GWT or Wicket, "
-"and"
+msgid "integration with third-party frameworks such as Spring, Seam, GWT or Wicket, and"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:23
 #, no-c-format
 msgid "new technology based upon the CDI programming model."
 msgstr ""
 
 #. Tag: para
-#: extend.xml:27
 #, no-c-format
 msgid "More formally, according to the spec:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:32
 #, no-c-format
 msgid "A portable extension may integrate with the container by:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:35
 #, no-c-format
 msgid "Providing its own beans, interceptors and decorators to the container"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:40
 #, no-c-format
-msgid ""
-"Injecting dependencies into its own objects using the dependency injection "
-"service"
+msgid "Injecting dependencies into its own objects using the dependency injection service"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:45
 #, no-c-format
 msgid "Providing a context implementation for a custom scope"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:50
 #, no-c-format
-msgid ""
-"Augmenting or overriding the annotation-based metadata with metadata from "
-"some other source"
+msgid "Augmenting or overriding the annotation-based metadata with metadata from some other source"
 msgstr ""
 
 #. Tag: title
-#: extend.xml:58
 #, no-c-format
 msgid "Creating an <literal>Extension</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:60
 #, no-c-format
-msgid ""
-"The first step in creating a portable extension is to write a class that "
-"implements <literal>Extension</literal>. This marker interface does not "
-"define any methods, but it's needed to satisfy the requirements of Java SE's "
-"service provider architecture."
+msgid "The first step in creating a portable extension is to write a class that implements <literal>Extension</literal>. This marker interface does not define any methods, but it's needed to satisfy the requirements of Java SE's service provider architecture."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:66
-#, no-c-format
-msgid "class MyExtension implements Extension { ... }"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:68
 #, no-c-format
-msgid ""
-"Next, we need to register our extension as a service provider by creating a "
-"file named <literal>META-INF/services/javax.enterprise.inject.spi.Extension</"
-"literal>, which contains the name of our extension class:"
+msgid "Next, we need to register our extension as a service provider by creating a file named <literal>META-INF/services/javax.enterprise.inject.spi.Extension</literal>, which contains the name of our extension class:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:74
-#, no-c-format
-msgid "org.mydomain.extension.MyExtension"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:76
 #, no-c-format
-msgid ""
-"An extension is not a bean, exactly, since it is instantiated by the "
-"container during the initialization process, before any beans or contexts "
-"exist. However, it can be injected into other beans once the initialization "
-"process is complete."
+msgid "An extension is not a bean, exactly, since it is instantiated by the container during the initialization process, before any beans or contexts exist. However, it can be injected into other beans once the initialization process is complete."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:82
-#, no-c-format
-msgid ""
-"@Inject \n"
-"MyBean(MyExtension myExtension) {\n"
-"   myExtension.doSomething();\n"
-"}"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:84
 #, no-c-format
-msgid ""
-"And, like beans, extensions can have observer methods. Usually, the observer "
-"methods observe <emphasis>container lifecycle events</emphasis>."
+msgid "And, like beans, extensions can have observer methods. Usually, the observer methods observe <emphasis>container lifecycle events</emphasis>."
 msgstr ""
 
 #. Tag: title
-#: extend.xml:92
 #, no-c-format
 msgid "Container lifecycle events"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:94
 #, no-c-format
-msgid ""
-"During the initialization process, the container fires a series of events, "
-"including:"
+msgid "During the initialization process, the container fires a series of events, including:"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:101
+#. Tag: para
 #, no-c-format
-msgid "BeforeBeanDiscovery"
+msgid "<literal>BeforeBeanDiscovery</literal>"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:106
+#. Tag: para
 #, no-c-format
-msgid "ProcessAnnotatedType"
+msgid "<literal>ProcessAnnotatedType</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:110
 #, no-c-format
-msgid ""
-"<literal>ProcessInjectionTarget</literal> and <literal>ProcessProducer</"
-"literal>"
+msgid "<literal>ProcessInjectionTarget</literal> and <literal>ProcessProducer</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:115
 #, no-c-format
-msgid ""
-"<literal>ProcessBean</literal> and <literal>ProcessObserverMethod</literal>"
+msgid "<literal>ProcessBean</literal> and <literal>ProcessObserverMethod</literal>"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:121
+#. Tag: para
 #, no-c-format
-msgid "AfterBeanDiscovery"
+msgid "<literal>AfterBeanDiscovery</literal>"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:126
+#. Tag: para
 #, no-c-format
-msgid "AfterDeploymentValidation"
+msgid "<literal>AfterDeploymentValidation</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:131
 #, no-c-format
 msgid "Extensions may observe these events:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:135
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"   \n"
-"   void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bbd) {\n"
-"      Logger.global.debug(\"beginning the scanning process\");\n"
-"   }\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      Logger.global.debug(\"scanning type: \" + pat.getAnnotatedType()."
-"getJavaClass().getName());\n"
-"   } \n"
-"\n"
-"   void afterBeanDiscovery(@Observes AfterBeanDiscovery abd) {\n"
-"      Logger.global.debug(\"finished the scanning process\");\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:137
 #, no-c-format
-msgid ""
-"In fact, the extension can do a lot more than just observe. The extension is "
-"permitted to modify the container's metamodel and more. Here's a very simple "
-"example:"
+msgid "In fact, the extension can do a lot more than just observe. The extension is permitted to modify the container's metamodel and more. Here's a very simple example:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:142
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      //tell the container to ignore the type if it is annotated @Ignore\n"
-"      if ( pat.getAnnotatedType().isAnnotionPresent(Ignore.class) ) pat.veto"
-"();   \n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:144
 #, no-c-format
 msgid "The observer method may inject a <literal>BeanManager</literal>"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:148
-#, no-c-format
-msgid ""
-"<![CDATA[<T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> "
-"pat, BeanManager beanManager) { ... }]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:153
 #, no-c-format
 msgid "The <literal>BeanManager</literal> object"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:155
 #, no-c-format
-msgid ""
-"The nerve center for extending CDI is the <literal>BeanManager</literal> "
-"object. The <literal>BeanManager</literal> interface lets us obtain beans, "
-"interceptors, decorators, observers and contexts programmatically."
+msgid "The nerve center for extending CDI is the <literal>BeanManager</literal> object. The <literal>BeanManager</literal> interface lets us obtain beans, interceptors, decorators, observers and contexts programmatically."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:161
-#, no-c-format
-msgid ""
-"<![CDATA[public interface BeanManager {\n"
-"   public Object getReference(Bean<?> bean, Type beanType, "
-"CreationalContext<?> ctx);\n"
-"   public Object getInjectableReference(InjectionPoint ij, "
-"CreationalContext<?> ctx);\n"
-"   public <T> CreationalContext<T> createCreationalContext(Contextual<T> "
-"contextual);\n"
-"   public Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers);\n"
-"   public Set<Bean<?>> getBeans(String name);\n"
-"   public Bean<?> getPassivationCapableBean(String id);\n"
-"   public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);\n"
-"   public void validate(InjectionPoint injectionPoint);\n"
-"   public void fireEvent(Object event, Annotation... qualifiers);\n"
-"   public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, "
-"Annotation... qualifiers);\n"
-"   public List<Decorator<?>> resolveDecorators(Set<Type> types, "
-"Annotation... qualifiers);\n"
-"   public List<Interceptor<?>> resolveInterceptors(InterceptionType type, "
-"Annotation... interceptorBindings);\n"
-"   public boolean isScope(Class<? extends Annotation> annotationType);\n"
-"   public boolean isNormalScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isPassivatingScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isQualifier(Class<? extends Annotation> annotationType);\n"
-"   public boolean isInterceptorBinding(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isStereotype(Class<? extends Annotation> annotationType);\n"
-"   public Set<Annotation> getInterceptorBindingDefinition(Class<? extends "
-"Annotation> bindingType);\n"
-"   public Set<Annotation> getStereotypeDefinition(Class<? extends "
-"Annotation> stereotype);\n"
-"   public Context getContext(Class<? extends Annotation> scopeType);\n"
-"   public ELResolver getELResolver();\n"
-"   public ExpressionFactory wrapExpressionFactory(ExpressionFactory "
-"expressionFactory);\n"
-"   public <T> AnnotatedType<T> createAnnotatedType(Class<T> type);\n"
-"   public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> "
-"type);\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:163
 #, no-c-format
-msgid ""
-"Any bean or other Java EE component which supports injection can obtain an "
-"instance of <literal>BeanManager</literal> via injection:"
+msgid "Any bean or other Java EE component which supports injection can obtain an instance of <literal>BeanManager</literal> via injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:166
-#, no-c-format
-msgid "@Inject BeanManager beanManager;"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:168
 #, no-c-format
-msgid ""
-"Java EE components may obtain an instance of <literal>BeanManager</literal> "
-"from JNDI by looking up the name <literal>java:comp/BeanManager</literal>. "
-"Any operation of <literal>BeanManager</literal> may be called at any time "
-"during the execution of the application."
+msgid "Java EE components may obtain an instance of <literal>BeanManager</literal> from JNDI by looking up the name <literal>java:comp/BeanManager</literal>. Any operation of <literal>BeanManager</literal> may be called at any time during the execution of the application."
 msgstr ""
 
 #. Tag: para
-#: extend.xml:174
 #, no-c-format
-msgid ""
-"Let's study some of the interfaces exposed by the <literal>BeanManager</"
-"literal>."
+msgid "Let's study some of the interfaces exposed by the <literal>BeanManager</literal>."
 msgstr ""
 
 #. Tag: title
-#: extend.xml:179
 #, no-c-format
 msgid "The <literal>InjectionTarget</literal> interface"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:181
 #, no-c-format
-msgid ""
-"The first thing that a framework developer is going to look for in the "
-"portable extension SPI is a way to inject CDI beans into objects which are "
-"not under the control of CDI. The <literal>InjectionTarget</literal> "
-"interface makes this very easy."
+msgid "The first thing that a framework developer is going to look for in the portable extension SPI is a way to inject CDI beans into objects which are not under the control of CDI. The <literal>InjectionTarget</literal> interface makes this very easy."
 msgstr ""
 
 #. Tag: para
-#: extend.xml:188
 #, no-c-format
-msgid ""
-"We recommend that frameworks let CDI take over the job of actually "
-"instantiating the framework-controlled objects. That way, the framework-"
-"controlled objects can take advantage of constructor injection. However, if "
-"the framework requires use of a constructor with a special signature, the "
-"framework will need to instatiate the object itself, and so only method and "
-"field injection will be supported."
+msgid "We recommend that frameworks let CDI take over the job of actually instantiating the framework-controlled objects. That way, the framework-controlled objects can take advantage of constructor injection. However, if the framework requires use of a constructor with a special signature, the framework will need to instatiate the object itself, and so only method and field injection will be supported."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:196
-#, no-c-format
-msgid ""
-"<![CDATA[//get the BeanManager from JNDI\n"
-"BeanManager beanManager = (BeanManager) new InitialContext().lookup(\"java:"
-"comp/BeanManager\");\n"
-"\n"
-"//CDI uses an AnnotatedType object to read the annotations of a class\n"
-"AnnotatedType<SomeFrameworkComponent> type = beanManager.createAnnotatedType"
-"(SomeFrameworkComponent.class);\n"
-"\n"
-"//The extension uses an InjectionTarget to delegate instantiation, "
-"dependency injection \n"
-"//and lifecycle callbacks to the CDI container\n"
-"InjectionTarget<SomeFrameworkComponent> it = beanManager."
-"createInjectionTarget(type);\n"
-"\n"
-"//each instance needs its own CDI CreationalContext\n"
-"CreationalContext ctx = beanManager.createCreationalContext(null);\n"
-"\n"
-"//instantiate the framework component and inject its dependencies\n"
-"SomeFrameworkComponent instance = it.produce(ctx);  //call the constructor\n"
-"it.inject(instance, ctx);  //call initializer methods and perform field "
-"injection\n"
-"it.postConstruct(instance);  //call the @PostConstruct method\n"
-"\n"
-"...\n"
-"\n"
-"//destroy the framework component instance and clean up dependent objects\n"
-"it.preDestroy(instance);  //call the @PreDestroy method\n"
-"it.dispose(instance);  //it is now safe to discard the instance\n"
-"ctx.release();  //clean up dependent objects\n"
-"]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:201
 #, no-c-format
 msgid "The <literal>Bean</literal> interface"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:203
 #, no-c-format
-msgid ""
-"Instances of the interface <literal>Bean</literal> represent beans. There is "
-"an instance of <literal>Bean</literal> registered with the "
-"<literal>BeanManager</literal> object for every bean in the application. "
-"There are even <literal>Bean</literal> objects representing interceptors, "
-"decorators and producer methods."
+msgid "Instances of the interface <literal>Bean</literal> represent beans. There is an instance of <literal>Bean</literal> registered with the <literal>BeanManager</literal> object for every bean in the application. There are even <literal>Bean</literal> objects representing interceptors, decorators and producer methods."
 msgstr ""
 
 #. Tag: para
-#: extend.xml:210
 #, no-c-format
-msgid ""
-"The <literal>Bean</literal> interface exposes all the interesting things we "
-"dicussed in <xref linkend=\"bean-anatomy\"/>."
+msgid "The <literal>Bean</literal> interface exposes all the interesting things we dicussed in <xref linkend=\"bean-anatomy\" />."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:215
-#, no-c-format
-msgid ""
-"<![CDATA[public interface Bean<T> extends Contextual<T> {\n"
-"   public Set<Type> getTypes();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public String getName();\n"
-"   public Set<Class<? extends Annotation>> getStereotypes();\n"
-"   public Class<?> getBeanClass();\n"
-"   public boolean isAlternative();\n"
-"   public boolean isNullable();\n"
-"   public Set<InjectionPoint> getInjectionPoints();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:217
 #, no-c-format
 msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:221
-#, no-c-format
-msgid ""
-"<![CDATA[Set<Bean<?>> allBeans = beanManager.getBeans(Obect.class, new "
-"AnnotationLiteral<Any>() {});]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:223
 #, no-c-format
-msgid ""
-"The <literal>Bean</literal> interface makes it possible for a portable "
-"extension to provide support for new kinds of beans, beyond those defined by "
-"the CDI specification. For example, we could use the <literal>Bean</literal> "
-"interface to allow objects managed by another framework to be injected into "
-"beans."
+msgid "The <literal>Bean</literal> interface makes it possible for a portable extension to provide support for new kinds of beans, beyond those defined by the CDI specification. For example, we could use the <literal>Bean</literal> interface to allow objects managed by another framework to be injected into beans."
 msgstr ""
 
 #. Tag: title
-#: extend.xml:233
 #, no-c-format
 msgid "Registering a <literal>Bean</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:235
 #, no-c-format
-msgid ""
-"The most common kind of CDI portable extension registers a bean (or beans) "
-"with the container."
+msgid "The most common kind of CDI portable extension registers a bean (or beans) with the container."
 msgstr ""
 
 #. Tag: para
-#: extend.xml:239
 #, no-c-format
-msgid ""
-"In this example, we make a framework class, <literal>SecurityManager</"
-"literal> available for injection. To make things a bit more interesting, "
-"we're going to delegate back to the container's <literal>InjectionTarget</"
-"literal> to perform instantiation and injection upon the "
-"<literal>SecurityManager</literal> instance."
+msgid "In this example, we make a framework class, <literal>SecurityManager</literal> available for injection. To make things a bit more interesting, we're going to delegate back to the container's <literal>InjectionTarget</literal> to perform instantiation and injection upon the <literal>SecurityManager</literal> instance."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[public class SecurityManagerExtension implements Extension {\n"
-"    \n"
-"    void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager "
-"bm) {\n"
-"            \n"
-"        //use this to read annotations of the class\n"
-"        AnnotatedType<SecurityManager> at = bm.createAnnotatedType"
-"(SecurityManager.class); \n"
-"\n"
-"        //use this to instantiate the class and inject dependencies\n"
-"        final InjectionTarget<SecurityManager> it = bm.createInjectionTarget"
-"(at); \n"
-"\n"
-"        abd.addBean( new Bean<SecurityManager>() {\n"
-"\n"
-"            @Override\n"
-"            public Class<?> getBeanClass() {\n"
-"                return SecurityManager.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public String getName() {\n"
-"                return \"securityManager\";\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getQualifiers() {\n"
-"                Set<Annotation> qualifiers = new HashSet<Annotation>();\n"
-"                qualifiers.add( new AnnotationLiteral<Default>() {} );\n"
-"                qualifiers.add( new AnnotationLiteral<Any>() {} );\n"
-"                return qualifiers;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<? extends Annotation> getScope() {\n"
-"                return SessionScoped.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Class<? extends Annotation>> getStereotypes() {\n"
-"                return Collections.emptySet();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypes() {\n"
-"                Set<Type> types = new HashSet<Type>();\n"
-"                types.add(SecurityManager.class);\n"
-"                types.add(Object.class);\n"
-"                return types;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAlternative() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isNullable() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public SecurityManager create(CreationalContext<SecurityManager> "
-"ctx) {\n"
-"                SecurityManager instance = it.produce(ctx);\n"
-"                it.inject(instance, ctx);\n"
-"                it.postConstruct(instance);\n"
-"                return instance;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void destroy(SecurityManager instance, \n"
-"                                CreationalContext<SecurityManager> ctx) {\n"
-"                it.preDestroy(instance);\n"
-"                it.dispose(instance);\n"
-"                ctx.release();\n"
-"            }\n"
-"            \n"
-"        } );\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:248
 #, no-c-format
-msgid ""
-"But a portable extension can also mess with beans that are discovered "
-"automatically by the container."
+msgid "But a portable extension can also mess with beans that are discovered automatically by the container."
 msgstr ""
 
 #. Tag: title
-#: extend.xml:255
 #, no-c-format
 msgid "Wrapping an <literal>AnnotatedType</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:257
 #, no-c-format
-msgid ""
-"One of the most interesting things that an extension class can do is process "
-"the annotations of a bean class <emphasis>before</emphasis> the container "
-"builds its metamodel."
+msgid "One of the most interesting things that an extension class can do is process the annotations of a bean class <emphasis>before</emphasis> the container builds its metamodel."
 msgstr ""
 
 #. Tag: para
-#: extend.xml:262
 #, no-c-format
-msgid ""
-"Let's start with an example of an extension that provides support for the "
-"use of <literal>@Named</literal> at the package level. The package-level "
-"name is used to qualify the EL names of all beans defined in that package. "
-"The portable extension uses the <literal>ProcessAnnotatedType</literal> "
-"event to wrap the <literal>AnnotatedType</literal> object and override the "
-"<literal>value()</literal> of the <literal>@Named</literal> annotation."
+msgid "Let's start with an example of an extension that provides support for the use of <literal>@Named</literal> at the package level. The package-level name is used to qualify the EL names of all beans defined in that package. The portable extension uses the <literal>ProcessAnnotatedType</literal> event to wrap the <literal>AnnotatedType</literal> object and override the <literal>value()</literal> of the <literal>@Named</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:270
-#, no-c-format
-msgid ""
-"<![CDATA[public class QualifiedNameExtension implements Extension {\n"
-"\n"
-"    <X> void processAnnotatedType(@Observes ProcessAnnotatedType<X> pat) {\n"
-"\n"
-"        //wrap this to override the annotations of the class\n"
-"        final AnnotatedType<X> at = pat.getAnnotatedType();\n"
-"        \n"
-"        AnnotatedType<X> wrapped = new AnnotatedType<X>() {\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedConstructor<X>> getConstructors() {\n"
-"                return at.getConstructors();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedField<? super X>> getFields() {\n"
-"                return at.getFields();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<X> getJavaClass() {\n"
-"                return at.getJavaClass();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedMethod<? super X>> getMethods() {\n"
-"                return at.getMethods();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public <T extends Annotation> T getAnnotation(final Class<T> "
-"annType) {\n"
-"                if ( Named.class.equals(annType) ) {\n"
-"                    class NamedLiteral \n"
-"                            extends AnnotationLiteral<Named> \n"
-"                            implements Named {\n"
-"                        @Override\n"
-"                        public String value() {\n"
-"                            Package pkg = at.getClass().getPackage();\n"
-"                            String unqualifiedName = at.getAnnotation(Named."
-"class).value();\n"
-"                            final String qualifiedName;\n"
-"                            if ( pkg.isAnnotationPresent(Named.class) ) {\n"
-"                                qualifiedName = pkg.getAnnotation(Named."
-"class).value() \n"
-"                                      + '.' + unqualifiedName;\n"
-"                            }\n"
-"                            else {\n"
-"                                qualifiedName = unqualifiedName;\n"
-"                            }\n"
-"                            return qualifiedName;\n"
-"                        }\n"
-"                    }\n"
-"                    return (T) new NamedLiteral();\n"
-"                }\n"
-"                else {\n"
-"                    return at.getAnnotation(annType);\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getAnnotations() {\n"
-"                return at.getAnnotations();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Type getBaseType() {\n"
-"                return at.getBaseType();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypeClosure() {\n"
-"                return at.getTypeClosure();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annType) {\n"
-"                return at.isAnnotationPresent(annType);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pat.setAnnotatedType(wrapped);\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:272
 #, no-c-format
-msgid ""
-"Here's a second example, which adds the <literal>@Alternative</literal> "
-"annotation to any class which implements a certain <literal>Service</"
-"literal> interface."
+msgid "Here's a second example, which adds the <literal>@Alternative</literal> annotation to any class which implements a certain <literal>Service</literal> interface."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:277
-#, no-c-format
-msgid ""
-"<![CDATA[class ServiceAlternativeExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"   \n"
-"      final AnnotatedType<T> type = pat.getAnnotatedType();\n"
-"      \n"
-"      if ( Service.class.isAssignableFrom( type.getJavaClass() ) ) {\n"
-"      \n"
-"         //if the class implements Service, make it an @Alternative\n"
-"         AnnotatedType<T> wrapped = new AnnotatedType<T>() {\n"
-"         \n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annotationType) {\n"
-"               return annotationType.equals(Alternative.class) ? \n"
-"                  true : type.isAnnotationPresent(annotationType);\n"
-"            }\n"
-"            \n"
-"            //remaining methods of AnnotatedType\n"
-"            ...\n"
-"         }\n"
-"         \n"
-"         pat.setAnnotatedType(wrapped);\n"
-"      }\n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:283
 #, no-c-format
-msgid ""
-"The <literal>AnnotatedType</literal> is not the only thing that can be "
-"wrapped by an extension."
+msgid "The <literal>AnnotatedType</literal> is not the only thing that can be wrapped by an extension."
 msgstr ""
 
 #. Tag: title
-#: extend.xml:288
 #, no-c-format
 msgid "Wrapping an <literal>InjectionTarget</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:290
 #, no-c-format
-msgid ""
-"The <literal>InjectionTarget</literal> interface exposes operations for "
-"producing and disposing an instance of a component, injecting its "
-"dependencies and invoking its lifecycle callbacks. A portable extension may "
-"wrap the <literal>InjectionTarget</literal> for any Java EE component that "
-"supports injection, allowing it to intercept any of these operations when "
-"they are invoked by the container."
+msgid "The <literal>InjectionTarget</literal> interface exposes operations for producing and disposing an instance of a component, injecting its dependencies and invoking its lifecycle callbacks. A portable extension may wrap the <literal>InjectionTarget</literal> for any Java EE component that supports injection, allowing it to intercept any of these operations when they are invoked by the container."
 msgstr ""
 
 #. Tag: para
-#: extend.xml:297
 #, no-c-format
-msgid ""
-"Here's a CDI portable extension that reads values from properties files and "
-"configures fields of Java EE components, including servlets, EJBs, managed "
-"beans, interceptors and more. In this example, properties for a class such "
-"as <literal>org.mydomain.blog.Blogger</literal> go in a resource named "
-"<literal>org/mydomain/blog/Blogger.properties</literal>, and the name of a "
-"property must match the name of the field to be configured. So "
-"<literal>Blogger.properties</literal> could contain:"
+msgid "Here's a CDI portable extension that reads values from properties files and configures fields of Java EE components, including servlets, EJBs, managed beans, interceptors and more. In this example, properties for a class such as <literal>org.mydomain.blog.Blogger</literal> go in a resource named <literal>org/mydomain/blog/Blogger.properties</literal>, and the name of a property must match the name of the field to be configured. So <literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:305
-#, no-c-format
-msgid ""
-"firstName=Gavin\n"
-"lastName=King"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:307
 #, no-c-format
-msgid ""
-"The portable extension works by wrapping the containers "
-"<literal>InjectionTarget</literal> and setting field values from the "
-"<literal>inject()</literal> method."
+msgid "The portable extension works by wrapping the containers <literal>InjectionTarget</literal> and setting field values from the <literal>inject()</literal> method."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:310
-#, no-c-format
-msgid ""
-"<![CDATA[public class ConfigExtension implements Extension {\n"
-"\n"
-"        <X> void processInjectionTarget(@Observes ProcessInjectionTarget<X> "
-"pit) {\n"
-"                \n"
-"                //wrap this to intercept the component lifecycle\n"
-"            final InjectionTarget<X> it = pit.getInjectionTarget();\n"
-"            \n"
-"        final Map<Field, Object> configuredValues = new HashMap<Field, "
-"Object>();\n"
-"        \n"
-"        //use this to read annotations of the class and its members\n"
-"        AnnotatedType<X> at = pit.getAnnotatedType();\n"
-"        \n"
-"        //read the properties file\n"
-"        String propsFileName = at.getClass().getSimpleName() + \".properties"
-"\";\n"
-"        InputStream stream = at.getJavaClass().getResourceAsStream"
-"(propsFileName);\n"
-"        if (stream!=null) {\n"
-"            \n"
-"            try {\n"
-"                Properties props = new Properties();\n"
-"                props.load(stream);\n"
-"                for (Map.Entry<Object, Object> property : props.entrySet()) "
-"{\n"
-"                    String fieldName = property.getKey().toString();\n"
-"                    Object value = property.getValue();\n"
-"                    try {\n"
-"                        Field field = at.getJavaClass().getField"
-"(fieldName);\n"
-"                        field.setAccessible(true);\n"
-"                        if ( field.getType().isAssignableFrom( value.getClass"
-"() ) ) {\n"
-"                            configuredValues.put(field, value);\n"
-"                        }\n"
-"                        else {\n"
-"                            //TODO: do type conversion automatically\n"
-"                            pit.addDefinitionError( new InjectionException(\n"
-"                                   \"field is not of type String: \" + "
-"field ) );\n"
-"                        }\n"
-"                    }\n"
-"                    catch (NoSuchFieldException nsfe) {\n"
-"                        pit.addDefinitionError(nsfe);\n"
-"                    }\n"
-"                    finally {\n"
-"                        stream.close();\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"            catch (IOException ioe) {\n"
-"                pit.addDefinitionError(ioe);\n"
-"            }\n"
-"        }\n"
-"        \n"
-"        InjectionTarget<X> wrapped = new InjectionTarget<X>() {\n"
-"\n"
-"            @Override\n"
-"            public void inject(X instance, CreationalContext<X> ctx) {\n"
-"                it.inject(instance, ctx);\n"
-"                \n"
-"                //set the values onto the new instance of the component\n"
-"                for (Map.Entry<Field, Object> configuredValue: "
-"configuredValues.entrySet()) {\n"
-"                    try {\n"
-"                        configuredValue.getKey().set(instance, "
-"configuredValue.getValue());\n"
-"                    }\n"
-"                    catch (Exception e) {\n"
-"                        throw new InjectionException(e);\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void postConstruct(X instance) {\n"
-"                it.postConstruct(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void preDestroy(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void dispose(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public X produce(CreationalContext<X> ctx) {\n"
-"                return it.produce(ctx);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pit.setInjectionTarget(wrapped);\n"
-"        \n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:312
 #, no-c-format
-msgid ""
-"There's a lot more to the portable extension SPI than what we've discussed "
-"here. Check out the CDI spec or Javadoc for more information. For now, we'll "
-"just mention one more extension point."
+msgid "There's a lot more to the portable extension SPI than what we've discussed here. Check out the CDI spec or Javadoc for more information. For now, we'll just mention one more extension point."
 msgstr ""
 
 #. Tag: title
-#: extend.xml:320
 #, no-c-format
 msgid "The <literal>Context</literal> interface"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:322
 #, no-c-format
-msgid ""
-"The <literal>Context</literal> interface supports addition of new scopes to "
-"CDI, or extension of the built-in scopes to new environments."
+msgid "The <literal>Context</literal> interface supports addition of new scopes to CDI, or extension of the built-in scopes to new environments."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:327
-#, no-c-format
-msgid ""
-"<![CDATA[public interface Context {\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
-"creationalContext);\n"
-"   public <T> T get(Contextual<T> contextual);\n"
-"   boolean isActive();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:329
 #, no-c-format
-msgid ""
-"For example, we might implement <literal>Context</literal> to add a business "
-"process scope to CDI, or to add support for the conversation scope to an "
-"application that uses Wicket."
+msgid "For example, we might implement <literal>Context</literal> to add a business process scope to CDI, or to add support for the conversation scope to an application that uses Wicket."
 msgstr ""
+

Modified: doc/trunk/reference/pot/extensions.pot
===================================================================
--- doc/trunk/reference/pot/extensions.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/extensions.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,89 +1,49 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"PO-Revision-Date: 2010-03-02T13:07:17\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: extensions.xml:8
 #, no-c-format
 msgid "CDI extensions available as part of Weld"
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:11
 #, no-c-format
 msgid "These modules are usable on any JSR-299 implementation, not just Weld!"
 msgstr ""
 
 #. Tag: title
-#: extensions.xml:17
 #, no-c-format
 msgid "Weld Logger"
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:19
 #, no-c-format
-msgid ""
-"Adding logging to your application is now even easier with simple injection "
-"of a logger object into any CDI bean. Simply create an injection point of "
-"type <literal>org.slf4j.Logger</literal> and an appropriate logger object "
-"will be injected into any instance of the bean."
+msgid "Adding logging to your application is now even easier with simple injection of a logger object into any CDI bean. Simply create an injection point of type <literal>org.slf4j.Logger</literal> and an appropriate logger object will be injected into any instance of the bean."
 msgstr ""
 
-#. Tag: programlisting
-#: extensions.xml:25
-#, no-c-format
-msgid ""
-"<![CDATA[import org.slf4j.Logger;\n"
-"import javax.inject.Inject;\n"
-"\n"
-"public class Checkout {\n"
-"   private @Inject Logger log;\n"
-"\n"
-"   public void invoiceItems() {\n"
-"      ShoppingCart cart;\n"
-"      ...\n"
-"      log.debug(\"Items invoiced for {}\", cart);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extensions.xml:27
 #, no-c-format
-msgid ""
-"The example shows how objects can be interpolated into a message. If you use "
-"this approach, you do not need to surround a call to the logger with a "
-"condition like <literal>if ( log.isDebugEnabled() )</literal> to avoid "
-"string concatenation."
+msgid "The example shows how objects can be interpolated into a message. If you use this approach, you do not need to surround a call to the logger with a condition like <literal>if ( log.isDebugEnabled() )</literal> to avoid string concatenation."
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:34
 #, no-c-format
-msgid ""
-"You can add Weld logging to your project by including weld-logger.jar, sl4j-"
-"api.jar and sl4j-jdk14.jar to your project. Alternatively, express a "
-"dependency on the <literal>org.jboss.weld:weld-logger</literal> Maven "
-"artifact."
+msgid "You can add Weld logging to your project by including weld-logger.jar, sl4j-api.jar and sl4j-jdk14.jar to your project. Alternatively, express a dependency on the <literal>org.jboss.weld:weld-logger</literal> Maven artifact."
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:39
 #, no-c-format
-msgid ""
-"If you are using Weld as your JSR-299 implementation, there's no need to "
-"include sl4j as it's already included (and used internally)."
+msgid "If you are using Weld as your JSR-299 implementation, there's no need to include sl4j as it's already included (and used internally)."
 msgstr ""
+

Modified: doc/trunk/reference/pot/gettingstarted.pot
===================================================================
--- doc/trunk/reference/pot/gettingstarted.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/gettingstarted.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,943 +1,444 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"PO-Revision-Date: 2010-03-02T13:07:17\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: gettingstarted.xml:5
 #, no-c-format
 msgid "Getting started with Weld"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:7
 #, no-c-format
-msgid ""
-"Weld comes with two starter example applications, in addition to more "
-"specialized examples. The first, <literal>weld-numberguess</literal>, is a "
-"web (WAR) example containing only non-transactional managed beans. This "
-"example can be run on a wide range of servers, including JBoss AS, "
-"GlassFish, Apache Tomcat, Jetty, Google App Engine, and any compliant Java "
-"EE 6 container. The second example, <literal>weld-translator</literal>, is "
-"an enterprise (EAR) example that contains session beans. This example must "
-"be run on JBoss AS 5.2, Glassfish 3.0 or any compliant Java EE 6 container."
+msgid "Weld comes with two starter example applications, in addition to more specialized examples. The first, <literal>weld-numberguess</literal>, is a web (war) example containing only non-transactional managed beans. This example can be run on a wide range of servers, including JBoss AS, GlassFish, Apache Tomcat, Jetty, Google App Engine, and any compliant Java EE 6 container. The second example, <literal>weld-translator</literal>, is an enterprise (ear) example that contains session beans. This example must be run on JBoss AS 6.0, Glassfish 3.0 or any compliant Java EE 6 container."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:16
 #, no-c-format
-msgid ""
-"Both examples use JSF 2.0 as the web framework and, as such, can be found in "
-"the <literal>examples/jsf</literal> directory of the Weld distribution."
+msgid "Both examples use JSF 2.0 as the web framework and, as such, can be found in the <literal>examples/jsf</literal> directory of the Weld distribution."
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:22
 #, no-c-format
 msgid "Prerequisites"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:24
 #, no-c-format
-msgid ""
-"To run the examples with the provided build scripts, you'll need the "
-"following:"
+msgid "To run the examples with the provided build scripts, you'll need the following:"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:30
 #, no-c-format
 msgid "the latest release of Weld, which contains the examples"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:33
 #, no-c-format
 msgid "Ant 1.7.0, to build and deploy the examples"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:36
 #, no-c-format
 msgid "a supported runtime environment (minimum versions shown)"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:39
 #, no-c-format
-msgid ""
-"JBoss AS 5.2.0 (currently only nightly builds of JBoss AS 5.2.0.Beta1 are "
-"available),"
+msgid "JBoss AS 6.0.0,"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:42
 #, no-c-format
 msgid "GlassFish 3.0,"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:45
 #, no-c-format
-msgid "Apache Tomcat 6.0.x (WAR example only), or"
+msgid "Apache Tomcat 6.0.x (war example only), or"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:48
 #, no-c-format
-msgid "Jetty 6.1.x (WAR example only)"
+msgid "Jetty 6.1.x (war example only)"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:53
 #, no-c-format
-msgid ""
-"(optionally) Maven 2.x, to run the examples in an embedded servlet container"
+msgid "(optionally) Maven 2.x, to run the examples in an embedded servlet container"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:58
 #, no-c-format
-msgid ""
-"You'll need a full install of Ant 1.7.0. Some linux distributions only "
-"supply a partial installation of Ant which cause the build to fail. If you "
-"encounter problems, verify that ant-nodeps.jar is on the classpath."
+msgid "You'll need a full install of Ant 1.7.0. Some linux distributions only supply a partial installation of Ant which cause the build to fail. If you encounter problems, verify that ant-nodeps.jar is on the classpath."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:64
 #, no-c-format
-msgid ""
-"In the next few sections, you'll be using the Ant command (<literal>ant</"
-"literal>) to invoke the Ant build script in each example to compile, "
-"assemble and deploy the example to JBoss AS and, for the WAR example, Apache "
-"Tomcat. You can also deploy the generated artifact (WAR or EAR) to any other "
-"container that supports Java EE 6, such as GlassFish 3."
+msgid "In the next few sections, you'll be using the Ant command (<literal>ant</literal>) to invoke the Ant build script in each example to compile, assemble and deploy the example to JBoss AS and, for the war example, Apache Tomcat. You can also deploy the generated artifact (war or ear) to any other container that supports Java EE 6, such as GlassFish 3."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:71
 #, no-c-format
-msgid ""
-"If you have Maven installed, you can use the Maven command (<literal>mvn</"
-"literal>) to compile and assemble the standalone artifact (WAR or EAR) and, "
-"for the WAR example, run it in an embedded container."
+msgid "If you have Maven installed, you can use the Maven command (<literal>mvn</literal>) to compile and assemble the standalone artifact (war or ear) and, for the war example, run it in an embedded container."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:76
 #, no-c-format
-msgid ""
-"The sections below cover the steps for deploying with both Ant and Maven in "
-"detail. Let's start with JBoss AS."
+msgid "The sections below cover the steps for deploying with both Ant and Maven in detail. Let's start with JBoss AS."
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:81
 #, no-c-format
 msgid "Deploying to JBoss AS"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:83
 #, no-c-format
-msgid ""
-"To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss."
-"org/jbossas/\">JBoss AS 5.2.0.Beta1</ulink> or above. If a release of the "
-"JBoss AS 5.2 line isn't yet available, you can download a <ulink url="
-"\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-5.x-sun16/"
-"\">nightly snapshot</ulink>. The reason JBoss AS 5.2.0.Beta1 or above is "
-"required is because it's the first release that has both CDI and Bean "
-"Validation support built-in, making it close enough to Java EE 6 to run the "
-"examples. The good news is that there are no additional modifications you "
-"have to make to the server. It's ready to go!"
+msgid "To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss.org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS 6.0 line isn't yet available, you can download a <ulink url=\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the first release that has both CDI and Bean Validation support built-in, making it close enough to Java EE 6 to run the examples. The good news is that there are no additional modifications you have to make to the server. It's ready to go!"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:92
 #, no-c-format
-msgid ""
-"After you have downloaded JBoss AS, extract it. (We recommended renaming the "
-"folder to include the <literal>as</literal> qualifier so it's clear that "
-"it's the application server). You can move the extracted folder anywhere you "
-"like. Wherever it lays to rest, that's what we'll call the JBoss AS "
-"installation directory, or <literal>JBOSS_HOME</literal>."
+msgid "After you have downloaded JBoss AS, extract it. (We recommended renaming the folder to include the <literal>as</literal> qualifier so it's clear that it's the application server). You can move the extracted folder anywhere you like. Wherever it lays to rest, that's what we'll call the JBoss AS installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[$> unzip jboss-5.2.*.zip\n"
-"$> mv jboss-5.2.*/ jboss-as-5.2]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:101
 #, no-c-format
-msgid ""
-"In order for the build scripts to know where to deploy the example, you have "
-"to tell them where to find your JBoss AS installation (i.e., "
-"<literal>JBOSS_HOME</literal>). Create a new file named <literal>local.build."
-"properties</literal> in the examples directory of the Weld distribution and "
-"assign the path of your JBoss AS installation to the property key "
-"<literal>jboss.home</literal>, as follows:"
+msgid "In order for the build scripts to know where to deploy the example, you have to tell them where to find your JBoss AS installation (i.e., <literal>JBOSS_HOME</literal>). Create a new file named <literal>local.build.properties</literal> in the examples directory of the Weld distribution and assign the path of your JBoss AS installation to the property key <literal>jboss.home</literal>, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:108
-#, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:110
 #, no-c-format
 msgid "You're now ready to deploy your first example!"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:114
 #, no-c-format
-msgid ""
-"Switch to the <literal>examples/jsf/numberguess</literal> directory and "
-"execute the Ant <literal>deploy</literal> target:"
+msgid "Switch to the <literal>examples/jsf/numberguess</literal> directory and execute the Ant <literal>deploy</literal> target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:119
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:121
 #, no-c-format
-msgid ""
-"If you haven't already, start JBoss AS. You can either start JBoss AS from a "
-"Linux shell:"
+msgid "If you haven't already, start JBoss AS. You can either start JBoss AS from a Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:125
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/jboss-as-5.2\n"
-"$> ./bin/run.sh]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:127 gettingstarted.xml:369
 #, no-c-format
 msgid "a Windows command window:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:131
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\jboss-as-5.2\\bin\n"
-"$> run]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:133 gettingstarted.xml:375
 #, no-c-format
 msgid "or you can start the server using an IDE, like Eclipse."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:138
 #, no-c-format
-msgid ""
-"If you are using Eclipse, you should seriously consider installing the "
-"<ulink url=\"http://www.jboss.org/tools\">JBoss Tools</ulink> add-ons, which "
-"include a wide variety of tooling for JSR-299 and Java EE development, as "
-"well as an enhanced JBoss AS server view."
+msgid "If you are using Eclipse, you should seriously consider installing the <ulink url=\"http://www.jboss.org/tools\">JBoss Tools</ulink> add-ons, which include a wide variety of tooling for JSR-299 and Java EE development, as well as an enhanced JBoss AS server view."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:145
 #, no-c-format
-msgid ""
-"Wait a few seconds for the application to deploy (or the application server "
-"to start) and see if you can determine the most efficient approach to "
-"pinpoint the random number at the local URL <ulink url=\"http://"
-"localhost:8080/weld-numberguess\">http://localhost:8080/weld-numberguess</"
-"ulink>."
+msgid "Wait a few seconds for the application to deploy (or the application server to start) and see if you can determine the most efficient approach to pinpoint the random number at the local URL <ulink url=\"http://localhost:8080/weld-numberguess\">http://localhost:8080/weld-numberguess</ulink>."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:152
 #, no-c-format
-msgid ""
-"The Ant build script includes additional targets for JBoss AS to deploy and "
-"undeploy the archive in either exploded or packaged format and to tidy "
-"things up."
+msgid "The Ant build script includes additional targets for JBoss AS to deploy and undeploy the archive in either exploded or packaged format and to tidy things up."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:158
 #, no-c-format
-msgid ""
-"<literal>ant restart</literal> - deploy the example in exploded format to "
-"JBoss AS"
+msgid "<literal>ant restart</literal> - deploy the example in exploded format to JBoss AS"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:163
 #, no-c-format
-msgid ""
-"<literal>ant explode</literal> - update an exploded example, without "
-"restarting the deployment"
+msgid "<literal>ant explode</literal> - update an exploded example, without restarting the deployment"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:168
 #, no-c-format
-msgid ""
-"<literal>ant deploy</literal> - deploy the example in compressed jar format "
-"to JBoss AS"
+msgid "<literal>ant deploy</literal> - deploy the example in compressed jar format to JBoss AS"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:173
 #, no-c-format
 msgid "<literal>ant undeploy</literal> - remove the example from JBoss AS"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:178
 #, no-c-format
 msgid "<literal>ant clean</literal> - clean the example"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:185
 #, no-c-format
-msgid ""
-"The second starter example, <literal>weld-translator</literal>, will "
-"translate your text into Latin. (Well, not really, but the stub is there for "
-"you to implement, at least. Good luck!) To try it out, switch to the "
-"translator example directory and execute the deploy target:"
+msgid "The second starter example, <literal>weld-translator</literal>, will translate your text into Latin. (Well, not really, but the stub is there for you to implement, at least. Good luck!) To try it out, switch to the translator example directory and execute the deploy target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:191
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/translator\n"
-"$> ant deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:194
 #, no-c-format
-msgid ""
-"The translator uses session beans, which are packaged in an EJB module "
-"within an EAR. Java EE 6 will allow session beans to be deployed in WAR "
-"modules, but that's a topic for a later chapter."
+msgid "The translator uses session beans, which are packaged in an EJB module within an ear. Java EE 6 will allow session beans to be deployed in war modules, but that's a topic for a later chapter."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:200
 #, no-c-format
-msgid ""
-"Again, wait a few seconds for the application to deploy (if you're really "
-"bored, read the log messages), and visit <ulink url=\"http://localhost:8080/"
-"weld-translator\">http://localhost:8080/weld-translator</ulink> to begin "
-"pseudo-translating."
+msgid "Again, wait a few seconds for the application to deploy (if you're really bored, read the log messages), and visit <ulink url=\"http://localhost:8080/weld-translator\">http://localhost:8080/weld-translator</ulink> to begin pseudo-translating."
 msgstr ""
 
-#. Tag: para
-#: gettingstarted.xml:206
-#, no-c-format
-msgid ""
-"TODO Insert note about upgrading the Weld deployer that directs reader to "
-"section on the JBoss AS environment"
-msgstr ""
-
 #. Tag: title
-#: gettingstarted.xml:213
 #, no-c-format
 msgid "Deploying to GlassFish"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:215
 #, no-c-format
-msgid ""
-"Deploying to GlassFish should be easy, right? After all, it's the Java EE 6 "
-"reference implementation. Since it's the Java EE 6 reference implementation, "
-"that means it also bundles the JSR-299 reference implementation, Weld! So "
-"yes, it's very easy."
+msgid "Deploying to GlassFish should be easy and familiar, right? After all, it's the Java EE 6 reference implementation and Weld is the JSR-299 reference implementation, meaning Weld gets bundled with GlassFish. So yes, it's all quite easy and familiar."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:221
 #, no-c-format
-msgid ""
-"To deploy the examples to GlassFish, you'll need the final <ulink url="
-"\"https://glassfish.dev.java.net/\">GlassFish V3</ulink> release (the "
-"preview release won't do). If the final release isn't yet available, you can "
-"download a <ulink url=\"http://download.java.net/glassfish/v3/promoted/"
-"\">promoted build</ulink> in the meantime. Select the b69 preview release or "
-"above that ends in either <literal>-unix.sh</literal> or <literal>-windows."
-"exe</literal> depending on your platform. After the download is complete, "
-"execute the installer. On Linux/Unix, you'll need to first make the script "
-"executable."
+msgid "To deploy the examples to GlassFish, you'll need the final <ulink url=\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</ulink> release. Select the release that ends in either <literal>-unix.sh</literal> or <literal>-windows.exe</literal> depending on your platform. After the download is complete, execute the installer. On Linux/Unix, you'll need to first make the script executable."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:231
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[$> chmod 755 glassfish-v3-b69-unix.sh\n"
-"$> ./glassfish-v3-b69-unix.sh]]>"
+msgid "On Windows you can just click on the executable. Follow the instructions in the installer. It will create a single domain named <literal>domain1</literal>. You'll use that domain to deploy the example. We recommend that you choose <literal>7070</literal> as the main HTTP port to avoid conflicts with a running instance of JBoss AS (or Apache Tomcat)."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:233
 #, no-c-format
-msgid ""
-"On Windows you can just click on the executable. Follow the instructions in "
-"the installer. It will create a single domain named <literal>domain1</"
-"literal>. You'll use that domain to deploy the example. We recommend that "
-"you choose <literal>7070</literal> as the main HTTP port to avoid conflicts "
-"with a running instance of JBoss AS (or Apache Tomcat)."
+msgid "If you've deployed either of the starter examples, <literal>weld-numberguess</literal> or <literal>weld-translator</literal>, to JBoss AS, then you already have the deployable artifact you need. If not, switch to either of the two directories and build it."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:240
 #, no-c-format
-msgid ""
-"If you've deployed either of the starter examples, <literal>weld-"
-"numberguess</literal> or <literal>weld-translator</literal>, to JBoss AS, "
-"then you already have the deployable artifact you need. If not, switch to "
-"either of the two directories and build it."
+msgid "The deployable archive for the <literal>weld-numberguess</literal>, named <literal>weld-numberguess.war</literal>, ends up in the example's <literal>target</literal> directory. The archive for the <literal>weld-translator</literal> example, named <literal>weld-translator.ear</literal>, ends up in the example's <literal>ear/target</literal> directory. All you need to do now is deploy them to GlassFish."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess (or examples/jsf/translator)\n"
-"$> ant package]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:248
 #, no-c-format
-msgid ""
-"The deployable archive for the <literal>weld-numberguess</literal>, named "
-"<literal>weld-numberguess.war</literal>, ends up in the example's "
-"<literal>target</literal> directory. The archive for the <literal>weld-"
-"translator</literal> example, named <literal>weld-translator.ear</literal>, "
-"ends up in the example's <literal>ear/target</literal> directory. All you "
-"need to do now is deploy them to GlassFish."
+msgid "One way to deploy applications to GlassFish is by using the <ulink url=\"http://localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin Console running, you need to start a GlassFish domain, in our case <literal>domain1</literal>. Switch to the <literal>bin</literal> folder in the directory where you installed GlassFish and execute the following command:"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:255
 #, no-c-format
-msgid ""
-"You deploy applications to GlassFish using the <ulink url=\"http://"
-"localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin Console "
-"running, you need to start a GlassFish domain, in our case <literal>domain1</"
-"literal>. Switch to the <literal>bin</literal> folder in the directory where "
-"you installed GlassFish and execute the following command:"
+msgid "After a few seconds you can visit the Admin Console in the browser at the URL <ulink url=\"http://localhost:4848\">http://localhost:4848</ulink>. In the tree on the left-hand side of the page, click on \"Applications\", then click on the \"Deploy...\" button under the heading \"Applications\" and select the deployable artifact for either of the two examples. The deployer should recognize that you have selected a Java EE artifact and allow you to start it. You can see the examples running at either <ulink url=\"http://localhost:7070/weld-numberguess\">http://localhost:7070/weld-numberguess</ulink> or <ulink url=\"http://localhost:7070/weld-translator\">http://localhost:7070/weld-translator</ulink>, depending on which example you deployed."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:262
-#, no-c-format
-msgid "<![CDATA[$> asadmin start-domain domain1]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:264
 #, no-c-format
-msgid ""
-"After a few seconds you can visit the Admin Console in the browser at the "
-"URL <ulink url=\"http://localhost:4848\">http://localhost:4848</ulink>. In "
-"the tree on the left-hand side of the page, click on \"Applications\", then "
-"click on the \"Deploy...\" button under the heading \"Applications\" and "
-"select the deployable artifact for either of the two examples. The deployer "
-"should recognize that you have selected a Java EE artifact and allow you to "
-"start it. You can see the examples running at either <ulink url=\"http://"
-"localhost:7070/weld-numberguess\">http://localhost:7070/weld-numberguess</"
-"ulink> or <ulink url=\"http://localhost:7070/weld-translator\">http://"
-"localhost:7070/weld-translator</ulink>, depending on which example you "
-"deployed."
+msgid "Alternatively, you can deploy the application to GlassFish using the asadmin command:"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:276
 #, no-c-format
-msgid ""
-"The reason the same artifact can be deployed to both JBoss AS and GlassFish, "
-"without any modifications, is because all of the features being used are "
-"part of the standard platform. And what a capable platform it has become!"
+msgid "The reason the same artifact can be deployed to both JBoss AS and GlassFish, without any modifications, is because all of the features being used are part of the standard platform. And what a capable platform it has become!"
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:285
 #, no-c-format
 msgid "Deploying to Apache Tomcat"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:287
 #, no-c-format
-msgid ""
-"Servlet containers are not required to support Java EE services like CDI. "
-"However, you can use CDI in a servlet container like Tomcat by embedding a "
-"standalone CDI implementation such as Weld."
+msgid "Servlet containers are not required to support Java EE services like CDI. However, you can use CDI in a servlet container like Tomcat by embedding a standalone CDI implementation such as Weld."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:291
 #, no-c-format
-msgid ""
-"Weld comes with a servlet listener which bootstraps the CDI environment, "
-"registers the <literal>BeanManager</literal> in JNDI and provides injection "
-"into servlets. Basically, it emulates some of the work done by the Java EE "
-"container. (But you don't get enterprise features such as session beans and "
-"container-managed transactions.)"
+msgid "Weld comes with a servlet listener which bootstraps the CDI environment, registers the <literal>BeanManager</literal> in JNDI and provides injection into servlets. Basically, it emulates some of the work done by the Java EE container. (But you don't get enterprise features such as session beans and container-managed transactions.)"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:297
 #, no-c-format
-msgid ""
-"Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll "
-"need to download Tomcat 6.0.18 or later from <ulink url=\"http://tomcat."
-"apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
+msgid "Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll need to download Tomcat 6.0.18 or later from <ulink url=\"http://tomcat.apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:302
-#, no-c-format
-msgid "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:304
 #, no-c-format
-msgid ""
-"You have two choices for how you can deploy the application to Tomcat. You "
-"can deploy it by pushing the artifact to the hot deploy directory using Ant "
-"or you can deploy to the server across HTTP using a Maven plugin. The Ant "
-"approach doesn't require that you have Maven installed, so we'll start "
-"there. If you want to use Maven, you can just skip ahead."
+msgid "You have two choices for how you can deploy the application to Tomcat. You can deploy it by pushing the artifact to the hot deploy directory using Ant or you can deploy to the server across HTTP using a Maven plugin. The Ant approach doesn't require that you have Maven installed, so we'll start there. If you want to use Maven, you can just skip ahead."
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:312
 #, no-c-format
 msgid "Deploying with Ant"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:314
 #, no-c-format
-msgid ""
-"In order for Ant to push the artifact to the Tomcat hot deploy directory, it "
-"needs to know where the Tomcat installation is located. Again, we need to "
-"set a property in the <literal>local.build.properties</literal> file in the "
-"examples directory of the Weld distribution. If you haven't yet created this "
-"file, do so now. Then assign the path of your Tomcat installation to the "
-"property key <literal>tomcat.home</literal>."
+msgid "In order for Ant to push the artifact to the Tomcat hot deploy directory, it needs to know where the Tomcat installation is located. Again, we need to set a property in the <literal>local.build.properties</literal> file in the examples directory of the Weld distribution. If you haven't yet created this file, do so now. Then assign the path of your Tomcat installation to the property key <literal>tomcat.home</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:321
-#, no-c-format
-msgid "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:323
 #, no-c-format
 msgid "Now you're ready to deploy the numberguess example to Tomcat!"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:327
 #, no-c-format
-msgid ""
-"Change to the <literal>examples/jsf/numberguess</literal> directory again "
-"and run the Ant <literal>deploy</literal> target for Tomcat:"
+msgid "Change to the <literal>examples/jsf/numberguess</literal> directory again and run the Ant <literal>deploy</literal> target for Tomcat:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:332
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant tomcat.deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:335
 #, no-c-format
-msgid ""
-"The Ant build script includes additional targets for Tomcat to deploy and "
-"undeploy the archive in either exploded or packaged format. They are the "
-"same target names used for JBoss AS, prefixed with \"tomcat.\"."
+msgid "The Ant build script includes additional targets for Tomcat to deploy and undeploy the archive in either exploded or packaged format. They are the same target names used for JBoss AS, prefixed with \"tomcat.\"."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:341
 #, no-c-format
-msgid ""
-"<literal>ant tomcat.restart</literal> - deploy the example in exploded "
-"format to Tomcat"
+msgid "<literal>ant tomcat.restart</literal> - deploy the example in exploded format to Tomcat"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:346
 #, no-c-format
-msgid ""
-"<literal>ant tomcat.explode</literal> - update an exploded example, without "
-"restarting the deployment"
+msgid "<literal>ant tomcat.explode</literal> - update an exploded example, without restarting the deployment"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:351
 #, no-c-format
-msgid ""
-"<literal>ant tomcat.deploy</literal> - deploy the example in compressed jar "
-"format to Tomcat"
+msgid "<literal>ant tomcat.deploy</literal> - deploy the example in compressed jar format to Tomcat"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:356
 #, no-c-format
 msgid "<literal>ant tomcat.undeploy</literal> - remove the example from Tomcat"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:363
 #, no-c-format
-msgid ""
-"If you haven't already, start Tomcat. You can either start Tomcat from a "
-"Linux shell:"
+msgid "If you haven't already, start Tomcat. You can either start Tomcat from a Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:367
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/apache-tomcat-6\n"
-"$> ./bin/start.sh]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: gettingstarted.xml:373
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
-"$> start]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:379
 #, no-c-format
-msgid ""
-"Wait a few seconds for the application to deploy (or the application server "
-"to start) and see if you can figure out the most efficient approach to "
-"pinpoint the random number at the local URL <ulink url=\"http://"
-"localhost:8080/weld-numberguess\">http://localhost:8080/weld-numberguess</"
-"ulink>!"
+msgid "Wait a few seconds for the application to deploy (or the application server to start) and see if you can figure out the most efficient approach to pinpoint the random number at the local URL <ulink url=\"http://localhost:8080/weld-numberguess\">http://localhost:8080/weld-numberguess</ulink>!"
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:388
 #, no-c-format
 msgid "Deploying with Maven"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:390
 #, no-c-format
-msgid ""
-"You can also deploy the application to Tomcat using Maven. This section is a "
-"bit more advanced, so skip it unless you're itching to use Maven natively. "
-"Of course, you'll first need to make sure that you have Maven installed on "
-"your path, similar to how you setup Ant."
+msgid "You can also deploy the application to Tomcat using Maven. This section is a bit more advanced, so skip it unless you're itching to use Maven natively. Of course, you'll first need to make sure that you have Maven installed on your path, similar to how you setup Ant."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:396
 #, no-c-format
-msgid ""
-"The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
-"where you have installed Tomcat. However, the plugin configuration assumes "
-"you are running Tomcat in its default configuration, with a hostname of "
-"localhost and port <literal>8080</literal>. The <literal>readme.txt</"
-"literal> file in the example directory has information about how to modify "
-"the Maven settings to accommodate a different setup."
+msgid "The Maven plugin communicates with Tomcat over HTTP, so it doesn't care where you have installed Tomcat. However, the plugin configuration assumes you are running Tomcat in its default configuration, with a hostname of localhost and port <literal>8080</literal>. The <literal>readme.txt</literal> file in the example directory has information about how to modify the Maven settings to accommodate a different setup."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:403
 #, no-c-format
-msgid ""
-"To allow Maven to communicate with Tomcat over HTTP, edit the <literal>conf/"
-"tomcat-users.xml</literal> file in your Tomcat installation and add the "
-"following line:"
+msgid "To allow Maven to communicate with Tomcat over HTTP, edit the <literal>conf/tomcat-users.xml</literal> file in your Tomcat installation and add the following line:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:408
-#, no-c-format
-msgid "<![CDATA[<user username=\"admin\" password=\"\" roles=\"manager\"/>]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:410
 #, no-c-format
-msgid ""
-"Restart Tomcat. You can now deploy the application to Tomcat with Maven "
-"using this command:"
+msgid "Restart Tomcat. You can now deploy the application to Tomcat with Maven using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:414
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:exploded tomcat:exploded -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:416
 #, no-c-format
-msgid ""
-"Once the application is deployed, you can redeploy it using this command:"
+msgid "Once the application is deployed, you can redeploy it using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:420
-#, no-c-format
-msgid "<![CDATA[$> mvn tomcat:redeploy -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:422
 #, no-c-format
-msgid ""
-"The <literal>-Ptomcat</literal> argument activates the <literal>tomcat</"
-"literal> profile defined in the Maven POM (<literal>pom.xml</literal>). "
-"Among other things, this profile activates the Tomcat plugin."
+msgid "The <literal>-Ptomcat</literal> argument activates the <literal>tomcat</literal> profile defined in the Maven POM (<literal>pom.xml</literal>). Among other things, this profile activates the Tomcat plugin."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:427
 #, no-c-format
-msgid ""
-"Rather than shipping the container off to a standalone Tomcat installation, "
-"you can also execute the application in an embedded Tomcat 6 container:"
+msgid "Rather than shipping the container off to a standalone Tomcat installation, you can also execute the application in an embedded Tomcat 6 container:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:432
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace tomcat:run -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:434
 #, no-c-format
-msgid ""
-"The advantage of using the embedded server is that changes to assets in "
-"<literal>src/main/webapp</literal> take effect immediately. If a change to a "
-"webapp configuration file is made, the application may automatically "
-"redeploy (depending on the plugin configuration). If you make a change to a "
-"classpath resource, you need to execute a build:"
+msgid "The advantage of using the embedded server is that changes to assets in <literal>src/main/webapp</literal> take effect immediately. If a change to a webapp configuration file is made, the application may automatically redeploy (depending on the plugin configuration). If you make a change to a classpath resource, you need to execute a build:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:441
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:443
 #, no-c-format
-msgid ""
-"There are several other Maven goals that you can use if you are hacking on "
-"the example, which are documented in the example's <literal>readme.txt</"
-"literal> file."
+msgid "There are several other Maven goals that you can use if you are hacking on the example, which are documented in the example's <literal>readme.txt</literal> file."
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:453
 #, no-c-format
 msgid "Deploying to Jetty"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:457
 #, no-c-format
-msgid ""
-"Support for Jetty in the examples is a more recent addition. Since Jetty is "
-"traditionally used with Maven, there are no Ant targets. You must invoke the "
-"Maven build directly to deploy the examples to Jetty out of the box. Also, "
-"only the <literal>weld-numberguess</literal> example is configured for Jetty "
-"support at the time of writing."
+msgid "Support for Jetty in the examples is a more recent addition. Since Jetty is traditionally used with Maven, there are no Ant targets. You must invoke the Maven build directly to deploy the examples to Jetty out of the box. Also, only the <literal>weld-numberguess</literal> example is configured for Jetty support at the time of writing."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:464
 #, no-c-format
-msgid ""
-"If you've read through the entire Tomcat section, then you're all ready to "
-"go. The Maven build parallels the embedded Tomcat deployment. If not, don't "
-"worry. We'll still go over everything that you need to know again in this "
-"section."
+msgid "If you've read through the entire Tomcat section, then you're all ready to go. The Maven build parallels the embedded Tomcat deployment. If not, don't worry. We'll still go over everything that you need to know again in this section."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:470
 #, no-c-format
-msgid ""
-"The Maven POM (<literal>pom.xml</literal>) includes a profile named "
-"<literal>jetty</literal> that activates the Maven Jetty plugin, which you "
-"can use to start Jetty in embedded mode and deploy the application in place. "
-"You don't need anything else installed except to have the Maven command "
-"(<literal>mvn</literal>) on your path. The rest will be downloaded from the "
-"internet when the build is run."
+msgid "The Maven POM (<literal>pom.xml</literal>) includes a profile named <literal>jetty</literal> that activates the Maven Jetty plugin, which you can use to start Jetty in embedded mode and deploy the application in place. You don't need anything else installed except to have the Maven command (<literal>mvn</literal>) on your path. The rest will be downloaded from the internet when the build is run."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:479
 #, no-c-format
-msgid ""
-"To run the <literal>weld-numberguess</literal> example on Jetty, switch to "
-"the example directory and execute the <literal>inplace</literal> goal of the "
-"Maven WAR plugin followed by the <literal>run</literal> goal of the Maven "
-"Jetty plugin with the <literal>jetty</literal> profile enabled, as follows:"
+msgid "To run the <literal>weld-numberguess</literal> example on Jetty, switch to the example directory and execute the <literal>inplace</literal> goal of the Maven war plugin followed by the <literal>run</literal> goal of the Maven Jetty plugin with the <literal>jetty</literal> profile enabled, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:485
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> mvn war:inplace jetty:run -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:487
 #, no-c-format
-msgid ""
-"The log output of Jetty will be shown in the console. Once Jetty reports "
-"that the application has deployed, you can access it at the following local "
-"URL: <ulink url=\"http://localhost:9090/weld-numberguess\">http://"
-"localhost:9090/weld-numberguess</ulink>. The port is defined in the Maven "
-"Jetty plugin configuration within the <literal>jetty</literal> profile."
+msgid "The log output of Jetty will be shown in the console. Once Jetty reports that the application has deployed, you can access it at the following local URL: <ulink url=\"http://localhost:9090/weld-numberguess\">http://localhost:9090/weld-numberguess</ulink>. The port is defined in the Maven Jetty plugin configuration within the <literal>jetty</literal> profile."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:494
 #, no-c-format
-msgid ""
-"Any changes to assets in <literal>src/main/webapp</literal> take effect "
-"immediately. If a change to a webapp configuration file is made, the "
-"application may automatically redeploy. The redeploy behavior can be fined-"
-"tuned in the plugin configuration. If you make a change to a classpath "
-"resource, you need to execute a build and the <literal>inplace</literal> "
-"goal of the Maven WAR plugin, again with the <literal>jetty</literal> "
-"profile enabled."
+msgid "Any changes to assets in <literal>src/main/webapp</literal> take effect immediately. If a change to a webapp configuration file is made, the application may automatically redeploy. The redeploy behavior can be fined-tuned in the plugin configuration. If you make a change to a classpath resource, you need to execute a build and the <literal>inplace</literal> goal of the Maven war plugin, again with the <literal>jetty</literal> profile enabled."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:501
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:503
 #, no-c-format
-msgid ""
-"The <literal>war:inplace</literal> goal copies the compiled classes and JARs "
-"inside <literal>src/main/webapp</literal>, under <literal>WEB-INF/classes</"
-"literal> and <literal>WEB-INF/lib</literal>, respectively, mixing source and "
-"compiled files. However, the build does work around these temporary files by "
-"excluding them from the packaged WAR and cleaning them during the Maven "
-"clean phase."
+msgid "The <literal>war:inplace</literal> goal copies the compiled classes and jars inside <literal>src/main/webapp</literal>, under <literal>WEB-INF/classes</literal> and <literal>WEB-INF/lib</literal>, respectively, mixing source and compiled files. However, the build does work around these temporary files by excluding them from the packaged war and cleaning them during the Maven clean phase."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:510
 #, no-c-format
-msgid ""
-"You have two options if you want to run the example on Jetty from the IDE. "
-"You can either install the m2eclispe[link] plugin and run the goals as "
-"described above. Your other option is to start the Jetty container from a "
-"Java application."
+msgid "You have two options if you want to run the example on Jetty from the IDE. You can either install the m2eclispe[link] plugin and run the goals as described above. Your other option is to start the Jetty container from a Java application."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:516
 #, no-c-format
 msgid "First, initialize the Eclipse project:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:520
-#, no-c-format
-msgid "<![CDATA[$> mvn clean eclipse:clean eclipse:eclipse -Pjetty-ide]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:522
 #, no-c-format
-msgid ""
-"Next, assemble all the necessary resources under <literal>src/main/webapp</"
-"literal>:"
+msgid "Next, assemble all the necessary resources under <literal>src/main/webapp</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:526
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace -Pjetty-ide]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:528
 #, no-c-format
-msgid ""
-"Now, you are ready to run the server in Eclipse. Import the project into "
-"your Eclipse workspace using \"Import Existing Project into Workspace. Then, "
-"find the start class in <literal>src/jetty/java</literal> and run its main "
-"method as a Java Application. Jetty will launch. You can view the "
-"application at the following local URL: <ulink url=\"http://localhost:8080"
-"\">http://localhost:8080</ulink>. Pay particular attention to the port in "
-"the URL and the lack of a trailing context path."
+msgid "Now, you are ready to run the server in Eclipse. Import the project into your Eclipse workspace using \"Import Existing Project into Workspace. Then, find the start class in <literal>src/jetty/java</literal> and run its main method as a Java Application. Jetty will launch. You can view the application at the following local URL: <ulink url=\"http://localhost:8080\">http://localhost:8080</ulink>. Pay particular attention to the port in the URL and the lack of a trailing context path."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:536
 #, no-c-format
-msgid ""
-"Now that you have gotten the starter applications deployed on the server of "
-"your choice, you probably want to know a little bit about how they actually "
-"work."
+msgid "Now that you have gotten the starter applications deployed on the server of your choice, you probably want to know a little bit about how they actually work."
 msgstr ""
+

Modified: doc/trunk/reference/pot/injection.pot
===================================================================
--- doc/trunk/reference/pot/injection.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/injection.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,1306 +1,599 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"PO-Revision-Date: 2010-03-02T13:07:17\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: injection.xml:4
 #, no-c-format
 msgid "Dependency injection and programmatic lookup"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:6
 #, no-c-format
-msgid ""
-"One of the most significant features of CDI&#8212;certainly the most "
-"recognized&#8212;is dependency injection; excuse me, <emphasis>typesafe</"
-"emphasis> dependency injection."
+msgid "One of the most significant features of CDI—certainly the most recognized—is dependency injection; excuse me, <emphasis>typesafe</emphasis> dependency injection."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:12
 #, no-c-format
 msgid "Injection points"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:14
 #, no-c-format
-msgid ""
-"The <literal>@Inject</literal> annotation lets us define an injection point "
-"that is injected during bean instantiation. Injection can occur via three "
-"different mechanisms."
+msgid "The <literal>@Inject</literal> annotation lets us define an injection point that is injected during bean instantiation. Injection can occur via three different mechanisms."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:19
 #, no-c-format
 msgid "<emphasis>Bean constructor</emphasis> parameter injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:23
-#, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private final ShoppingCart cart;\n"
-"    \n"
-"   @Inject\n"
-"   public Checkout(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:26
 #, no-c-format
 msgid "A bean can only have one injectable constructor."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:31
 #, no-c-format
 msgid "<emphasis>Initializer method</emphasis> parameter injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:35
-#, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private ShoppingCart cart;\n"
-"\n"
-"   @Inject\n"
-"   void setShoppingCart(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:38
 #, no-c-format
-msgid ""
-"A bean can have multiple initializer methods. If the bean is a session bean, "
-"the initializer method is not required to be a business method of the "
-"session bean."
+msgid "A bean can have multiple initializer methods. If the bean is a session bean, the initializer method is not required to be a business method of the session bean."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:44
 #, no-c-format
 msgid "And direct field injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:48
-#, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"   private @Inject ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:51
 #, no-c-format
-msgid ""
-"Getter and setter methods are not required for field injection to work "
-"(unlike with JSF managed beans)."
+msgid "Getter and setter methods are not required for field injection to work (unlike with JSF managed beans)."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:56
 #, no-c-format
-msgid ""
-"Dependency injection always occurs when the bean instance is first "
-"instantiated by the container. Simplifying just a little, things happen in "
-"this order:"
+msgid "Dependency injection always occurs when the bean instance is first instantiated by the container. Simplifying just a little, things happen in this order:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:63
 #, no-c-format
-msgid ""
-"First, the container calls the bean constructor (the default constructor or "
-"the one annotated <literal>@Inject</literal>), to obtain an instance of the "
-"bean."
+msgid "First, the container calls the bean constructor (the default constructor or the one annotated <literal>@Inject</literal>), to obtain an instance of the bean."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:69
 #, no-c-format
-msgid ""
-"Next, the container initializes the values of all injected fields of the "
-"bean."
+msgid "Next, the container initializes the values of all injected fields of the bean."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:74
 #, no-c-format
-msgid ""
-"Next, the container calls all initializer methods of bean (the call order is "
-"not portable, don't rely on it)."
+msgid "Next, the container calls all initializer methods of bean (the call order is not portable, don't rely on it)."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:80
 #, no-c-format
-msgid ""
-"Finally, the <literal>@PostConstruct</literal> method, if any, is called."
+msgid "Finally, the <literal>@PostConstruct</literal> method, if any, is called."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:86
 #, no-c-format
-msgid ""
-"(The only complication is that the container might call initializer methods "
-"declared by a superclass before initializing injected fields declared by a "
-"subclass.)"
+msgid "(The only complication is that the container might call initializer methods declared by a superclass before initializing injected fields declared by a subclass.)"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:90
 #, no-c-format
-msgid ""
-"One major advantage of constructor injection is that it allows the bean to "
-"be immutable."
+msgid "One major advantage of constructor injection is that it allows the bean to be immutable."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:95
 #, no-c-format
-msgid ""
-"CDI also supports parameter injection for some other methods that are "
-"invoked by the container. For instance, parameter injection is supported for "
-"producer methods:"
+msgid "CDI also supports parameter injection for some other methods that are invoked by the container. For instance, parameter injection is supported for producer methods:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:100
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:102
 #, no-c-format
-msgid ""
-"This is a case where the <literal>@Inject</literal> annotation <emphasis>is "
-"not</emphasis> required at the injection point. The same is true for "
-"observer methods (which we'll meet in <xref linkend=\"events\"/>) and "
-"disposer methods."
+msgid "This is a case where the <literal>@Inject</literal> annotation <emphasis>is not</emphasis> required at the injection point. The same is true for observer methods (which we'll meet in <xref linkend=\"events\" />) and disposer methods."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:110
 #, no-c-format
 msgid "What gets injected"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:112
 #, no-c-format
-msgid ""
-"The CDI specification defines a procedure, called <emphasis>typesafe "
-"resolution</emphasis>, that the container follows when identifying the bean "
-"to inject to an injection point. This algorithm looks complex at first, but "
-"once you understand it, it's really quite intuitive. Typesafe resolution is "
-"performed at system initialization time, which means that the container will "
-"inform the developer immediately if a bean's dependencies cannot be "
-"satisfied."
+msgid "The CDI specification defines a procedure, called <emphasis>typesafe resolution</emphasis>, that the container follows when identifying the bean to inject to an injection point. This algorithm looks complex at first, but once you understand it, it's really quite intuitive. Typesafe resolution is performed at system initialization time, which means that the container will inform the developer immediately if a bean's dependencies cannot be satisfied."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:120
 #, no-c-format
-msgid ""
-"The purpose of this algorithm is to allow multiple beans to implement the "
-"same bean type and either:"
+msgid "The purpose of this algorithm is to allow multiple beans to implement the same bean type and either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:126
 #, no-c-format
-msgid ""
-"allow the client to select which implementation it requires using a "
-"<emphasis>qualifier</emphasis> or"
+msgid "allow the client to select which implementation it requires using a <emphasis>qualifier</emphasis> or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:131
 #, no-c-format
-msgid ""
-"allow the application deployer to select which implementation is appropriate "
-"for a particular deployment, without changes to the client, by enabling or "
-"disabling an <emphasis>alternative</emphasis>, or"
+msgid "allow the application deployer to select which implementation is appropriate for a particular deployment, without changes to the client, by enabling or disabling an <emphasis>alternative</emphasis>, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:137
 #, no-c-format
 msgid "allow the beans to be isolated into separate modules."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:143
 #, no-c-format
-msgid ""
-"Obviously, if you have exactly one bean of a given type, and an injection "
-"point with that same type, then bean A is going to go into slot A. That's "
-"the simplest possible scenario. When you first start your application, "
-"you'll likely have lots of those."
+msgid "Obviously, if you have exactly one bean of a given type, and an injection point with that same type, then bean A is going to go into slot A. That's the simplest possible scenario. When you first start your application, you'll likely have lots of those."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:149
 #, no-c-format
-msgid ""
-"But then, things start to get complicated. Let's explore how the container "
-"determines which bean to inject in more advanced cases. We'll start by "
-"taking a closer look at qualifiers."
+msgid "But then, things start to get complicated. Let's explore how the container determines which bean to inject in more advanced cases. We'll start by taking a closer look at qualifiers."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:157
 #, no-c-format
 msgid "Qualifier annotations"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:159
 #, no-c-format
-msgid ""
-"If we have more than one bean that implements a particular bean type, the "
-"injection point can specify exactly which bean should be injected using a "
-"qualifier annotation. For example, there might be two implementations of "
-"<literal>PaymentProcessor</literal>:"
+msgid "If we have more than one bean that implements a particular bean type, the injection point can specify exactly which bean should be injected using a qualifier annotation. For example, there might be two implementations of <literal>PaymentProcessor</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:165
-#, no-c-format
-msgid ""
-"<![CDATA[@Synchronous\n"
-"public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: injection.xml:167
-#, no-c-format
-msgid ""
-"<![CDATA[@Asynchronous\n"
-"public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:169
 #, no-c-format
-msgid ""
-"Where <literal>@Synchronous</literal> and <literal>@Asynchronous</literal> "
-"are qualifier annotations:"
+msgid "Where <literal>@Synchronous</literal> and <literal>@Asynchronous</literal> are qualifier annotations:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:173
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Synchronous {}]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: injection.xml:175
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Asynchronous {}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:177
 #, no-c-format
-msgid ""
-"A client bean developer uses the qualifier annotation to specify exactly "
-"which bean should be injected."
+msgid "A client bean developer uses the qualifier annotation to specify exactly which bean should be injected."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:181
 #, no-c-format
 msgid "Using field injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:183
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
-"@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:185
 #, no-c-format
 msgid "Using initializer method injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:187
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public void setPaymentProcessors(@Synchronous PaymentProcessor "
-"syncPaymentProcessor, \n"
-"                                 @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:189
 #, no-c-format
 msgid "Using constructor injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:191
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
-"                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:193
 #, no-c-format
-msgid ""
-"Qualifier annotations can also qualify method arguments of producer, "
-"disposer and observer methods. Combining qualified arguments with producer "
-"methods is a good way to have an implementation of a bean type selected at "
-"runtime based on the state of the system:"
+msgid "Qualifier annotations can also qualify method arguments of producer, disposer and observer methods. Combining qualified arguments with producer methods is a good way to have an implementation of a bean type selected at runtime based on the state of the system:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:199
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces\n"
-"PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
-"syncPaymentProcessor,\n"
-"                                     @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   return isSynchronous() ? syncPaymentProcessor : asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:201
 #, no-c-format
-msgid ""
-"If an injected field or a parameter of a bean constructor or initializer "
-"method is not explicitly annotated with a qualifier, the default qualifier, "
-"<literal>@Default</literal>, is assumed."
+msgid "If an injected field or a parameter of a bean constructor or initializer method is not explicitly annotated with a qualifier, the default qualifier, <literal>@Default</literal>, is assumed."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:206
 #, no-c-format
-msgid ""
-"Now, you may be thinking, <emphasis>\"What's the different between using a "
-"qualifier and just specifying the exact implementation class you want?\"</"
-"emphasis> It's important to understand that a qualifier is like an extension "
-"of the interface. It does not create a direct dependency to any particular "
-"implementation. There may be multiple alterative implementations of "
-"<literal>@Asynchronous PaymentProcessor</literal>!"
+msgid "Now, you may be thinking, <emphasis>\"What's the different between using a qualifier and just specifying the exact implementation class you want?\"</emphasis> It's important to understand that a qualifier is like an extension of the interface. It does not create a direct dependency to any particular implementation. There may be multiple alterative implementations of <literal>@Asynchronous PaymentProcessor</literal>!"
 msgstr ""
 
 #. Tag: title
-#: injection.xml:216
 #, no-c-format
-msgid ""
-"The built-in qualifiers <literal>@Default</literal> and <literal>@Any</"
-"literal>"
+msgid "The built-in qualifiers <literal>@Default</literal> and <literal>@Any</literal>"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:218
 #, no-c-format
-msgid ""
-"Whenever a bean or injection point does not explicitly declare a qualifier, "
-"the container assumes the qualifier <literal>@Default</literal>. From time "
-"to time, you'll need to decare an injection point without specifying a "
-"qualifier. There's a qualifier for that too. All beans have the qualifier "
-"<literal>@Any</literal>. Therefore, by explicitly specifying <literal>@Any</"
-"literal> at an injection point, you suppress the default qualifier, without "
-"otherwise restricting the beans that are eligible for injection."
+msgid "Whenever a bean or injection point does not explicitly declare a qualifier, the container assumes the qualifier <literal>@Default</literal>. From time to time, you'll need to decare an injection point without specifying a qualifier. There's a qualifier for that too. All beans have the qualifier <literal>@Any</literal>. Therefore, by explicitly specifying <literal>@Any</literal> at an injection point, you suppress the default qualifier, without otherwise restricting the beans that are eligible for injection."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:225
 #, no-c-format
-msgid ""
-"This is especially useful if you want to iterate over all beans with a "
-"certain bean type. For example:"
+msgid "This is especially useful if you want to iterate over all beans with a certain bean type. For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:226
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject \n"
-"void initServices(@Any Instance<Service> services) { \n"
-"   for (Service service: services) {\n"
-"      service.init();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:232
 #, no-c-format
 msgid "Qualifiers with members"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:234
 #, no-c-format
-msgid ""
-"Java annotations can have members. We can use annotation members to further "
-"discriminate a qualifier. This prevents a potential explosion of new "
-"annotations. For example, instead of creating several qualifiers "
-"representing different payment methods, we could aggregate them into a "
-"single annotation with a member:"
+msgid "Java annotations can have members. We can use annotation members to further discriminate a qualifier. This prevents a potential explosion of new annotations. For example, instead of creating several qualifiers representing different payment methods, we could aggregate them into a single annotation with a member:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:240
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:242
 #, no-c-format
-msgid ""
-"Then we select one of the possible member values when appling the qualifier:"
+msgid "Then we select one of the possible member values when appling the qualifier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:248
 #, no-c-format
-msgid ""
-"We can force the container to ignore a member of a qualifier type by "
-"annotating the member <literal>@Nonbinding</literal>."
+msgid "We can force the container to ignore a member of a qualifier type by annotating the member <literal>@Nonbinding</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:253
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"   @Nonbinding String comment() default \"\";\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:258
 #, no-c-format
 msgid "Multiple qualifiers"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:260
 #, no-c-format
 msgid "An injection point may specify multiple qualifiers:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:264
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
-"syncPaymentProcessor;]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:266
 #, no-c-format
-msgid ""
-"Then only a bean which has <emphasis>both</emphasis> qualifier annotations "
-"would be eligible for injection."
+msgid "Then only a bean which has <emphasis>both</emphasis> qualifier annotations would be eligible for injection."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:271
-#, no-c-format
-msgid ""
-"<![CDATA[@Synchronous @Reliable\n"
-"public class SynchronousReliablePaymentProcessor implements PaymentProcessor "
-"{\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:276
 #, no-c-format
 msgid "Alternatives"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:278
 #, no-c-format
-msgid ""
-"Alternatives are beans whose implementation is specific to a particular "
-"client module or deployment scenario. This alternative defines a mock "
-"implementation of both <literal>@Synchronous PaymentProcessor</literal> and "
-"<literal>@Asynchronous PaymentProcessor</literal>, all in one:"
+msgid "Alternatives are beans whose implementation is specific to a particular client module or deployment scenario. This alternative defines a mock implementation of both <literal>@Synchronous PaymentProcessor</literal> and <literal>@Asynchronous PaymentProcessor</literal>, all in one:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:282
-#, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Synchronous @Asynchronous\n"
-"public class MockPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:284
 #, no-c-format
-msgid ""
-"By default, <literal>@Alternative</literal> beans are disabled. We need to "
-"<emphasis>enable</emphasis> an alternative in the <literal>beans.xml</"
-"literal> descriptor of a bean archive to make it available for instantiation "
-"and injection. This activation only applies to the beans in that archive."
+msgid "By default, <literal>@Alternative</literal> beans are disabled. We need to <emphasis>enable</emphasis> an alternative in the <literal>beans.xml</literal> descriptor of a bean archive to make it available for instantiation and injection. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:290
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <class>org.mycompany.mock.MockPaymentProcessor</class>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:292
 #, no-c-format
-msgid ""
-"When an ambiguous dependency exists at an injection point, the container "
-"attempts to resolve the ambiguity by looking for an enabled alternative "
-"among the beans that could be injected. If there is exactly one enabled "
-"alternative, that's the bean that will be injected."
+msgid "When an ambiguous dependency exists at an injection point, the container attempts to resolve the ambiguity by looking for an enabled alternative among the beans that could be injected. If there is exactly one enabled alternative, that's the bean that will be injected."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:301
 #, no-c-format
 msgid "Fixing unsatisfied and ambiguous dependencies"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:303
 #, no-c-format
-msgid ""
-"The typesafe resolution algorithm fails when, after considering the "
-"qualifier annotations on all beans that implement the bean type of an "
-"injection point and filtering out disabled beans (<literal>@Alternative</"
-"literal> beans which are not explicitly enabled), the container is unable to "
-"identify exactly one bean to inject. The container will abort deployment, "
-"informing us of the unsatisfied or ambiguous dependency."
+msgid "The typesafe resolution algorithm fails when, after considering the qualifier annotations on all beans that implement the bean type of an injection point and filtering out disabled beans (<literal>@Alternative</literal> beans which are not explicitly enabled), the container is unable to identify exactly one bean to inject. The container will abort deployment, informing us of the unsatisfied or ambiguous dependency."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:310
 #, no-c-format
-msgid ""
-"During the course of your development, you're going to encounter this "
-"situation. Let's learn how to resolve it."
+msgid "During the course of your development, you're going to encounter this situation. Let's learn how to resolve it."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:314
 #, no-c-format
 msgid "To fix an <emphasis>unsatisfied dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:320
 #, no-c-format
-msgid ""
-"create a bean which implements the bean type and has all the qualifier types "
-"of the injection point,"
+msgid "create a bean which implements the bean type and has all the qualifier types of the injection point,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:325
 #, no-c-format
-msgid ""
-"make sure that the bean you already have is in the classpath of the module "
-"with the injection point, or"
+msgid "make sure that the bean you already have is in the classpath of the module with the injection point, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:330
 #, no-c-format
-msgid ""
-"explicitly enable an <literal>@Alternative</literal> bean that implements "
-"the bean type and has the appropriate qualifier types, using <literal>beans."
-"xml</literal>."
+msgid "explicitly enable an <literal>@Alternative</literal> bean that implements the bean type and has the appropriate qualifier types, using <literal>beans.xml</literal>."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:337
 #, no-c-format
 msgid "To fix an <emphasis>ambiguous dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:343
 #, no-c-format
-msgid ""
-"introduce a qualifier to distinguish between the two implementations of the "
-"bean type,"
+msgid "introduce a qualifier to distinguish between the two implementations of the bean type,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:348
 #, no-c-format
-msgid ""
-"disable one of the beans by annotating it <literal>@Alternative</literal>,"
+msgid "disable one of the beans by annotating it <literal>@Alternative</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:353
 #, no-c-format
-msgid ""
-"move one of the implementations to a module that is not in the classpath of "
-"the module with the injection point, or"
+msgid "move one of the implementations to a module that is not in the classpath of the module with the injection point, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:359
 #, no-c-format
-msgid ""
-"disable one of two <literal>@Alternative</literal> beans that are trying to "
-"occupy the same space, using <literal>beans.xml</literal>."
+msgid "disable one of two <literal>@Alternative</literal> beans that are trying to occupy the same space, using <literal>beans.xml</literal>."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:366
 #, no-c-format
-msgid ""
-"See <ulink url=\"http://sfwk.org/Documentation/"
-"HowDoAResolveAnAmbiguousResolutionExceptionBetweenAProducerMethodAndARawType"
-"\">this FAQ</ulink> for step-by-step instructions for how to resolve an "
-"ambigous resolution exception between a raw bean type and a producer method "
-"that returns the same bean type."
+msgid "See <ulink url=\"http://sfwk.org/Documentation/HowDoAResolveAnAmbiguousResolutionExceptionBetweenAProducerMethodAndARawType\">this FAQ</ulink> for step-by-step instructions for how to resolve an ambigous resolution exception between a raw bean type and a producer method that returns the same bean type."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:374
 #, no-c-format
 msgid "Just remember: \"There can be only one.\""
 msgstr ""
 
 #. Tag: para
-#: injection.xml:377
 #, no-c-format
-msgid ""
-"On the other hand, if you really do have an optional or multivalued "
-"injection point, you should change the type of your injection point to "
-"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\"/>."
+msgid "On the other hand, if you really do have an optional or multivalued injection point, you should change the type of your injection point to <literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:382
 #, no-c-format
-msgid ""
-"Now there's one more issue you need to be aware of when using the dependency "
-"injection service."
+msgid "Now there's one more issue you need to be aware of when using the dependency injection service."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:389
 #, no-c-format
 msgid "Client proxies"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:391
 #, no-c-format
-msgid ""
-"Clients of an injected bean do not usually hold a direct reference to a bean "
-"instance, unless the bean is a dependent object (scope <literal>@Dependent</"
-"literal>)."
+msgid "Clients of an injected bean do not usually hold a direct reference to a bean instance, unless the bean is a dependent object (scope <literal>@Dependent</literal>)."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:396
 #, no-c-format
-msgid ""
-"Imagine that a bean bound to the application scope held a direct reference "
-"to a bean bound to the request scope. The application-scoped bean is shared "
-"between many different requests. However, each request should see a "
-"different instance of the request scoped bean&#8212;the current one!"
+msgid "Imagine that a bean bound to the application scope held a direct reference to a bean bound to the request scope. The application-scoped bean is shared between many different requests. However, each request should see a different instance of the request scoped bean—the current one!"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:402
 #, no-c-format
-msgid ""
-"Now imagine that a bean bound to the session scope holds a direct reference "
-"to a bean bound to the application scope. From time to time, the session "
-"context is serialized to disk in order to use memory more efficiently. "
-"However, the application scoped bean instance should not be serialized along "
-"with the session scoped bean! It can get that reference any time. No need to "
-"hoard it!"
+msgid "Now imagine that a bean bound to the session scope holds a direct reference to a bean bound to the application scope. From time to time, the session context is serialized to disk in order to use memory more efficiently. However, the application scoped bean instance should not be serialized along with the session scoped bean! It can get that reference any time. No need to hoard it!"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:409
 #, no-c-format
-msgid ""
-"Therefore, unless a bean has the default scope <literal>@Dependent</"
-"literal>, the container must indirect all injected references to the bean "
-"through a proxy object. This <emphasis>client proxy</emphasis> is "
-"responsible for ensuring that the bean instance that receives a method "
-"invocation is the instance that is associated with the current context. The "
-"client proxy also allows beans bound to contexts such as the session context "
-"to be serialized to disk without recursively serializing other injected "
-"beans."
+msgid "Therefore, unless a bean has the default scope <literal>@Dependent</literal>, the container must indirect all injected references to the bean through a proxy object. This <emphasis>client proxy</emphasis> is responsible for ensuring that the bean instance that receives a method invocation is the instance that is associated with the current context. The client proxy also allows beans bound to contexts such as the session context to be serialized to disk without recursively serializing other injected beans."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:417
 #, no-c-format
-msgid ""
-"Unfortunately, due to limitations of the Java language, some Java types "
-"cannot be proxied by the container. If an injection point declared with one "
-"of these types resolves to a bean with any scope other than "
-"<literal>@Dependent</literal>, the container will abort deployment, "
-"informing us of the problem."
+msgid "Unfortunately, due to limitations of the Java language, some Java types cannot be proxied by the container. If an injection point declared with one of these types resolves to a bean with any scope other than <literal>@Dependent</literal>, the container will abort deployment, informing us of the problem."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:423
 #, no-c-format
 msgid "The following Java types cannot be proxied by the container:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:427
 #, no-c-format
-msgid ""
-"classes which don't have a non-private constructor with no parameters, and"
+msgid "classes which don't have a non-private constructor with no parameters, and"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:430
 #, no-c-format
-msgid ""
-"classes which are declared <literal>final</literal> or have a "
-"<literal>final</literal> method,"
+msgid "classes which are declared <literal>final</literal> or have a <literal>final</literal> method,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:435
 #, no-c-format
 msgid "arrays and primitive types."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:439
 #, no-c-format
-msgid ""
-"It's usually very easy to fix an unproxyable dependency problem. If an "
-"injection point of type <literal>X</literal> results in an unproxyable "
-"dependency, simply:"
+msgid "It's usually very easy to fix an unproxyable dependency problem. If an injection point of type <literal>X</literal> results in an unproxyable dependency, simply:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:446
 #, no-c-format
 msgid "add a constructor with no parameters to <literal>X</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:451
 #, no-c-format
-msgid ""
-"change the type of the injection point to <literal>Instance&lt;X&gt;</"
-"literal>,"
+msgid "change the type of the injection point to <literal>Instance&lt;X&gt;</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:456
 #, no-c-format
-msgid ""
-"introduce an interface <literal>Y</literal>, implemented by the injected "
-"bean, and change the type of the injection point to <literal>Y</literal>, or"
+msgid "introduce an interface <literal>Y</literal>, implemented by the injected bean, and change the type of the injection point to <literal>Y</literal>, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:462
 #, no-c-format
-msgid ""
-"if all else fails, change the scope of the injected bean to "
-"<literal>@Dependent</literal>."
+msgid "if all else fails, change the scope of the injected bean to <literal>@Dependent</literal>."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:469
 #, no-c-format
-msgid ""
-"A future release of Weld will likely support a non-standard workaround for "
-"this limitation, using non-portable JVM APIs:"
+msgid "A future release of Weld will likely support a non-standard workaround for this limitation, using non-portable JVM APIs:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:476
 #, no-c-format
-msgid ""
-"Sun, IcedTea, Mac: <literal>Unsafe.allocateInstance()</literal> (The most "
-"efficient)"
+msgid "Sun, IcedTea, Mac: <literal>Unsafe.allocateInstance()</literal> (The most efficient)"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:481
 #, no-c-format
-msgid ""
-"IBM, JRockit: <literal>ReflectionFactory.newConstructorForSerialization()</"
-"literal>"
+msgid "IBM, JRockit: <literal>ReflectionFactory.newConstructorForSerialization()</literal>"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:487
 #, no-c-format
 msgid "But we didn't get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:496
 #, no-c-format
 msgid "Obtaining a contextual instance by programmatic lookup"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:498
 #, no-c-format
-msgid ""
-"In certain situations, injection is not the most convenient way to obtain a "
-"contextual reference. For example, it may not be used when:"
+msgid "In certain situations, injection is not the most convenient way to obtain a contextual reference. For example, it may not be used when:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:505
 #, no-c-format
 msgid "the bean type or qualifiers vary dynamically at runtime, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:510
 #, no-c-format
-msgid ""
-"depending upon the deployment, there may be no bean which satisfies the type "
-"and qualifiers, or"
+msgid "depending upon the deployment, there may be no bean which satisfies the type and qualifiers, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:515
 #, no-c-format
 msgid "we would like to iterate over all beans of a certain type."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:521
 #, no-c-format
-msgid ""
-"In these situations, the application may obtain an instance of the interface "
-"<literal>Instance</literal>, parameterized for the bean type, by injection:"
+msgid "In these situations, the application may obtain an instance of the interface <literal>Instance</literal>, parameterized for the bean type, by injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:526
-#, no-c-format
-msgid "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:528
 #, no-c-format
-msgid ""
-"The <literal>get()</literal> method of <literal>Instance</literal> produces "
-"a contextual instance of the bean."
+msgid "The <literal>get()</literal> method of <literal>Instance</literal> produces a contextual instance of the bean."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:532
-#, no-c-format
-msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:534
 #, no-c-format
 msgid "Qualifiers can be specified in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:540
 #, no-c-format
 msgid "by annotating the <literal>Instance</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:543
 #, no-c-format
-msgid ""
-"by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
-"literal>."
+msgid "by passing qualifiers to the <literal>select()</literal> of <literal>Event</literal>."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:547
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is much, much easier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:551
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
-"paymentProcessorSource;]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:553
 #, no-c-format
-msgid ""
-"Now, the <literal>PaymentProcessor</literal> returned by <literal>get()</"
-"literal> will have the qualifier <literal>@Asynchronous</literal>."
+msgid "Now, the <literal>PaymentProcessor</literal> returned by <literal>get()</literal> will have the qualifier <literal>@Asynchronous</literal>."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:558
 #, no-c-format
-msgid ""
-"Alternatively, we can specify the qualifier dynamically. First, we add the "
-"<literal>@Any</literal> qualifier to the injection point, to suppress the "
-"default qualifier. (All beans have the qualifier <literal>@Any</literal>.)"
+msgid "Alternatively, we can specify the qualifier dynamically. First, we add the <literal>@Any</literal> qualifier to the injection point, to suppress the default qualifier. (All beans have the qualifier <literal>@Any</literal>.)"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:563
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:565
 #, no-c-format
-msgid ""
-"Next, we need to obtain an instance of our qualifier type. Since annotatons "
-"are interfaces, we can't just write <literal>new Asynchronous()</literal>. "
-"It's also quite tedious to create a concrete implementation of an annotation "
-"type from scratch. Instead, CDI lets us obtain a qualifier instance by "
-"subclassing the helper class <literal>AnnotationLiteral</literal>."
+msgid "Next, we need to obtain an instance of our qualifier type. Since annotatons are interfaces, we can't just write <literal>new Asynchronous()</literal>. It's also quite tedious to create a concrete implementation of an annotation type from scratch. Instead, CDI lets us obtain a qualifier instance by subclassing the helper class <literal>AnnotationLiteral</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:572
-#, no-c-format
-msgid ""
-"<![CDATA[abstract class AsynchronousQualifier\n"
-"extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:574
 #, no-c-format
 msgid "In some cases, we can use an anonymous class:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:578
-#, no-c-format
-msgid ""
-"<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
-"   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:581
 #, no-c-format
-msgid ""
-"We can't use an anonymous class to implement a qualifier type with members."
+msgid "We can't use an anonymous class to implement a qualifier type with members."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:586
 #, no-c-format
-msgid ""
-"Now, finally, we can pass the qualifier to the <literal>select()</literal> "
-"method of <literal>Instance</literal>."
+msgid "Now, finally, we can pass the qualifier to the <literal>select()</literal> method of <literal>Instance</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:590
-#, no-c-format
-msgid ""
-"<![CDATA[Annotation qualifier = synchronously ?\n"
-"      new SynchronousQualifier() : new AsynchronousQualifier();\n"
-"PaymentProcessor p = anyPaymentProcessor.select(qualifier).get().process"
-"(payment);]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:595
 #, no-c-format
 msgid "The <literal>InjectionPoint</literal> object"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:597
 #, no-c-format
-msgid ""
-"There are certain kinds of dependent objects (beans with scope "
-"<literal>@Dependent</literal>) that need to know something about the object "
-"or injection point into which they are injected in order to be able to do "
-"what they do. For example:"
+msgid "There are certain kinds of dependent objects (beans with scope <literal>@Dependent</literal>) that need to know something about the object or injection point into which they are injected in order to be able to do what they do. For example:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:603
 #, no-c-format
-msgid ""
-"The log category for a <literal>Logger</literal> depends upon the class of "
-"the object that owns it."
+msgid "The log category for a <literal>Logger</literal> depends upon the class of the object that owns it."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:607
 #, no-c-format
-msgid ""
-"Injection of a HTTP parameter or header value depends upon what parameter or "
-"header name was specified at the injection point."
+msgid "Injection of a HTTP parameter or header value depends upon what parameter or header name was specified at the injection point."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:611
 #, no-c-format
-msgid ""
-"Injection of the result of an EL expression evaluation depends upon the "
-"expression that was specified at the injection point."
+msgid "Injection of the result of an EL expression evaluation depends upon the expression that was specified at the injection point."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:616
 #, no-c-format
-msgid ""
-"A bean with scope <literal>@Dependent</literal> may inject an instance of "
-"<literal>InjectionPoint</literal> and access metadata relating to the "
-"injection point to which it belongs."
+msgid "A bean with scope <literal>@Dependent</literal> may inject an instance of <literal>InjectionPoint</literal> and access metadata relating to the injection point to which it belongs."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:620
 #, no-c-format
-msgid ""
-"Let's look at an example. The following code is verbose, and vulnerable to "
-"refactoring problems:"
+msgid "Let's look at an example. The following code is verbose, and vulnerable to refactoring problems:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:623
-#, no-c-format
-msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:625
 #, no-c-format
-msgid ""
-"This clever little producer method lets you inject a JDK <literal>Logger</"
-"literal> without explicitly specifying the log category:"
+msgid "This clever little producer method lets you inject a JDK <literal>Logger</literal> without explicitly specifying the log category:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:628
-#, no-c-format
-msgid ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:630
 #, no-c-format
 msgid "We can now write:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:632
-#, no-c-format
-msgid "<![CDATA[@Inject Logger log;]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:634
 #, no-c-format
-msgid ""
-"Not convinced? Then here's a second example. To inject HTTP parameters, we "
-"need to define a qualifier type:"
+msgid "Not convinced? Then here's a second example. To inject HTTP parameters, we need to define a qualifier type:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:637
-#, no-c-format
-msgid ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @Nonbinding public String value();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:639
 #, no-c-format
 msgid "We would use this qualifier type at injection points as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:641
-#, no-c-format
-msgid ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:643
 #, no-c-format
 msgid "The following producer method does the work:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:645
-#, no-c-format
-msgid ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotated().getAnnotation(HttpParam."
-"class).value());\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:647
 #, no-c-format
-msgid ""
-"(Note that the <literal>value()</literal> member of the <literal>HttpParam</"
-"literal> annotation is ignored by the container since it is annotated "
-"<literal>@Nonbinding.</literal>)"
+msgid "(Note that the <literal>value()</literal> member of the <literal>HttpParam</literal> annotation is ignored by the container since it is annotated <literal>@Nonbinding.</literal>)"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:650
 #, no-c-format
-msgid ""
-"The container provides a built-in bean that implements the "
-"<literal>InjectionPoint</literal> interface:"
+msgid "The container provides a built-in bean that implements the <literal>InjectionPoint</literal> interface:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:653
-#, no-c-format
-msgid ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Type getType();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Bean<?> getBean();\n"
-"   public Member getMember();\n"
-"   public Annotated getAnnotated();\n"
-"   public boolean isDelegate();\n"
-"   public boolean isTransient();\n"
-"}]]>"
-msgstr ""

Modified: doc/trunk/reference/pot/interceptors.pot
===================================================================
--- doc/trunk/reference/pot/interceptors.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/interceptors.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,607 +1,244 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"PO-Revision-Date: 2010-03-02T13:07:17\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: interceptors.xml:5
 #, no-c-format
 msgid "Interceptors"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:7
 #, no-c-format
-msgid ""
-"Interceptor functionality is defined in the Java Interceptors specification. "
-"CDI enhances this functionality with a more sophisticated, semantic, "
-"annotation-based approach to binding interceptors to beans."
+msgid "Interceptor functionality is defined in the Java Interceptors specification. CDI enhances this functionality with a more sophisticated, semantic, annotation-based approach to binding interceptors to beans."
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:12
 #, no-c-format
-msgid ""
-"The Interceptors specification defines two kinds of interception points:"
+msgid "The Interceptors specification defines two kinds of interception points:"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:18
 #, no-c-format
 msgid "business method interception, and"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:21
 #, no-c-format
 msgid "lifecycle callback interception."
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:25
 #, no-c-format
 msgid "In addition, the EJB specification defines timeout method interception."
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:29
 #, no-c-format
-msgid ""
-"A <emphasis>business method interceptor</emphasis> applies to invocations of "
-"methods of the bean by clients of the bean:"
+msgid "A <emphasis>business method interceptor</emphasis> applies to invocations of methods of the bean by clients of the bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:34
-#, no-c-format
-msgid ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:36
 #, no-c-format
-msgid ""
-"A <emphasis>lifecycle callback interceptor</emphasis> applies to invocations "
-"of lifecycle callbacks by the container:"
+msgid "A <emphasis>lifecycle callback interceptor</emphasis> applies to invocations of lifecycle callbacks by the container:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:41
-#, no-c-format
-msgid ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"   @PostConstruct \n"
-"   public void injectDependencies(InvocationContext ctx) { ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:43
 #, no-c-format
-msgid ""
-"An interceptor class may intercept both lifecycle callbacks and business "
-"methods."
+msgid "An interceptor class may intercept both lifecycle callbacks and business methods."
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:47
 #, no-c-format
-msgid ""
-"A <emphasis>timeout method interceptor</emphasis> applies to invocations of "
-"EJB timeout methods by the container:"
+msgid "A <emphasis>timeout method interceptor</emphasis> applies to invocations of EJB timeout methods by the container:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:52
-#, no-c-format
-msgid ""
-"<![CDATA[public class TimeoutInterceptor {\n"
-"   @AroundTimeout \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: interceptors.xml:55
 #, no-c-format
 msgid "Interceptor bindings"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:57
 #, no-c-format
-msgid ""
-"Suppose we want to declare that some of our beans are transactional. The "
-"first thing we need is an <emphasis>interceptor binding type</emphasis> to "
-"specify exactly which beans we're interested in:"
+msgid "Suppose we want to declare that some of our beans are transactional. The first thing we need is an <emphasis>interceptor binding type</emphasis> to specify exactly which beans we're interested in:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:62
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:64
 #, no-c-format
-msgid ""
-"Now we can easily specify that our <literal>ShoppingCart</literal> is a "
-"transactional object:"
+msgid "Now we can easily specify that our <literal>ShoppingCart</literal> is a transactional object:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:68
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:70
 #, no-c-format
 msgid "Or, if we prefer, we can specify that just one method is transactional:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:74
-#, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: interceptors.xml:79
 #, no-c-format
 msgid "Implementing interceptors"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:81
 #, no-c-format
-msgid ""
-"That's great, but somewhere along the line we're going to have to actually "
-"implement the interceptor that provides this transaction management aspect. "
-"All we need to do is create a standard interceptor, and annotate it "
-"<literal>@Interceptor</literal> and <literal>@Transactional</literal>."
+msgid "That's great, but somewhere along the line we're going to have to actually implement the interceptor that provides this transaction management aspect. All we need to do is create a standard interceptor, and annotate it <literal>@Interceptor</literal> and <literal>@Transactional</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:87
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:89
 #, no-c-format
 msgid "Interceptors can take advantage of dependency injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:93
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource UserTransaction transaction;\n"
-"\n"
-"    @AroundInvoke \n"
-"    public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:95
 #, no-c-format
 msgid "Multiple interceptors may use the same interceptor binding type."
 msgstr ""
 
 #. Tag: title
-#: interceptors.xml:102
 #, no-c-format
 msgid "Enabling interceptors"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:104
 #, no-c-format
-msgid ""
-"By default, all interceptors are disabled. We need to <emphasis>enable</"
-"emphasis> our interceptor in the <literal>beans.xml</literal> descriptor of "
-"a bean archive. This activation only applies to the beans in that archive."
+msgid "By default, all interceptors are disabled. We need to <emphasis>enable</emphasis> our interceptor in the <literal>beans.xml</literal> descriptor of a bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:110
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:112
 #, no-c-format
 msgid "Whoah! Why the angle bracket stew?"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:114
 #, no-c-format
-msgid ""
-"Well, having the XML declaration is actually a <emphasis>good thing</"
-"emphasis>. It solves two problems:"
+msgid "Well, having the XML declaration is actually a <emphasis>good thing</emphasis>. It solves two problems:"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:120
 #, no-c-format
-msgid ""
-"it enables us to specify a total ordering for all the interceptors in our "
-"system, ensuring deterministic behavior, and"
+msgid "it enables us to specify a total ordering for all the interceptors in our system, ensuring deterministic behavior, and"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:126
 #, no-c-format
 msgid "it lets us enable or disable interceptor classes at deployment time."
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:130
 #, no-c-format
-msgid ""
-"For example, we could specify that our security interceptor runs before our "
-"transaction interceptor."
+msgid "For example, we could specify that our security interceptor runs before our transaction interceptor."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.SecurityInterceptor</class>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:136
 #, no-c-format
-msgid ""
-"Or we could turn them both off in our test environment by simply not "
-"mentioning them in <literal>beans.xml</literal>! Ah, so simple."
+msgid "Or we could turn them both off in our test environment by simply not mentioning them in <literal>beans.xml</literal>! Ah, so simple."
 msgstr ""
 
 #. Tag: title
-#: interceptors.xml:142
 #, no-c-format
 msgid "Interceptor bindings with members"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:144
 #, no-c-format
-msgid ""
-"Suppose we want to add some extra information to our "
-"<literal>@Transactional</literal> annotation:"
+msgid "Suppose we want to add some extra information to our <literal>@Transactional</literal> annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:148
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"   boolean requiresNew() default false;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:150
 #, no-c-format
-msgid ""
-"CDI will use the value of <literal>requiresNew</literal> to choose between "
-"two different interceptors, <literal>TransactionInterceptor</literal> and "
-"<literal>RequiresNewTransactionInterceptor</literal>."
+msgid "CDI will use the value of <literal>requiresNew</literal> to choose between two different interceptors, <literal>TransactionInterceptor</literal> and <literal>RequiresNewTransactionInterceptor</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:155
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:157
 #, no-c-format
-msgid ""
-"Now we can use <literal>RequiresNewTransactionInterceptor</literal> like "
-"this:"
+msgid "Now we can use <literal>RequiresNewTransactionInterceptor</literal> like this:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:161
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true)\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:163
 #, no-c-format
-msgid ""
-"But what if we only have one interceptor and we want the container to ignore "
-"the value of <literal>requiresNew</literal> when binding interceptors? "
-"Perhaps this information is only useful for the interceptor implementation. "
-"We can use the <literal>@Nonbinding</literal> annotation:"
+msgid "But what if we only have one interceptor and we want the container to ignore the value of <literal>requiresNew</literal> when binding interceptors? Perhaps this information is only useful for the interceptor implementation. We can use the <literal>@Nonbinding</literal> annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:169
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"   @Nonbinding String[] rolesAllowed() default {};\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: interceptors.xml:174
 #, no-c-format
 msgid "Multiple interceptor binding annotations"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:176
 #, no-c-format
-msgid ""
-"Usually we use combinations of interceptor bindings types to bind multiple "
-"interceptors to a bean. For example, the following declaration would be used "
-"to bind <literal>TransactionInterceptor</literal> and "
-"<literal>SecurityInterceptor</literal> to the same bean:"
+msgid "Usually we use combinations of interceptor bindings types to bind multiple interceptors to a bean. For example, the following declaration would be used to bind <literal>TransactionInterceptor</literal> and <literal>SecurityInterceptor</literal> to the same bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:182
-#, no-c-format
-msgid ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:184
 #, no-c-format
-msgid ""
-"However, in very complex cases, an interceptor itself may specify some "
-"combination of interceptor binding types:"
+msgid "However, in very complex cases, an interceptor itself may specify some combination of interceptor binding types:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:189
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:191
 #, no-c-format
-msgid ""
-"Then this interceptor could be bound to the <literal>checkout()</literal> "
-"method using any one of the following combinations:"
+msgid "Then this interceptor could be bound to the <literal>checkout()</literal> method using any one of the following combinations:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:196
-#, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: interceptors.xml:198
-#, no-c-format
-msgid ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: interceptors.xml:200
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart {\n"
-"   @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: interceptors.xml:202
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: interceptors.xml:207
 #, no-c-format
 msgid "Interceptor binding type inheritance"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:209
 #, no-c-format
-msgid ""
-"One limitation of the Java language support for annotations is the lack of "
-"annotation inheritance. Really, annotations should have reuse built in, to "
-"allow this kind of thing to work:"
+msgid "One limitation of the Java language support for annotations is the lack of annotation inheritance. Really, annotations should have reuse built in, to allow this kind of thing to work:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:214
-#, no-c-format
-msgid ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:216
 #, no-c-format
-msgid ""
-"Well, fortunately, CDI works around this missing feature of Java. We may "
-"annotate one interceptor binding type with other interceptor binding types "
-"(termed a <emphasis>meta-annotation</emphasis>). The interceptor bindings "
-"are transitive &#8212; any bean with the first interceptor binding inherits "
-"the interceptor bindings declared as meta-annotations."
+msgid "Well, fortunately, CDI works around this missing feature of Java. We may annotate one interceptor binding type with other interceptor binding types (termed a <emphasis>meta-annotation</emphasis>). The interceptor bindings are transitive — any bean with the first interceptor binding inherits the interceptor bindings declared as meta-annotations."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:223
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBinding\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:225
 #, no-c-format
-msgid ""
-"Now, any bean annotated <literal>@Action</literal> will be bound to both "
-"<literal>TransactionInterceptor</literal> and <literal>SecurityInterceptor</"
-"literal>. (And even <literal>TransactionalSecureInterceptor</literal>, if it "
-"exists.)"
+msgid "Now, any bean annotated <literal>@Action</literal> will be bound to both <literal>TransactionInterceptor</literal> and <literal>SecurityInterceptor</literal>. (And even <literal>TransactionalSecureInterceptor</literal>, if it exists.)"
 msgstr ""
 
 #. Tag: title
-#: interceptors.xml:234
 #, no-c-format
 msgid "Use of <literal>@Interceptors</literal>"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:236
 #, no-c-format
-msgid ""
-"The <literal>@Interceptors</literal> annotation defined by the interceptor "
-"specification (and used by the managed bean and EJB specifications) is still "
-"supported in CDI."
+msgid "The <literal>@Interceptors</literal> annotation defined by the interceptor specification (and used by the managed bean and EJB specifications) is still supported in CDI."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:239
-#, no-c-format
-msgid ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:241
 #, no-c-format
 msgid "However, this approach suffers the following drawbacks:"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:245
 #, no-c-format
 msgid "the interceptor implementation is hardcoded in business code,"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:250
 #, no-c-format
 msgid "interceptors may not be easily disabled at deployment time, and"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:255
 #, no-c-format
-msgid ""
-"the interceptor ordering is non-global &#8212; it is determined by the order "
-"in which interceptors are listed at the class level."
+msgid "the interceptor ordering is non-global — it is determined by the order in which interceptors are listed at the class level."
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:262
 #, no-c-format
 msgid "Therefore, we recommend the use of CDI-style interceptor bindings."
 msgstr ""
+

Modified: doc/trunk/reference/pot/intro.pot
===================================================================
--- doc/trunk/reference/pot/intro.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/intro.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,343 +1,134 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"PO-Revision-Date: 2010-03-02T13:07:18\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: intro.xml:4
 #, no-c-format
 msgid "Introduction"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:6
 #, no-c-format
-msgid ""
-"So you're keen to get started writing your first bean? Or perhaps you're "
-"skeptical, wondering what kinds of hoops the CDI specification will make you "
-"jump through! The good news is that you've probably already written and used "
-"hundreds, perhaps thousands of beans. CDI just makes it easier to actually "
-"use them to build an application!"
+msgid "So you're keen to get started writing your first bean? Or perhaps you're skeptical, wondering what kinds of hoops the CDI specification will make you jump through! The good news is that you've probably already written and used hundreds, perhaps thousands of beans. CDI just makes it easier to actually use them to build an application!"
 msgstr ""
 
 #. Tag: title
-#: intro.xml:13
 #, no-c-format
 msgid "What is a bean?"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:15
 #, no-c-format
-msgid ""
-"A bean is exactly what you think it is. Only now, it has a true identity in "
-"the container environment."
+msgid "A bean is exactly what you think it is. Only now, it has a true identity in the container environment."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:19
 #, no-c-format
-msgid ""
-"Prior to Java EE 6, there was no clear definition of the term \"bean\" in "
-"the Java EE platform. Of course, we've been calling Java classes used in web "
-"and enterprise applications \"beans\" for years. There were even a couple of "
-"different kinds of things called \"beans\" in EE specifications, including "
-"EJB beans and JSF managed beans. Meanwhile, other third-party frameworks "
-"such as Spring and Seam introduced their own ideas of what it meant to be a "
-"\"bean\". What we've been missing is a common definition."
+msgid "Prior to Java EE 6, there was no clear definition of the term \"bean\" in the Java EE platform. Of course, we've been calling Java classes used in web and enterprise applications \"beans\" for years. There were even a couple of different kinds of things called \"beans\" in EE specifications, including EJB beans and JSF managed beans. Meanwhile, other third-party frameworks such as Spring and Seam introduced their own ideas of what it meant to be a \"bean\". What we've been missing is a common definition."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:27
 #, no-c-format
-msgid ""
-"Java EE 6 finally lays down that common definition in the Managed Beans "
-"specification. Managed Beans are defined as container-managed objects with "
-"minimal programming restrictions, otherwise known by the acronym POJO (Plain "
-"Old Java Object). They support a small set of basic services, such as "
-"resource injection, lifecycle callbacks and interceptors. Companion "
-"specifications, such as EJB and CDI, build on this basic model. But, "
-"<emphasis>at last</emphasis>, there's a uniform concept of a bean and a "
-"lightweight component model that's aligned across the Java EE platform."
+msgid "Java EE 6 finally lays down that common definition in the Managed Beans specification. Managed Beans are defined as container-managed objects with minimal programming restrictions, otherwise known by the acronym POJO (Plain Old Java Object). They support a small set of basic services, such as resource injection, lifecycle callbacks and interceptors. Companion specifications, such as EJB and CDI, build on this basic model. But, <emphasis>at last</emphasis>, there's a uniform concept of a bean and a lightweight component model that's aligned across the Java EE platform."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:36
 #, no-c-format
-msgid ""
-"With very few exceptions, almost every concrete Java class that has a "
-"constructor with no parameters (or a constructor designated with the "
-"annotation <literal>@Inject</literal>) is a bean. This includes every "
-"JavaBean and every EJB session bean. If you've already got some JavaBeans or "
-"session beans lying around, they're already beans&#8212;you won't need any "
-"additional special metadata. There's just little one thing you need to do "
-"before you can start injecting them into stuff: you need to put them in an "
-"archive (a jar, or a Java EE module such as a war or EJB jar) that contains "
-"a special marker file: <literal>META-INF/beans.xml</literal>."
+msgid "With very few exceptions, almost every concrete Java class that has a constructor with no parameters (or a constructor designated with the annotation <literal>@Inject</literal>) is a bean. This includes every JavaBean and every EJB session bean. If you've already got some JavaBeans or session beans lying around, they're already beans—you won't need any additional special metadata. There's just little one thing you need to do before you can start injecting them into stuff: you need to put them in an archive (a jar, or a Java EE module such as a war or EJB jar) that contains a special marker file: <literal>META-INF/beans.xml</literal>."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:45
 #, no-c-format
-msgid ""
-"The JavaBeans and EJBs you've been writing every day, up until now, have not "
-"been able to take advantage of the new services defined by the CDI "
-"specification. But you'll be able to use every one of them with CDI&#8212;"
-"allowing the container to create and destroy instances of your beans and "
-"associate them with a designated context, injecting them into other beans, "
-"using them in EL expressions, specializing them with qualifier annotations, "
-"even adding interceptors and decorators to them&#8212;without modifying your "
-"existing code. At most, you'll need to add some annotations."
+msgid "The JavaBeans and EJBs you've been writing every day, up until now, have not been able to take advantage of the new services defined by the CDI specification. But you'll be able to use every one of them with CDI—allowing the container to create and destroy instances of your beans and associate them with a designated context, injecting them into other beans, using them in EL expressions, specializing them with qualifier annotations, even adding interceptors and decorators to them—without modifying your existing code. At most, you'll need to add some annotations."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:54
 #, no-c-format
 msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
-#: intro.xml:61
 #, no-c-format
 msgid "Getting our feet wet"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:63
 #, no-c-format
-msgid ""
-"Suppose that we have two existing Java classes that we've been using for "
-"years in various applications. The first class parses a string into a list "
-"of sentences:"
+msgid "Suppose that we have two existing Java classes that we've been using for years in various applications. The first class parses a string into a list of sentences:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:68
-#, no-c-format
-msgid ""
-"<![CDATA[public class SentenceParser {\n"
-"   public List<String> parse(String text) { ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:70
 #, no-c-format
-msgid ""
-"The second existing class is a stateless session bean front-end for an "
-"external system that is able to translate sentences from one language to "
-"another:"
+msgid "The second existing class is a stateless session bean front-end for an external system that is able to translate sentences from one language to another:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:75
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"   public String translate(String sentence) { ... }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:77
 #, no-c-format
 msgid "Where <literal>Translator</literal> is the EJB local interface:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:79
-#, no-c-format
-msgid ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"   public String translate(String sentence);\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:81
 #, no-c-format
-msgid ""
-"Unfortunately, we don't have a class that translates whole text documents. "
-"So let's write a bean for this job:"
+msgid "Unfortunately, we don't have a class that translates whole text documents. So let's write a bean for this job:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:85
-#, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator {\n"
-"   private SentenceParser sentenceParser;\n"
-"   private Translator sentenceTranslator;\n"
-"    \n"
-"   @Inject\n"
-"   TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"      this.sentenceParser = sentenceParser;\n"
-"      this.sentenceTranslator = sentenceTranslator;\n"
-"   }\n"
-"    \n"
-"   public String translate(String text) {\n"
-"      StringBuilder sb = new StringBuilder();\n"
-"      for (String sentence: sentenceParser.parse(text)) {\n"
-"          sb.append(sentenceTranslator.translate(sentence));\n"
-"      }\n"
-"      return sb.toString();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:87
 #, no-c-format
-msgid ""
-"But wait! <literal>TextTranslator</literal> does not have a constructor with "
-"no parameters! Is it still a bean? If you remember, a class that does not "
-"have a constructor with no parameters can still be a bean if it has a "
-"constructor annotated <literal>@Inject</literal>."
+msgid "But wait! <literal>TextTranslator</literal> does not have a constructor with no parameters! Is it still a bean? If you remember, a class that does not have a constructor with no parameters can still be a bean if it has a constructor annotated <literal>@Inject</literal>."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:93
 #, no-c-format
-msgid ""
-"As you've guessed, the <literal>@Inject</literal> annotation has something "
-"to do with dependency injection! <literal>@Inject</literal> may be applied "
-"to a constructor or method of a bean, and tells the container to call that "
-"constructor or method when instantiating the bean. The container will inject "
-"other beans into the parameters of the constructor or method."
+msgid "As you've guessed, the <literal>@Inject</literal> annotation has something to do with dependency injection! <literal>@Inject</literal> may be applied to a constructor or method of a bean, and tells the container to call that constructor or method when instantiating the bean. The container will inject other beans into the parameters of the constructor or method."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:100
 #, no-c-format
-msgid ""
-"We may obtain an instance of <literal>TextTranslator</literal> by injecting "
-"it into a constructor, method or field of a bean, or a field or method of a "
-"Java EE component class such as a servlet. The container chooses the object "
-"to be injected based on the type of the injection point, not the name of the "
-"field, method or parameter."
+msgid "We may obtain an instance of <literal>TextTranslator</literal> by injecting it into a constructor, method or field of a bean, or a field or method of a Java EE component class such as a servlet. The container chooses the object to be injected based on the type of the injection point, not the name of the field, method or parameter."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:107
 #, no-c-format
-msgid ""
-"Let's create a UI controller bean that uses field injection to obtain an "
-"instance of the <literal>TextTranslator</literal>, translating the text "
-"entered by a user:"
+msgid "Let's create a UI controller bean that uses field injection to obtain an instance of the <literal>TextTranslator</literal>, translating the text entered by a user:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:116
-#, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class TranslateController {\n"
-"   @Inject TextTranslator textTranslator;\n"
-"\n"
-"   private String inputText;\n"
-"   private String translation;\n"
-"\n"
-"   // JSF action method, perhaps\n"
-"   public void translate() {\n"
-"      translation = textTranslator.translate(inputText); \n"
-"   }\n"
-"\n"
-"   public String getInputText() {\n"
-"      return inputText;\n"
-"   }\n"
-"\n"
-"   public void setInputText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"\n"
-"   public String getTranslation() {\n"
-"      return translation;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:119
 #, no-c-format
 msgid "Field injection of <literal>TextTranslator</literal> instance"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:127
 #, no-c-format
-msgid ""
-"Notice the controller bean is request-scoped and named. Since this "
-"combination is so common in web applications, there's a built-in annotation "
-"for it in CDI that we could have used as a shorthand. When the (stereotype) "
-"annotation <literal>@Model</literal> is declared on a class, it creates a "
-"request-scoped and named bean."
+msgid "Notice the controller bean is request-scoped and named. Since this combination is so common in web applications, there's a built-in annotation for it in CDI that we could have used as a shorthand. When the (stereotype) annotation <literal>@Model</literal> is declared on a class, it creates a request-scoped and named bean."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:135
 #, no-c-format
-msgid ""
-"Alternatively, we may obtain an instance of <literal>TextTranslator</"
-"literal> programmatically from an injected instance of <literal>Instance</"
-"literal>, parameterized with the bean type:"
+msgid "Alternatively, we may obtain an instance of <literal>TextTranslator</literal> programmatically from an injected instance of <literal>Instance</literal>, parameterized with the bean type:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:140
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
-"...\n"
-"public void translate() {\n"
-"   textTranslatorInstance.get().translate(inputText);\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:142
 #, no-c-format
-msgid ""
-"Notice that it isn't necessary to create a getter or setter method to inject "
-"one bean into another. CDI can access an injected field directly (even if "
-"it's private!), which sometimes helps eliminate some wasteful code. The name "
-"of the field is arbitrary. It's the field's type that determines what is "
-"injected."
+msgid "Notice that it isn't necessary to create a getter or setter method to inject one bean into another. CDI can access an injected field directly (even if it's private!), which sometimes helps eliminate some wasteful code. The name of the field is arbitrary. It's the field's type that determines what is injected."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:148
 #, no-c-format
-msgid ""
-"At system initialization time, the container must validate that exactly one "
-"bean exists which satisfies each injection point. In our example, if no "
-"implementation of <literal>Translator</literal> is available&#8212;if the "
-"<literal>SentenceTranslator</literal> EJB was not deployed&#8212;the "
-"container would inform us of an <emphasis>unsatisfied dependency</emphasis>. "
-"If more than one implementation of <literal>Translator</literal> were "
-"available, the container would inform us of the <emphasis>ambiguous "
-"dependency</emphasis>."
+msgid "At system initialization time, the container must validate that exactly one bean exists which satisfies each injection point. In our example, if no implementation of <literal>Translator</literal> is available—if the <literal>SentenceTranslator</literal> EJB was not deployed—the container would inform us of an <emphasis>unsatisfied dependency</emphasis>. If more than one implementation of <literal>Translator</literal> were available, the container would inform us of the <emphasis>ambiguous dependency</emphasis>."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:156
 #, no-c-format
-msgid ""
-"Before we get too deep in the details, let's pause and examine a bean's "
-"anatomy. What aspects of the bean are significant, and what gives it its "
-"identity? Instead of just giving examples of beans, we're going to define "
-"what <emphasis>makes</emphasis> something a bean."
+msgid "Before we get too deep in the details, let's pause and examine a bean's anatomy. What aspects of the bean are significant, and what gives it its identity? Instead of just giving examples of beans, we're going to define what <emphasis>makes</emphasis> something a bean."
 msgstr ""
+

Modified: doc/trunk/reference/pot/master.pot
===================================================================
--- doc/trunk/reference/pot/master.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/master.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,88 +1,59 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"PO-Revision-Date: 2010-03-02T13:07:18\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: master.xml:9
 #, no-c-format
 msgid "A note about naming and nomenclature"
 msgstr ""
 
 #. Tag: para
-#: master.xml:10
 #, no-c-format
-msgid ""
-"Shortly before the final draft of JSR-299 was submitted, the specification "
-"changed its name from \"Web Beans\" to \"Java Contexts and Dependency "
-"Injection for the Java EE platform\", abbreviated CDI. For a brief period "
-"after the renaming, the reference implementation adopted the name \"Web Beans"
-"\". However, this ended up causing more confusion than it solved and Red Hat "
-"decided to change the name of the reference implementation to \"Weld\". You "
-"may still find other documentation, blogs, forum posts, etc. that use the "
-"old nomenclature. Please update any references you can. The naming game is "
-"over."
+msgid "Shortly before the final draft of JSR-299 was submitted, the specification changed its name from \"Web Beans\" to \"Java Contexts and Dependency Injection for the Java EE platform\", abbreviated CDI. For a brief period after the renaming, the reference implementation adopted the name \"Web Beans\". However, this ended up causing more confusion than it solved and Red Hat decided to change the name of the reference implementation to \"Weld\". You may still find other documentation, blogs, forum posts, etc. that use the old nomenclature. Please update any references you can. The naming game is over."
 msgstr ""
 
 #. Tag: para
-#: master.xml:19
 #, no-c-format
-msgid ""
-"You'll also find that some of the functionality that once existed in the "
-"specification is now missing, such as defining beans in XML. These features "
-"will be available as portable extensions for CDI in the Weld project, and "
-"perhaps other implementations."
+msgid "You'll also find that some of the functionality that once existed in the specification is now missing, such as defining beans in XML. These features will be available as portable extensions for CDI in the Weld project, and perhaps other implementations."
 msgstr ""
 
 #. Tag: para
-#: master.xml:25
 #, no-c-format
-msgid ""
-"Note that this reference guide was started while changes were still being "
-"made to the specification. We've done our best to update it for accuracy. If "
-"you discover a conflict between what is written in this guide and the "
-"specification, the specification is the authority&#8212;assume it is "
-"correct. If you believe you have found an error in the specification, please "
-"report it to the JSR-299 EG."
+msgid "Note that this reference guide was started while changes were still being made to the specification. We've done our best to update it for accuracy. If you discover a conflict between what is written in this guide and the specification, the specification is the authority—assume it is correct. If you believe you have found an error in the specification, please report it to the JSR-299 EG."
 msgstr ""
 
 #. Tag: title
-#: master.xml:36
 #, no-c-format
 msgid "Beans"
 msgstr ""
 
 #. Tag: title
-#: master.xml:49
 #, no-c-format
 msgid "Weld, the CDI Reference Implementation"
 msgstr ""
 
 #. Tag: title
-#: master.xml:59
 #, no-c-format
 msgid "Loose coupling with strong typing"
 msgstr ""
 
 #. Tag: title
-#: master.xml:75
 #, no-c-format
 msgid "CDI and the Java EE ecosystem"
 msgstr ""
 
 #. Tag: title
-#: master.xml:87
 #, no-c-format
 msgid "Weld reference"
 msgstr ""
+

Modified: doc/trunk/reference/pot/next.pot
===================================================================
--- doc/trunk/reference/pot/next.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/next.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,127 +1,69 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"PO-Revision-Date: 2010-03-02T13:07:18\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: next.xml:4
 #, no-c-format
 msgid "Next steps"
 msgstr ""
 
 #. Tag: para
-#: next.xml:6
 #, no-c-format
-msgid ""
-"Because CDI is so new, there's not yet a lot of information available "
-"online. That will change over time. Regardless, the CDI specification "
-"remains the authority for information on CDI. The spec is less than 100 "
-"pages and is quite readable (don't worry, it's not like your Blu-ray player "
-"manual). Of course, it covers many details we've skipped over here. The spec "
-"is available on the <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-"
-"299 page</ulink> at the JCP website."
+msgid "Because CDI is so new, there's not yet a lot of information available online. That will change over time. Regardless, the CDI specification remains the authority for information on CDI. The spec is less than 100 pages and is quite readable (don't worry, it's not like your Blu-ray player manual). Of course, it covers many details we've skipped over here. The spec is available on the <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-299 page</ulink> at the JCP website."
 msgstr ""
 
 #. Tag: para
-#: next.xml:14
 #, no-c-format
-msgid ""
-"The CDI reference implementation, Weld, is being developed at the <ulink url="
-"\"http://seamframework.org/Weld\">Seam project</ulink>. The RI development "
-"team and the CDI spec lead blog at <ulink url=\"http://in.relation.to\">in."
-"relation.to</ulink>. This guide was originally based on a series of blog "
-"entries published there while the specification was being developed. It's "
-"probably the best source of information about the future of CDI, Weld and "
-"Seam."
+msgid "The CDI reference implementation, Weld, is being developed at the <ulink url=\"http://seamframework.org/Weld\">Seam project</ulink>. The RI development team and the CDI spec lead blog at <ulink url=\"http://in.relation.to\">in.relation.to</ulink>. This guide was originally based on a series of blog entries published there while the specification was being developed. It's probably the best source of information about the future of CDI, Weld and Seam."
 msgstr ""
 
 #. Tag: para
-#: next.xml:22
 #, no-c-format
-msgid ""
-"We encourage you to follow the <ulink url=\"https://lists.jboss.org/mailman/"
-"listinfo/weld-dev\">weld-dev</ulink> mailing list and to get involved in "
-"<ulink url=\"http://seamframework.org/Weld/Development\">development</"
-"ulink>. If you are reading this guide, you likely have something to offer."
+msgid "We encourage you to follow the <ulink url=\"https://lists.jboss.org/mailman/listinfo/weld-dev\">weld-dev</ulink> mailing list and to get involved in <ulink url=\"http://seamframework.org/Weld/Development\">development</ulink>. If you are reading this guide, you likely have something to offer."
 msgstr ""
 
 #. Tag: para
-#: next.xml:28
 #, no-c-format
-msgid ""
-"We are eager to find volunteers to help revise, proofread or translate this "
-"guide. The first step is getting the source of this guide checked out. To "
-"build against the trunk (latest source), follow these steps:"
+msgid "We are eager to find volunteers to help revise, proofread or translate this guide. The first step is getting the source of this guide checked out. To build against the trunk (latest source), follow these steps:"
 msgstr ""
 
 #. Tag: para
-#: next.xml:35
 #, no-c-format
-msgid ""
-"Checkout source from <ulink url=\"http://anonsvn.jboss.org/repos/weld/doc/"
-"trunk/reference\">http://anonsvn.jboss.org/repos/weld/doc/trunk/reference</"
-"ulink> using SVN"
+msgid "Checkout source from <ulink url=\"http://anonsvn.jboss.org/repos/weld/doc/trunk/reference\">http://anonsvn.jboss.org/repos/weld/doc/trunk/reference</ulink> using SVN"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:40
-#, no-c-format
-msgid ""
-"<![CDATA[$> svn co http://anonsvn.jboss.org/repos/weld/doc/trunk/reference "
-"weld-reference]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:43
 #, no-c-format
-msgid ""
-"Edit the <literal>pom.xml</literal> file in the root of the checkout and "
-"remove the \"<literal>-SNAPSHOT</literal>\" from the version element (so you "
-"don't have to build other Weld modules)."
+msgid "Edit the <literal>pom.xml</literal> file in the root of the checkout and remove the \"<literal>-SNAPSHOT</literal>\" from the version element (so you don't have to build other Weld modules)."
 msgstr ""
 
 #. Tag: para
-#: next.xml:49
 #, no-c-format
 msgid "Build using Maven 2"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:52
-#, no-c-format
-msgid "<![CDATA[$> mvn]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:54
 #, no-c-format
-msgid ""
-"If you experience an out of memory error, try setting this environment "
-"variable: <literal>MAVEN_OPTS=-Xmx1024m</literal>"
+msgid "If you experience an out of memory error, try setting this environment variable: <literal>MAVEN_OPTS=-Xmx1024m</literal>"
 msgstr ""
 
 #. Tag: para
-#: next.xml:61
 #, no-c-format
-msgid ""
-"The PDF version of the reference guide will appear the current directory. "
-"You can find the HTML version in <literal>target/docbook/publish/en-US/html</"
-"literal>."
+msgid "The PDF version of the reference guide will appear the current directory. You can find the HTML version in <literal>target/docbook/publish/en-US/html</literal>."
 msgstr ""
 
 #. Tag: para
-#: next.xml:66
 #, no-c-format
 msgid "We look forward to your participation!"
 msgstr ""
+

Modified: doc/trunk/reference/pot/part1.pot
===================================================================
--- doc/trunk/reference/pot/part1.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/part1.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,309 +1,194 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"PO-Revision-Date: 2010-03-02T13:07:18\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part1.xml:14
 #, no-c-format
-msgid ""
-"The <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-299</ulink> "
-"specification (CDI) defines a set of complementary services that help "
-"improve the structure of application code. CDI layers an enhanced lifecycle "
-"and interaction model over existing Java component types, including managed "
-"beans and Enterprise Java Beans. The CDI services provide:"
+msgid "The <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-299</ulink> specification (CDI) defines a set of complementary services that help improve the structure of application code. CDI layers an enhanced lifecycle and interaction model over existing Java component types, including managed beans and Enterprise Java Beans. The CDI services provide:"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:23
 #, no-c-format
-msgid ""
-"an improved lifecycle for stateful objects, bound to well-defined "
-"<emphasis>contexts</emphasis>,"
+msgid "an improved lifecycle for stateful objects, bound to well-defined <emphasis>contexts</emphasis>,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:28
 #, no-c-format
 msgid "a typesafe approach to <emphasis>dependency injection</emphasis>,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:33
 #, no-c-format
-msgid ""
-"object interaction via an <emphasis>event notification facility</emphasis>,"
+msgid "object interaction via an <emphasis>event notification facility</emphasis>,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:38
 #, no-c-format
-msgid ""
-"a better approach to binding <emphasis>interceptors</emphasis> to objects, "
-"along with a new kind of interceptor, called a <emphasis>decorator</"
-"emphasis>, that is more appropriate for use in solving business problems, and"
+msgid "a better approach to binding <emphasis>interceptors</emphasis> to objects, along with a new kind of interceptor, called a <emphasis>decorator</emphasis>, that is more appropriate for use in solving business problems, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:45
 #, no-c-format
-msgid ""
-"an <emphasis>SPI</emphasis> for developing portable extensions to the "
-"container."
+msgid "an <emphasis>SPI</emphasis> for developing portable extensions to the container."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:51
 #, no-c-format
-msgid ""
-"The CDI services are a core aspect of the Java EE platform and include full "
-"support for Java EE modularity and the Java EE component architecture. But "
-"the specification does not limit the use of CDI to the Java EE environment. "
-"In the Java SE environment, the services might be provided by a standalone "
-"CDI implementation like Weld (see <xref linkend=\"weld-se\"/>), or even by a "
-"container that also implements the subset of EJB defined for embedded usage "
-"by the EJB 3.1 specification. CDI is especially useful in the context of web "
-"application development, but the problems it solves are general development "
-"concerns and it is therefore applicable to a wide variety of application."
+msgid "The CDI services are a core aspect of the Java EE platform and include full support for Java EE modularity and the Java EE component architecture. But the specification does not limit the use of CDI to the Java EE environment. In the Java SE environment, the services might be provided by a standalone CDI implementation like Weld (see <xref linkend=\"weld-se\" />), or even by a container that also implements the subset of EJB defined for embedded usage by the EJB 3.1 specification. CDI is especially useful in the context of web application development, but the problems it solves are general development concerns and it is therefore applicable to a wide variety of application."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:61
 #, no-c-format
-msgid ""
-"An object bound to a lifecycle context is called a bean. CDI includes built-"
-"in support for several different kinds of bean, including the following Java "
-"EE component types:"
+msgid "An object bound to a lifecycle context is called a bean. CDI includes built-in support for several different kinds of bean, including the following Java EE component types:"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:68
 #, no-c-format
 msgid "managed beans, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:71
 #, no-c-format
 msgid "EJB session beans."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:75
 #, no-c-format
-msgid ""
-"Both managed beans and EJB session beans may inject other beans. But some "
-"other objects, which are not themselves beans in the sense used here, may "
-"also have beans injected via CDI. In the Java EE platform, the following "
-"kinds of component may have beans injected:"
+msgid "Both managed beans and EJB session beans may inject other beans. But some other objects, which are not themselves beans in the sense used here, may also have beans injected via CDI. In the Java EE platform, the following kinds of component may have beans injected:"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:83
 #, no-c-format
 msgid "message-driven beans,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:86
 #, no-c-format
 msgid "interceptors,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:89
 #, no-c-format
 msgid "servlets, servlet filters and servlet event listeners,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:92
 #, no-c-format
 msgid "JAX-WS service endpoints and handlers, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:95
 #, no-c-format
 msgid "JSP tag handlers and tag library event listeners."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:99
 #, no-c-format
-msgid ""
-"CDI relieves the user of an unfamiliar API of the need to answer the "
-"following questions:"
+msgid "CDI relieves the user of an unfamiliar API of the need to answer the following questions:"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:105
 #, no-c-format
 msgid "What is the lifecycle of this object?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:108
 #, no-c-format
 msgid "How many simultaneous clients can it have?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:111
 #, no-c-format
 msgid "Is it multithreaded?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:114
 #, no-c-format
 msgid "How do I get access to it from a client?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:117
 #, no-c-format
 msgid "Do I need to explicitly destroy it?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:120
 #, no-c-format
-msgid ""
-"Where should I keep the reference to it when I'm not currently using it?"
+msgid "Where should I keep the reference to it when I'm not currently using it?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:125
 #, no-c-format
-msgid ""
-"How can I define an alternative implementation, so that the implementation "
-"can vary at deployment time?"
+msgid "How can I define an alternative implementation, so that the implementation can vary at deployment time?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:131
 #, no-c-format
 msgid "How should I go about sharing this object between other objects?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:137
 #, no-c-format
-msgid ""
-"CDI is more than a framework. It's a whole, rich programming model. The "
-"<emphasis>theme</emphasis> of CDI is <emphasis>loose-coupling with strong "
-"typing</emphasis>. Let's study what that phrase means."
+msgid "CDI is more than a framework. It's a whole, rich programming model. The <emphasis>theme</emphasis> of CDI is <emphasis>loose-coupling with strong typing</emphasis>. Let's study what that phrase means."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:142
 #, no-c-format
-msgid ""
-"A bean specifies only the type and semantics of other beans it depends upon. "
-"It need not be aware of the actual lifecycle, concrete implementation, "
-"threading model or other clients of any bean it interacts with. Even better, "
-"the concrete implementation, lifecycle and threading model of a bean may "
-"vary according to the deployment scenario, without affecting any client. "
-"This loose-coupling makes your code easier to maintain."
+msgid "A bean specifies only the type and semantics of other beans it depends upon. It need not be aware of the actual lifecycle, concrete implementation, threading model or other clients of any bean it interacts with. Even better, the concrete implementation, lifecycle and threading model of a bean may vary according to the deployment scenario, without affecting any client. This loose-coupling makes your code easier to maintain."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:149
 #, no-c-format
-msgid ""
-"Events, interceptors and decorators enhance the loose-coupling inherent in "
-"this model:"
+msgid "Events, interceptors and decorators enhance the loose-coupling inherent in this model:"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:155
 #, no-c-format
-msgid ""
-"<emphasis>event notifications</emphasis> decouple event producers from event "
-"consumers,"
+msgid "<emphasis>event notifications</emphasis> decouple event producers from event consumers,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:159
 #, no-c-format
-msgid ""
-"<emphasis>interceptors</emphasis> decouple technical concerns from business "
-"logic, and"
+msgid "<emphasis>interceptors</emphasis> decouple technical concerns from business logic, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:163
 #, no-c-format
-msgid ""
-"<emphasis>decorators</emphasis> allow business concerns to be "
-"compartmentalized."
+msgid "<emphasis>decorators</emphasis> allow business concerns to be compartmentalized."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:168
 #, no-c-format
-msgid ""
-"What's even more powerful (and comforting) is that CDI provides all these "
-"facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on "
-"string-based identifiers to determine how collaborating objects fit "
-"together. Instead, CDI uses the typing information that is already available "
-"in the Java object model, augmented using a new programming pattern, called "
-"<emphasis>qualifier annotations</emphasis>, to wire together beans, their "
-"dependencies, their interceptors and decorators, and their event consumers. "
-"Usage of XML descriptors is minimized to truly deployment-specific "
-"information."
+msgid "What's even more powerful (and comforting) is that CDI provides all these facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on string-based identifiers to determine how collaborating objects fit together. Instead, CDI uses the typing information that is already available in the Java object model, augmented using a new programming pattern, called <emphasis>qualifier annotations</emphasis>, to wire together beans, their dependencies, their interceptors and decorators, and their event consumers. Usage of XML descriptors is minimized to truly deployment-specific information."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:177
 #, no-c-format
-msgid ""
-"But CDI isn't a restrictive programming model. It doesn't tell you how you "
-"should to structure your application into layers, how you should handle "
-"persistence, or what web framework you have to use. You'll have to decide "
-"those kinds of things for yourself."
+msgid "But CDI isn't a restrictive programming model. It doesn't tell you how you should to structure your application into layers, how you should handle persistence, or what web framework you have to use. You'll have to decide those kinds of things for yourself."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:183
 #, no-c-format
-msgid ""
-"CDI even provides a comprehensive SPI, allowing other kinds of object "
-"defined by future Java EE specifications or by third-party frameworks to be "
-"cleanly integrated with CDI, take advantage of the CDI services, and "
-"interact with any other kind of bean."
+msgid "CDI even provides a comprehensive SPI, allowing other kinds of object defined by future Java EE specifications or by third-party frameworks to be cleanly integrated with CDI, take advantage of the CDI services, and interact with any other kind of bean."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:189
 #, no-c-format
-msgid ""
-"CDI was influenced by a number of existing Java frameworks, including Seam, "
-"Guice and Spring. However, CDI has its own, very distinct, character: more "
-"typesafe than Seam, more stateful and less XML-centric than Spring, more web "
-"and enterprise-application capable than Guice. But it couldn't have been any "
-"of these without inspiration from the frameworks mentioned and "
-"<emphasis>lots</emphasis> of collaboration and hard work by the JSR-299 "
-"Expert Group (EG)."
+msgid "CDI was influenced by a number of existing Java frameworks, including Seam, Guice and Spring. However, CDI has its own, very distinct, character: more typesafe than Seam, more stateful and less XML-centric than Spring, more web and enterprise-application capable than Guice. But it couldn't have been any of these without inspiration from the frameworks mentioned and <emphasis>lots</emphasis> of collaboration and hard work by the JSR-299 Expert Group (EG)."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:197
 #, no-c-format
-msgid ""
-"Finally, CDI is a <ulink url=\"http://jcp.org\">Java Community Process</"
-"ulink> (JCP) standard. Java EE 6 requires that all compliant application "
-"servers provide support for JSR-299 (even in the web profile)."
+msgid "Finally, CDI is a <ulink url=\"http://jcp.org\">Java Community Process</ulink> (JCP) standard. Java EE 6 requires that all compliant application servers provide support for JSR-299 (even in the web profile)."
 msgstr ""
+

Modified: doc/trunk/reference/pot/part2.pot
===================================================================
--- doc/trunk/reference/pot/part2.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/part2.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,45 +1,29 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"PO-Revision-Date: 2010-03-02T13:07:18\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part2.xml:5
 #, no-c-format
-msgid ""
-"Weld, the JSR-299 Reference Implementation (RI), is being developed as part "
-"of the <ulink url=\"http://seamframework.org/Weld\">Seam project</ulink>. "
-"You can download the latest community release of Weld from the <ulink url="
-"\"http://seamframework.org/Download\">download page</ulink>. Information "
-"about the Weld source code repository and instructions about how to obtain "
-"and build the source can be found on the same page."
+msgid "Weld, the JSR-299 Reference Implementation (RI), is being developed as part of the <ulink url=\"http://seamframework.org/Weld\">Seam project</ulink>. You can download the latest community release of Weld from the <ulink url=\"http://seamframework.org/Download\">download page</ulink>. Information about the Weld source code repository and instructions about how to obtain and build the source can be found on the same page."
 msgstr ""
 
 #. Tag: para
-#: part2.xml:12
 #, no-c-format
-msgid ""
-"Weld provides a complete SPI allowing Java EE containers such as JBoss AS "
-"and GlassFish to use Weld as their built-in CDI implementation. Weld also "
-"runs in servlet engines like Tomcat and Jetty, or even in a plain Java SE "
-"environment."
+msgid "Weld provides a complete SPI allowing Java EE containers such as JBoss AS and GlassFish to use Weld as their built-in CDI implementation. Weld also runs in servlet engines like Tomcat and Jetty, or even in a plain Java SE environment."
 msgstr ""
 
 #. Tag: para
-#: part2.xml:18
 #, no-c-format
-msgid ""
-"Weld comes with an extensive library of examples, which are a great starting "
-"point from which to learn CDI."
+msgid "Weld comes with an extensive library of examples, which are a great starting point from which to learn CDI."
 msgstr ""
+

Modified: doc/trunk/reference/pot/part3.pot
===================================================================
--- doc/trunk/reference/pot/part3.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/part3.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,223 +1,144 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"PO-Revision-Date: 2010-03-02T13:07:18\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part3.xml:5
 #, no-c-format
-msgid ""
-"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've "
-"already seen three means of achieving loose coupling:"
+msgid "The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've already seen three means of achieving loose coupling:"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:12
 #, no-c-format
 msgid "<emphasis>alternatives</emphasis> enable deployment time polymorphism,"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:17
 #, no-c-format
 msgid "<emphasis>producer methods</emphasis> enable runtime polymorphism, and"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:21
 #, no-c-format
-msgid ""
-"<emphasis>contextual lifecycle management</emphasis> decouples bean "
-"lifecycles."
+msgid "<emphasis>contextual lifecycle management</emphasis> decouples bean lifecycles."
 msgstr ""
 
 #. Tag: para
-#: part3.xml:27
 #, no-c-format
-msgid ""
-"These techniques serve to enable loose coupling of client and server. The "
-"client is no longer tightly bound to an implementation of an interface, nor "
-"is it required to manage the lifecycle of the implementation. This approach "
-"lets <emphasis>stateful objects interact as if they were services</emphasis>."
+msgid "These techniques serve to enable loose coupling of client and server. The client is no longer tightly bound to an implementation of an interface, nor is it required to manage the lifecycle of the implementation. This approach lets <emphasis>stateful objects interact as if they were services</emphasis>."
 msgstr ""
 
 #. Tag: para
-#: part3.xml:33
 #, no-c-format
-msgid ""
-"Loose coupling makes a system more <emphasis>dynamic</emphasis>. The system "
-"can respond to change in a well-defined manner. In the past, frameworks that "
-"attempted to provide the facilities listed above invariably did it by "
-"sacrificing type safety (most notably by using XML descriptors). CDI is the "
-"first technology, and certainly the first specification in the Java EE "
-"platform, that achieves this level of loose coupling in a typesafe way."
+msgid "Loose coupling makes a system more <emphasis>dynamic</emphasis>. The system can respond to change in a well-defined manner. In the past, frameworks that attempted to provide the facilities listed above invariably did it by sacrificing type safety (most notably by using XML descriptors). CDI is the first technology, and certainly the first specification in the Java EE platform, that achieves this level of loose coupling in a typesafe way."
 msgstr ""
 
 #. Tag: para
-#: part3.xml:40
 #, no-c-format
-msgid ""
-"CDI provides three extra important facilities that further the goal of loose "
-"coupling:"
+msgid "CDI provides three extra important facilities that further the goal of loose coupling:"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:46
 #, no-c-format
-msgid ""
-"<emphasis>interceptors</emphasis> decouple technical concerns from business "
-"logic,"
+msgid "<emphasis>interceptors</emphasis> decouple technical concerns from business logic,"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:51
 #, no-c-format
-msgid ""
-"<emphasis>decorators</emphasis> may be used to decouple some business "
-"concerns, and"
+msgid "<emphasis>decorators</emphasis> may be used to decouple some business concerns, and"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:56
 #, no-c-format
-msgid ""
-"<emphasis>event notifications</emphasis> decouple event producers from event "
-"consumers."
+msgid "<emphasis>event notifications</emphasis> decouple event producers from event consumers."
 msgstr ""
 
 #. Tag: para
-#: part3.xml:62
 #, no-c-format
-msgid ""
-"The second major theme of CDI is <emphasis>strong typing</emphasis>. The "
-"information about the dependencies, interceptors and decorators of a bean, "
-"and the information about event consumers for an event producer, is "
-"contained in typesafe Java constructs that may be validated by the compiler."
+msgid "The second major theme of CDI is <emphasis>strong typing</emphasis>. The information about the dependencies, interceptors and decorators of a bean, and the information about event consumers for an event producer, is contained in typesafe Java constructs that may be validated by the compiler."
 msgstr ""
 
 #. Tag: para
-#: part3.xml:68
 #, no-c-format
-msgid ""
-"You don't see string-based identifiers in CDI code, not because the "
-"framework is hiding them from you using clever defaulting rules&#8212;so-"
-"called \"configuration by convention\"&#8212;but because there are simply no "
-"strings there to begin with!"
+msgid "You don't see string-based identifiers in CDI code, not because the framework is hiding them from you using clever defaulting rules—so-called \"configuration by convention\"—but because there are simply no strings there to begin with!"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:74
 #, no-c-format
-msgid ""
-"The obvious benefit of this approach is that <emphasis>any</emphasis> IDE "
-"can provide autocompletion, validation and refactoring without the need for "
-"special tooling. But there is a second, less-immediately-obvious, benefit. "
-"It turns out that when you start thinking of identifying objects, events or "
-"interceptors via annotations instead of names, you have an opportunity to "
-"lift the semantic level of your code."
+msgid "The obvious benefit of this approach is that <emphasis>any</emphasis> IDE can provide autocompletion, validation and refactoring without the need for special tooling. But there is a second, less-immediately-obvious, benefit. It turns out that when you start thinking of identifying objects, events or interceptors via annotations instead of names, you have an opportunity to lift the semantic level of your code."
 msgstr ""
 
 #. Tag: para
-#: part3.xml:81
 #, no-c-format
-msgid ""
-"CDI encourages you develop annotations that model concepts, for example,"
+msgid "CDI encourages you develop annotations that model concepts, for example,"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:87
 #, no-c-format
 msgid "<literal>@Asynchronous</literal>,"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:90
 #, no-c-format
 msgid "<literal>@Mock</literal>,"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:93
 #, no-c-format
 msgid "<literal>@Secure</literal> or"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:96
 #, no-c-format
 msgid "<literal>@Updated</literal>,"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:100
 #, no-c-format
 msgid "instead of using compound names like"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:104
 #, no-c-format
 msgid "<literal>asyncPaymentProcessor</literal>,"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:107
 #, no-c-format
 msgid "<literal>mockPaymentProcessor</literal>,"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:110
 #, no-c-format
 msgid "<literal>SecurityInterceptor</literal> or"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:113
 #, no-c-format
 msgid "<literal>DocumentUpdatedEvent</literal>."
 msgstr ""
 
 #. Tag: para
-#: part3.xml:117
 #, no-c-format
-msgid ""
-"The annotations are reusable. They help describe common qualities of "
-"disparate parts of the system. They help us categorize and understand our "
-"code. They help us deal with common concerns in a common way. They make our "
-"code more literate and more understandable."
+msgid "The annotations are reusable. They help describe common qualities of disparate parts of the system. They help us categorize and understand our code. They help us deal with common concerns in a common way. They make our code more literate and more understandable."
 msgstr ""
 
 #. Tag: para
-#: part3.xml:123
 #, no-c-format
-msgid ""
-"CDI <emphasis>stereotypes</emphasis> take this idea a step further. A "
-"stereotype models a common <emphasis>role</emphasis> in your application "
-"architecture. It encapsulates various properties of the role, including "
-"scope, interceptor bindings, qualifiers, etc, into a single reusable "
-"package. (Of course, there is also the benefit of tucking some of those "
-"annotations away)."
+msgid "CDI <emphasis>stereotypes</emphasis> take this idea a step further. A stereotype models a common <emphasis>role</emphasis> in your application architecture. It encapsulates various properties of the role, including scope, interceptor bindings, qualifiers, etc, into a single reusable package. (Of course, there is also the benefit of tucking some of those annotations away)."
 msgstr ""
 
 #. Tag: para
-#: part3.xml:138
 #, no-c-format
-msgid ""
-"We're now ready to meet some more advanced features of CDI. Bear in mind "
-"that these features exist to make our code both easier to validate and more "
-"understandable. Most of the time you don't ever really <emphasis>need</"
-"emphasis> to use these features, but if you use them wisely, you'll come to "
-"appreciate their power."
+msgid "We're now ready to meet some more advanced features of CDI. Bear in mind that these features exist to make our code both easier to validate and more understandable. Most of the time you don't ever really <emphasis>need</emphasis> to use these features, but if you use them wisely, you'll come to appreciate their power."
 msgstr ""
+

Modified: doc/trunk/reference/pot/part4.pot
===================================================================
--- doc/trunk/reference/pot/part4.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/part4.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,57 +1,29 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"PO-Revision-Date: 2010-03-02T13:07:18\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part4.xml:5
 #, no-c-format
-msgid ""
-"The third theme of CDI is <emphasis>integration</emphasis>. We've already "
-"seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound directly "
-"to JSF pages. That's just the beginning. The CDI services are integrated "
-"into the very core of the Java EE platform. Even EJB session beans can take "
-"advantage of the dependency injection, event bus, and contextual lifecycle "
-"management that CDI provides."
+msgid "The third theme of CDI is <emphasis>integration</emphasis>. We've already seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound directly to JSF pages. That's just the beginning. The CDI services are integrated into the very core of the Java EE platform. Even EJB session beans can take advantage of the dependency injection, event bus, and contextual lifecycle management that CDI provides."
 msgstr ""
 
 #. Tag: para
-#: part4.xml:12
 #, no-c-format
-msgid ""
-"CDI is also designed to work in concert with technologies outside of the "
-"platform by providing integration points into the Java EE platform via an "
-"SPI. This SPI positions CDI as the foundation for a new ecosystem of "
-"<emphasis>portable</emphasis> extensions and integration with existing "
-"frameworks and technologies. The CDI services will be able to reach a "
-"diverse collection of technologies, such as business process management "
-"(BPM) engines, existing web frameworks and de facto standard component "
-"models. Of course, The Java EE platform will never be able to standardize "
-"all the interesting technologies that are used in the world of Java "
-"application development, but CDI makes it easier to use the technologies "
-"which are not yet part of the platform seamlessly within the Java EE "
-"environment."
+msgid "CDI is also designed to work in concert with technologies outside of the platform by providing integration points into the Java EE platform via an SPI. This SPI positions CDI as the foundation for a new ecosystem of <emphasis>portable</emphasis> extensions and integration with existing frameworks and technologies. The CDI services will be able to reach a diverse collection of technologies, such as business process management (BPM) engines, existing web frameworks and de facto standard component models. Of course, The Java EE platform will never be able to standardize all the interesting technologies that are used in the world of Java application development, but CDI makes it easier to use the technologies which are not yet part of the platform seamlessly within the Java EE environment."
 msgstr ""
 
 #. Tag: para
-#: part4.xml:23
 #, no-c-format
-msgid ""
-"We're about to see how to take full advantage of the Java EE platform in an "
-"application that uses CDI. We'll also briefly meet a set of SPIs that are "
-"provided to support portable extensions to CDI. You might not ever need to "
-"use these SPIs directly, but don't take them for granted. You will likely be "
-"using them indirectly, every time you use a third-party extension, such as "
-"Seam."
+msgid "We're about to see how to take full advantage of the Java EE platform in an application that uses CDI. We'll also briefly meet a set of SPIs that are provided to support portable extensions to CDI. You might not ever need to use these SPIs directly, but don't take them for granted. You will likely be using them indirectly, every time you use a third-party extension, such as Seam."
 msgstr ""
+

Modified: doc/trunk/reference/pot/part5.pot
===================================================================
--- doc/trunk/reference/pot/part5.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/part5.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,48 +1,29 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"PO-Revision-Date: 2010-03-02T13:07:18\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part5.xml:5
 #, no-c-format
-msgid ""
-"Weld is the reference implementation of JSR-299, and is used by JBoss AS and "
-"Glassfish to provide CDI services for Java Enterprise Edition (Java EE) "
-"applications. Weld also goes beyond the environments and APIs defined by the "
-"JSR-299 specification by providing support for a number of other "
-"environments (such as a servlet container such as Tomcat, or Java SE) and "
-"additional APIs and modules (such as logging and bean utilities)."
+msgid "Weld is the reference implementation of JSR-299, and is used by JBoss AS and Glassfish to provide CDI services for Java Enterprise Edition (Java EE) applications. Weld also goes beyond the environments and APIs defined by the JSR-299 specification by providing support for a number of other environments (such as a servlet container such as Tomcat, or Java SE) and additional APIs and modules (such as logging and bean utilities)."
 msgstr ""
 
 #. Tag: para
-#: part5.xml:12
 #, no-c-format
-msgid ""
-"Some of the extensions in Weld are portable across JSR-299 implementations "
-"(like the logging and bean utilities) and some are specific to Weld (such as "
-"the servlet container support). Weld also provides an SPI on which to build "
-"extensions, so there are several layers involved."
+msgid "Some of the extensions in Weld are portable across JSR-299 implementations (like the logging and bean utilities) and some are specific to Weld (such as the servlet container support). Weld also provides an SPI on which to build extensions, so there are several layers involved."
 msgstr ""
 
 #. Tag: para
-#: part5.xml:18
 #, no-c-format
-msgid ""
-"If you want to get started quickly using Weld (and, in turn, CDI) with JBoss "
-"AS, GlassFish or Tomcat and experiment with one of the examples, take a look "
-"at <xref linkend=\"gettingstarted\"/>. Otherwise read on for a exhaustive "
-"discussion of using Weld in all the environments and application servers it "
-"supports and the Weld extensions."
+msgid "If you want to get started quickly using Weld (and, in turn, CDI) with JBoss AS, GlassFish or Tomcat and experiment with one of the examples, take a look at <xref linkend=\"gettingstarted\" />. Otherwise read on for a exhaustive discussion of using Weld in all the environments and application servers it supports and the Weld extensions."
 msgstr ""
+

Modified: doc/trunk/reference/pot/producermethods.pot
===================================================================
--- doc/trunk/reference/pot/producermethods.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/producermethods.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,376 +1,179 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"PO-Revision-Date: 2010-03-02T13:07:18\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: producermethods.xml:5
 #, no-c-format
 msgid "Producer methods"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:7
 #, no-c-format
-msgid ""
-"Producer methods let us overcome certain limitations that arise when a "
-"container, instead of the application, is responsible for instantiating "
-"objects. They're also the easiest way to integrate objects which are not "
-"beans into the CDI environment."
+msgid "Producer methods let us overcome certain limitations that arise when a container, instead of the application, is responsible for instantiating objects. They're also the easiest way to integrate objects which are not beans into the CDI environment."
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:14
 #, no-c-format
 msgid "According to the spec:"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:18
 #, no-c-format
 msgid "A producer method acts as a source of objects to be injected, where:"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:22
 #, no-c-format
 msgid "the objects to be injected are not required to be instances of beans,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:25
 #, no-c-format
 msgid "the concrete type of the objects to be injected may vary at runtime or"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:28
 #, no-c-format
-msgid ""
-"the objects require some custom initialization that is not performed by the "
-"bean constructor"
+msgid "the objects require some custom initialization that is not performed by the bean constructor"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:36
 #, no-c-format
 msgid "For example, producer methods let us:"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:40
 #, no-c-format
 msgid "expose a JPA entity as a bean,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:43
 #, no-c-format
 msgid "expose any JDK class as a bean,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:46
 #, no-c-format
-msgid ""
-"define multiple beans, with different scopes or initialization, for the same "
-"implementation class, or"
+msgid "define multiple beans, with different scopes or initialization, for the same implementation class, or"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:51
 #, no-c-format
 msgid "vary the implementation of a bean type at runtime."
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:55
 #, no-c-format
-msgid ""
-"In particular, producer methods let us use runtime polymorphism with CDI. As "
-"we've seen, alternative beans are one solution to the problem of deployment-"
-"time polymorphism. But once the system is deployed, the CDI implementation "
-"is fixed. A producer method has no such limitation:"
+msgid "In particular, producer methods let us use runtime polymorphism with CDI. As we've seen, alternative beans are one solution to the problem of deployment-time polymorphism. But once the system is deployed, the CDI implementation is fixed. A producer method has no such limitation:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Preferences implements Serializable {\n"
-"   private PaymentStrategyType paymentStrategy;\n"
-"   ...\n"
-"   @Produces @Preferred \n"
-"   public PaymentStrategy getPaymentStrategy() {\n"
-"       switch (paymentStrategy) {\n"
-"           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
-"           case CHECK: return new CheckPaymentStrategy();\n"
-"           case PAYPAL: return new PayPalPaymentStrategy();\n"
-"           default: return null;\n"
-"       } \n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:63
 #, no-c-format
 msgid "Consider an injection point:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:65
-#, no-c-format
-msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:67
 #, no-c-format
-msgid ""
-"This injection point has the same type and qualifier annotations as the "
-"producer method, so it resolves to the producer method using the usual CDI "
-"injection rules. The producer method will be called by the container to "
-"obtain an instance to service this injection point."
+msgid "This injection point has the same type and qualifier annotations as the producer method, so it resolves to the producer method using the usual CDI injection rules. The producer method will be called by the container to obtain an instance to service this injection point."
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:74
 #, no-c-format
 msgid "Scope of a producer method"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:76
 #, no-c-format
-msgid ""
-"The scope of the producer method defaults to <literal>@Dependent</literal>, "
-"and so it will be called <emphasis>every time</emphasis> the container "
-"injects this field or any other field that resolves to the same producer "
-"method. Thus, there could be multiple instances of the "
-"<literal>PaymentStrategy</literal> object for each user session."
+msgid "The scope of the producer method defaults to <literal>@Dependent</literal>, and so it will be called <emphasis>every time</emphasis> the container injects this field or any other field that resolves to the same producer method. Thus, there could be multiple instances of the <literal>PaymentStrategy</literal> object for each user session."
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:83
 #, no-c-format
-msgid ""
-"To change this behavior, we can add a <literal>@SessionScoped</literal> "
-"annotation to the method."
+msgid "To change this behavior, we can add a <literal>@SessionScoped</literal> annotation to the method."
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:87
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:89
 #, no-c-format
-msgid ""
-"Now, when the producer method is called, the returned "
-"<literal>PaymentStrategy</literal> will be bound to the session context. The "
-"producer method won't be called again in the same session."
+msgid "Now, when the producer method is called, the returned <literal>PaymentStrategy</literal> will be bound to the session context. The producer method won't be called again in the same session."
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:95
 #, no-c-format
-msgid ""
-"A producer method does <emphasis>not</emphasis> inherit the scope of the "
-"bean that declares the method. There are two different beans here: the "
-"producer method, and the bean which declares it. The scope of the producer "
-"method determines how often the method will be called, and the lifecycle of "
-"the objects returned by the method. The scope of the bean that declares the "
-"producer method determines the lifecycle of the object upon which the "
-"producer method is invoked."
+msgid "A producer method does <emphasis>not</emphasis> inherit the scope of the bean that declares the method. There are two different beans here: the producer method, and the bean which declares it. The scope of the producer method determines how often the method will be called, and the lifecycle of the objects returned by the method. The scope of the bean that declares the producer method determines the lifecycle of the object upon which the producer method is invoked."
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:107
 #, no-c-format
 msgid "Injection into producer methods"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:109
 #, no-c-format
-msgid ""
-"There's one potential problem with the code above. The implementations of "
-"<literal>CreditCardPaymentStrategy</literal> are instantiated using the Java "
-"<literal>new</literal> operator. Objects instantiated directly by the "
-"application can't take advantage of dependency injection and don't have "
-"interceptors."
+msgid "There's one potential problem with the code above. The implementations of <literal>CreditCardPaymentStrategy</literal> are instantiated using the Java <literal>new</literal> operator. Objects instantiated directly by the application can't take advantage of dependency injection and don't have interceptors."
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:116
 #, no-c-format
-msgid ""
-"If this isn't what we want, we can use dependency injection into the "
-"producer method to obtain bean instances:"
+msgid "If this isn't what we want, we can use dependency injection into the producer method to obtain bean instances:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:121
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          CheckPaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:123
 #, no-c-format
-msgid ""
-"Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-"
-"scoped bean? Then the producer method has the effect of \"promoting\" the "
-"current request scoped instance into session scope. This is almost certainly "
-"a bug! The request scoped object will be destroyed by the container before "
-"the session ends, but the reference to the object will be left \"hanging\" "
-"in the session scope. This error will <emphasis>not</emphasis> be detected "
-"by the container, so please take extra care when returning bean instances "
-"from producer methods!"
+msgid "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-scoped bean? Then the producer method has the effect of \"promoting\" the current request scoped instance into session scope. This is almost certainly a bug! The request scoped object will be destroyed by the container before the session ends, but the reference to the object will be left \"hanging\" in the session scope. This error will <emphasis>not</emphasis> be detected by the container, so please take extra care when returning bean instances from producer methods!"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:132
 #, no-c-format
-msgid ""
-"There's at least three ways we could go about fixing this bug. We could "
-"change the scope of the <literal>CreditCardPaymentStrategy</literal> "
-"implementation, but this would affect other clients of that bean. A better "
-"option would be to change the scope of the producer method to "
-"<literal>@Dependent</literal> or <literal>@RequestScoped</literal>."
+msgid "There's at least three ways we could go about fixing this bug. We could change the scope of the <literal>CreditCardPaymentStrategy</literal> implementation, but this would affect other clients of that bean. A better option would be to change the scope of the producer method to <literal>@Dependent</literal> or <literal>@RequestScoped</literal>."
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:139
 #, no-c-format
-msgid ""
-"But a more common solution is to use the special <literal>@New</literal> "
-"qualifier annotation."
+msgid "But a more common solution is to use the special <literal>@New</literal> qualifier annotation."
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:144
 #, no-c-format
 msgid "Use of <literal>@New</literal> with producer methods"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:146
 #, no-c-format
 msgid "Consider the following producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:148
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New CheckPaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:150
 #, no-c-format
-msgid ""
-"Then a new <emphasis>dependent</emphasis> instance of "
-"<literal>CreditCardPaymentStrategy</literal> will be created, passed to the "
-"producer method, returned by the producer method and finally bound to the "
-"session context. The dependent object won't be destroyed until the "
-"<literal>Preferences</literal> object is destroyed, at the end of the "
-"session."
+msgid "Then a new <emphasis>dependent</emphasis> instance of <literal>CreditCardPaymentStrategy</literal> will be created, passed to the producer method, returned by the producer method and finally bound to the session context. The dependent object won't be destroyed until the <literal>Preferences</literal> object is destroyed, at the end of the session."
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:160
 #, no-c-format
 msgid "Disposer methods"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:162
 #, no-c-format
-msgid ""
-"Some producer methods return objects that require explicit destruction. For "
-"example, somebody needs to close this JDBC connection:"
+msgid "Some producer methods return objects that require explicit destruction. For example, somebody needs to close this JDBC connection:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:167
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @RequestScoped Connection connect(User user) {\n"
-"   return createConnection(user.getId(), user.getPassword());\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:169
 #, no-c-format
-msgid ""
-"Destruction can be performed by a matching <emphasis>disposer method</"
-"emphasis>, defined by the same class as the producer method:"
+msgid "Destruction can be performed by a matching <emphasis>disposer method</emphasis>, defined by the same class as the producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:172
-#, no-c-format
-msgid ""
-"<![CDATA[void close(@Disposes Connection connection) {\n"
-"   connection.close();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:174
 #, no-c-format
-msgid ""
-"The disposer method must have at least one parameter, annotated "
-"<literal>@Disposes</literal>, with the same type and qualifiers as the "
-"producer method. The disposer method is called automatically when the "
-"context ends (in this case, at the end of the request), and this parameter "
-"receives the object produced by the producer method. If the disposer method "
-"has additional method parameters, the container will look for a bean that "
-"satisfies the type and qualifiers of each parameter and pass it to the "
-"method automatically."
+msgid "The disposer method must have at least one parameter, annotated <literal>@Disposes</literal>, with the same type and qualifiers as the producer method. The disposer method is called automatically when the context ends (in this case, at the end of the request), and this parameter receives the object produced by the producer method. If the disposer method has additional method parameters, the container will look for a bean that satisfies the type and qualifiers of each parameter and pass it to the method automatically."
 msgstr ""
+

Modified: doc/trunk/reference/pot/resources.pot
===================================================================
--- doc/trunk/reference/pot/resources.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/resources.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,282 +1,124 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"PO-Revision-Date: 2010-03-02T13:07:18\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: resources.xml:5
 #, no-c-format
 msgid "Java EE component environment resources"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:7
 #, no-c-format
-msgid ""
-"Java EE 5 already introduced some limited support for dependency injection, "
-"in the form of component environment injection. A component environment "
-"resource is a Java EE component, for example a JDBC datasource, JMS queue or "
-"topic, JPA persistence context, remote EJB or web service."
+msgid "Java EE 5 already introduced some limited support for dependency injection, in the form of component environment injection. A component environment resource is a Java EE component, for example a JDBC datasource, JMS queue or topic, JPA persistence context, remote EJB or web service."
 msgstr ""
 
 #. Tag: para
-#: resources.xml:13
 #, no-c-format
-msgid ""
-"Naturally, there is now a slight mismatch with the new style of dependency "
-"injection in CDI. Most notably, component environment injection relies on "
-"string-based names to qualify ambiguous types, and there is no real "
-"consistency as to the nature of the names (sometimes a JNDI name, sometimes "
-"a persistence unit name, sometimes an EJB link, sometimes a nonportable "
-"\"mapped name\"). Producer fields turned out to be an elegant adaptor to "
-"reduce all this complexity to a common model and get component environment "
-"resources to participate in the CDI system just like any other kind of bean."
+msgid "Naturally, there is now a slight mismatch with the new style of dependency injection in CDI. Most notably, component environment injection relies on string-based names to qualify ambiguous types, and there is no real consistency as to the nature of the names (sometimes a JNDI name, sometimes a persistence unit name, sometimes an EJB link, sometimes a nonportable \"mapped name\"). Producer fields turned out to be an elegant adaptor to reduce all this complexity to a common model and get component environment resources to participate in the CDI system just like any other kind of bean."
 msgstr ""
 
 #. Tag: para
-#: resources.xml:22
 #, no-c-format
-msgid ""
-"Fields have a duality in that they can both be the target of Java EE "
-"component environment injection and be declared as a CDI producer field. "
-"Therefore, they can define a mapping from a string-based name in the "
-"component environment, to a combination of type and qualifiers used in the "
-"world of typesafe injection. We call a producer field that represents a "
-"reference to an object in the Java EE component environment a "
-"<emphasis>resource</emphasis>."
+msgid "Fields have a duality in that they can both be the target of Java EE component environment injection and be declared as a CDI producer field. Therefore, they can define a mapping from a string-based name in the component environment, to a combination of type and qualifiers used in the world of typesafe injection. We call a producer field that represents a reference to an object in the Java EE component environment a <emphasis>resource</emphasis>."
 msgstr ""
 
 #. Tag: title
-#: resources.xml:31
 #, no-c-format
 msgid "Defining a resource"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:33
 #, no-c-format
-msgid ""
-"The CDI specification uses the term <emphasis>resource</emphasis> to refer, "
-"generically, to any of the following kinds of object which might be "
-"available in the Java EE component environment:"
+msgid "The CDI specification uses the term <emphasis>resource</emphasis> to refer, generically, to any of the following kinds of object which might be available in the Java EE component environment:"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:38
 #, no-c-format
-msgid ""
-"JDBC <literal>Datasource</literal>s, JMS <literal>Queue</literal>s, "
-"<literal>Topic</literal>s and <literal>ConnectionFactory</literal>s, "
-"JavaMail <literal>Session</literal>s and other transactional resources "
-"including JCA connectors,"
+msgid "JDBC <literal>Datasource</literal>s, JMS <literal>Queue</literal>s, <literal>Topic</literal>s and <literal>ConnectionFactory</literal>s, JavaMail <literal>Session</literal>s and other transactional resources including JCA connectors,"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:43
 #, no-c-format
-msgid ""
-"JPA <literal>EntityManager</literal>s and <literal>EntityManagerFactory</"
-"literal>s,"
+msgid "JPA <literal>EntityManager</literal>s and <literal>EntityManagerFactory</literal>s,"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:46
 #, no-c-format
 msgid "remote EJBs, and"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:49
 #, no-c-format
 msgid "web services"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:53
 #, no-c-format
-msgid ""
-"We declare a resource by annotating a producer field with a component "
-"environment injection annotation: <literal>@Resource</literal>, "
-"<literal>@EJB</literal>, <literal>@PersistenceContext</literal>, "
-"<literal>@PersistenceUnit</literal> or <literal>@WebServiceRef</literal>."
+msgid "We declare a resource by annotating a producer field with a component environment injection annotation: <literal>@Resource</literal>, <literal>@EJB</literal>, <literal>@PersistenceContext</literal>, <literal>@PersistenceUnit</literal> or <literal>@WebServiceRef</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:57
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @WebServiceRef(lookup=\"java:app/service/Catalog\")\n"
-"Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Resource(lookup=\"java:global/env/jdbc/CustomerDatasource"
-"\") \n"
-"@CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceContext(unitName=\"CustomerDatabase\")\n"
-"@CustomerDatabase EntityManager customerDatabasePersistenceContext;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:63
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceUnit(unitName=\"CustomerDatabase\") \n"
-"@CustomerDatabase EntityManagerFactory customerDatabasePersistenceUnit;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @EJB(ejbLink=\"../their.jar#PaymentService\") \n"
-"PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:67
 #, no-c-format
 msgid "The field may be static (but not final)."
 msgstr ""
 
 #. Tag: para
-#: resources.xml:69
 #, no-c-format
 msgid "A resource declaration really contains two pieces of information:"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:73
 #, no-c-format
-msgid ""
-"the JNDI name, EJB link, persistence unit name, or other metadata needed to "
-"obtain a reference to the resource from the component environment, and"
+msgid "the JNDI name, EJB link, persistence unit name, or other metadata needed to obtain a reference to the resource from the component environment, and"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:77
 #, no-c-format
-msgid ""
-"the type and qualifiers that we will use to inject the reference into our "
-"beans."
+msgid "the type and qualifiers that we will use to inject the reference into our beans."
 msgstr ""
 
 #. Tag: para
-#: resources.xml:82
 #, no-c-format
-msgid ""
-"It might feel strange to be declaring resources in Java code. Isn't this "
-"stuff that might be deployment-specific? Certainly, and that's why it makes "
-"sense to declare your resources in a class annotated <literal>@Alternative</"
-"literal>."
+msgid "It might feel strange to be declaring resources in Java code. Isn't this stuff that might be deployment-specific? Certainly, and that's why it makes sense to declare your resources in a class annotated <literal>@Alternative</literal>."
 msgstr ""
 
 #. Tag: title
-#: resources.xml:90
 #, no-c-format
 msgid "Typesafe resource injection"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:92
 #, no-c-format
 msgid "These resources can now be injected in the usual way."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:96
-#, no-c-format
-msgid "<![CDATA[@Inject Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:97
-#, no-c-format
-msgid "<![CDATA[@Inject @CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:98
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManager "
-"customerDatabaseEntityManager;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManagerFactory "
-"customerDatabaseEntityManagerFactory;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:100
-#, no-c-format
-msgid "<![CDATA[@Inject PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:102
 #, no-c-format
-msgid ""
-"The bean type and qualifiers of the resource are determined by the producer "
-"field declaration."
+msgid "The bean type and qualifiers of the resource are determined by the producer field declaration."
 msgstr ""
 
 #. Tag: para
-#: resources.xml:106
 #, no-c-format
-msgid ""
-"It might seem like a pain to have to write these extra producer field "
-"declarations, just to gain an additional level of indirection. You could "
-"just as well use component environment injection directly, right? But "
-"remember that you're going to be using resources like the "
-"<literal>EntityManager</literal> in several different beans. Isn't it nicer "
-"and more typesafe to write"
+msgid "It might seem like a pain to have to write these extra producer field declarations, just to gain an additional level of indirection. You could just as well use component environment injection directly, right? But remember that you're going to be using resources like the <literal>EntityManager</literal> in several different beans. Isn't it nicer and more typesafe to write"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:113
-#, no-c-format
-msgid "@Inject @CustomerDatabase EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:115
 #, no-c-format
 msgid "instead of"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:117
-#, no-c-format
-msgid "@PersistenceContext(unitName=\"CustomerDatabase\") EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:119
 #, no-c-format
 msgid "all over the place?"
 msgstr ""
+

Modified: doc/trunk/reference/pot/ri-spi.pot
===================================================================
--- doc/trunk/reference/pot/ri-spi.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/ri-spi.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,1074 +1,574 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"PO-Revision-Date: 2010-03-02T13:07:18\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: ri-spi.xml:4
 #, no-c-format
 msgid "Integrating Weld into other environments"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:6
 #, no-c-format
-msgid ""
-"If you want to use Weld in another environment, you will need to provide "
-"certain information to Weld via the integration SPI. In this Appendix we "
-"will briefly discuss the steps needed."
+msgid "If you want to use Weld in another environment, you will need to provide certain information to Weld via the integration SPI. In this Appendix we will briefly discuss the steps needed."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:12
 #, no-c-format
 msgid "Enterprise Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:13
 #, no-c-format
-msgid ""
-"If you just want to use managed beans, and not take advantage of enterprise "
-"services (EE resource injection, CDI injection into EE component classes, "
-"transactional events, support for CDI services in EJBs) and non-flat "
-"deployments, then the generic servlet support provided by the \"Weld: "
-"Servlets\" extension will be sufficient, and will work in any container "
-"supporting the Servlet API."
+msgid "If you just want to use managed beans, and not take advantage of enterprise services (EE resource injection, CDI injection into EE component classes, transactional events, support for CDI services in EJBs) and non-flat deployments, then the generic servlet support provided by the \"Weld: Servlets\" extension will be sufficient, and will work in any container supporting the Servlet API."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:21
 #, no-c-format
-msgid ""
-"All SPIs and APIs described have extensive JavaDoc, which spell out the "
-"detailed contract between the container and Weld."
+msgid "All SPIs and APIs described have extensive JavaDoc, which spell out the detailed contract between the container and Weld."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:27
 #, no-c-format
 msgid "The Weld SPI"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:29
 #, no-c-format
-msgid ""
-"The Weld SPI is located in the <literal>weld-spi</literal> module, and "
-"packaged as <literal>weld-spi.jar</literal>. Some SPIs are optional, and "
-"should only be implemented if you need to override the default behavior; "
-"others are required."
+msgid "The Weld SPI is located in the <literal>weld-spi</literal> module, and packaged as <literal>weld-spi.jar</literal>. Some SPIs are optional, and should only be implemented if you need to override the default behavior; others are required."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:35
 #, no-c-format
-msgid ""
-"All interfaces in the SPI support the decorator pattern and provide a "
-"<literal>Forwarding</literal> class located in the <literal>helpers</"
-"literal> sub package. Additional, commonly used, utility classes, and "
-"standard implementations are also located in the <literal>helpers</literal> "
-"sub package."
+msgid "All interfaces in the SPI support the decorator pattern and provide a <literal>Forwarding</literal> class located in the <literal>helpers</literal> sub package. Additional, commonly used, utility classes, and standard implementations are also located in the <literal>helpers</literal> sub package."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:41
 #, no-c-format
-msgid ""
-"Weld supports multiple environments. An environment is defined by an "
-"implementation of the <literal>Environment</literal> interface. A number of "
-"standard environments are built in, and described by the "
-"<literal>Environments</literal> enumeration. Different environments require "
-"different services to be present (for example a Servlet container doesn't "
-"require transaction, EJB or JPA services). By default an EE environment is "
-"assumed, but you can adjust the environment by calling <literal>bootstrap."
-"setEnvironment()</literal>."
+msgid "Weld supports multiple environments. An environment is defined by an implementation of the <literal>Environment</literal> interface. A number of standard environments are built in, and described by the <literal>Environments</literal> enumeration. Different environments require different services to be present (for example a Servlet container doesn't require transaction, EJB or JPA services). By default an EE environment is assumed, but you can adjust the environment by calling <literal>bootstrap.setEnvironment()</literal>."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:50
 #, no-c-format
-msgid ""
-"Weld uses a generic-typed service registry to allow services to be "
-"registered. All services implement the <literal>Service</literal> interface. "
-"The service registry allows services to be added and retrieved."
+msgid "Weld uses a generic-typed service registry to allow services to be registered. All services implement the <literal>Service</literal> interface. The service registry allows services to be added and retrieved."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:56
 #, no-c-format
 msgid "Deployment structure"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:58
 #, no-c-format
-msgid ""
-"An application is often comprised of a number of modules. For example, a "
-"Java EE deployment may contain a number of EJB modules (containing business "
-"logic) and WAR modules (containing the user interface). A container may "
-"enforce certain <emphasis>accessibility</emphasis> rules which limit the "
-"visibility of classes between modules. CDI allows these same rules to apply "
-"to bean and observer method resolution. As the accessibility rules vary "
-"between containers, Weld requires the container to <emphasis>describe</"
-"emphasis> the deployment structure, via the <literal>Deployment</literal> "
-"SPI."
+msgid "An application is often comprised of a number of modules. For example, a Java EE deployment may contain a number of EJB modules (containing business logic) and war modules (containing the user interface). A container may enforce certain <emphasis>accessibility</emphasis> rules which limit the visibility of classes between modules. CDI allows these same rules to apply to bean and observer method resolution. As the accessibility rules vary between containers, Weld requires the container to <emphasis>describe</emphasis> the deployment structure, via the <literal>Deployment</literal> SPI."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:67
 #, no-c-format
-msgid ""
-"The CDI specification discusses <emphasis>Bean Deployment Archives</"
-"emphasis> (BDAs)&#8212;archives which are marked as containing beans which "
-"should be deployed to the CDI container, and made available for injection "
-"and resolution. Weld reuses this description of <emphasis>Bean Deployment "
-"Archives</emphasis> in its deployment structure SPI. Each deployment exposes "
-"the BDAs which it contains; each BDA may also reference other which it can "
-"access. Together, the transitive closure of this graph forms the beans which "
-"are deployed in the application."
+msgid "The CDI specification discusses <emphasis>Bean Deployment Archives</emphasis> (BDAs)—archives which are marked as containing beans which should be deployed to the CDI container, and made available for injection and resolution. Weld reuses this description of <emphasis>Bean Deployment Archives</emphasis> in its deployment structure SPI. Each deployment exposes the BDAs which it contains; each BDA may also reference other which it can access. Together, the transitive closure of this graph forms the beans which are deployed in the application."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:76
 #, no-c-format
-msgid ""
-"To describe the deployment structure to Weld, the container should provide "
-"an implementation of <literal>Deployment</literal>. <literal>Deployment."
-"getBeanDeploymentArchives()</literal> allows Weld to discover the modules "
-"which make up the application. The CDI specification also allows beans to be "
-"specified programmatically as part of the bean deployment. These beans may, "
-"or may not, be in an existing BDA. For this reason, Weld will call "
-"<literal>Deployment.loadBeanDeploymentArchive(Class clazz)</literal> for "
-"each programmatically described bean."
+msgid "To describe the deployment structure to Weld, the container should provide an implementation of <literal>Deployment</literal>. <literal>Deployment.getBeanDeploymentArchives()</literal> allows Weld to discover the modules which make up the application. The CDI specification also allows beans to be specified programmatically as part of the bean deployment. These beans may, or may not, be in an existing BDA. For this reason, Weld will call <literal>Deployment.loadBeanDeploymentArchive(Class clazz)</literal> for each programmatically described bean."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:85
 #, no-c-format
-msgid ""
-"As programmatically described beans may result in additional BDAs being "
-"added to the graph, Weld will discover the BDA structure every time an "
-"unknown BDA is returned by <literal>Deployment.loadBeanDeploymentArchive</"
-"literal>."
+msgid "As programmatically described beans may result in additional BDAs being added to the graph, Weld will discover the BDA structure every time an unknown BDA is returned by <literal>Deployment.loadBeanDeploymentArchive</literal>."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:92
 #, no-c-format
 msgid "Virtual BDAs"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:93
 #, no-c-format
-msgid ""
-"In a strict container, each BDA might have to explicitly specify which other "
-"BDAs it can access. However many containers will allow an easy mechanism to "
-"make BDAs bi-directionally accessible (such as a library directory). In this "
-"case, it is allowable (and reasonable) to describe all such archives as a "
-"single, 'virtual' <literal>BeanDeploymentArchive</literal>."
+msgid "In a strict container, each BDA might have to explicitly specify which other BDAs it can access. However many containers will allow an easy mechanism to make BDAs bi-directionally accessible (such as a library directory). In this case, it is allowable (and reasonable) to describe all such archives as a single, 'virtual' <literal>BeanDeploymentArchive</literal>."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:100
 #, no-c-format
-msgid ""
-"A container, might, for example, use a flat accessibility structure for the "
-"application. In this case, a single <literal>BeanDeploymentArchive</literal> "
-"would be attached to the <literal>Deployment</literal>."
+msgid "A container, might, for example, use a flat accessibility structure for the application. In this case, a single <literal>BeanDeploymentArchive</literal> would be attached to the <literal>Deployment</literal>."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:106
 #, no-c-format
-msgid ""
-"<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it's contents to be discovered by Weld&#8212;<literal>BeanDeploymentArchive."
-"getBeanClasses()</literal> must return all the classes in the BDA, "
-"<literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the "
-"deployment descriptors in the archive, and <literal>BeanDeploymentArchive."
-"getEjbs()</literal> must provide an EJB descriptor for every EJB in the BDA, "
-"or an empty list if it is not an EJB archive."
+msgid "<literal>BeanDeploymentArchive</literal> provides three methods which allow it's contents to be discovered by Weld—<literal>BeanDeploymentArchive.getBeanClasses()</literal> must return all the classes in the BDA, <literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the deployment descriptors in the archive, and <literal>BeanDeploymentArchive.getEjbs()</literal> must provide an EJB descriptor for every EJB in the BDA, or an empty list if it is not an EJB archive."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:114
 #, no-c-format
-msgid ""
-"BDA X may also reference another BDA Y whose beans can be resolved by, and "
-"injected into, any bean in BDA X. These are the accessible BDAs, and every "
-"BDA that is directly accessible by BDA X should be returned. A BDA will also "
-"have BDAs which are accessible transitively, and the transitive closure of "
-"the sub-graph of BDA X describes all the beans resolvable by BDA X."
+msgid "BDA X may also reference another BDA Y whose beans can be resolved by, and injected into, any bean in BDA X. These are the accessible BDAs, and every BDA that is directly accessible by BDA X should be returned. A BDA will also have BDAs which are accessible transitively, and the transitive closure of the sub-graph of BDA X describes all the beans resolvable by BDA X."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:122
 #, no-c-format
 msgid "Matching the classloader structure for the deployment"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:124
 #, no-c-format
-msgid ""
-"In practice, you can regard the deployment structure represented by "
-"<literal>Deployment</literal>, and the virtual BDA graph as a mirror of the "
-"classloader structure for a deployment. If a class can from BDA X can be "
-"loaded by another in BDA Y, it is accessible, and therefore BDA Y's "
-"accessible BDAs should include BDA X."
+msgid "In practice, you can regard the deployment structure represented by <literal>Deployment</literal>, and the virtual BDA graph as a mirror of the classloader structure for a deployment. If a class can from BDA X can be loaded by another in BDA Y, it is accessible, and therefore BDA Y's accessible BDAs should include BDA X."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:132
 #, no-c-format
-msgid ""
-"To specify the directly accessible BDAs, the container should provide an "
-"implementation of <literal>BeanDeploymentArchive.getBeanDeploymentArchives()"
-"</literal>."
+msgid "To specify the directly accessible BDAs, the container should provide an implementation of <literal>BeanDeploymentArchive.getBeanDeploymentArchives()</literal>."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:138
 #, no-c-format
-msgid ""
-"Weld allows the container to describe a circular graph, and will convert a "
-"graph to a tree as part of the deployment process."
+msgid "Weld allows the container to describe a circular graph, and will convert a graph to a tree as part of the deployment process."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:144
 #, no-c-format
-msgid ""
-"Certain services are provided for the whole deployment, whilst some are "
-"provided per-BDA. BDA services are provided using "
-"<literal>BeanDeploymentArchive.getServices()</literal> and only apply to the "
-"BDA on which they are provided."
+msgid "Certain services are provided for the whole deployment, whilst some are provided per-BDA. BDA services are provided using <literal>BeanDeploymentArchive.getServices()</literal> and only apply to the BDA on which they are provided."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:153
 #, no-c-format
 msgid "EJB descriptors"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:155
 #, no-c-format
-msgid ""
-"Weld delegates EJB 3 bean discovery to the container so that it doesn't "
-"duplicate the work done by the EJB container, and respects any vendor-"
-"extensions to the EJB definition."
+msgid "Weld delegates EJB 3 bean discovery to the container so that it doesn't duplicate the work done by the EJB container, and respects any vendor-extensions to the EJB definition."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:160
 #, no-c-format
-msgid ""
-"The <literal>EjbDescriptor</literal> should return the relevant metadata as "
-"defined in the EJB specification. Each business interface of a session bean "
-"should be described using a <literal>BusinessInterfaceDescriptor</literal>."
+msgid "The <literal>EjbDescriptor</literal> should return the relevant metadata as defined in the EJB specification. Each business interface of a session bean should be described using a <literal>BusinessInterfaceDescriptor</literal>."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:169
 #, no-c-format
 msgid "EE resource injection and resolution services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:171
 #, no-c-format
-msgid ""
-"All the EE resource services are per-BDA services, and may be provided using "
-"one of two methods. Which method to use is at the discretion of the "
-"integrator."
+msgid "All the EE resource services are per-BDA services, and may be provided using one of two methods. Which method to use is at the discretion of the integrator."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:176
 #, no-c-format
-msgid ""
-"The integrator may choose to provide all EE resource injection services "
-"themselves, using another library or framework. In this case the integrator "
-"should use the <literal>EE</literal> environment, and implement the <xref "
-"linkend=\"injection.services\"/> SPI."
+msgid "The integrator may choose to provide all EE resource injection services themselves, using another library or framework. In this case the integrator should use the <literal>EE</literal> environment, and implement the <xref linkend=\"injection.services\" /> SPI."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:182
 #, no-c-format
-msgid ""
-"Alternatively, the integrator may choose to use CDI to provide EE resource "
-"injection. In this case, the <literal>EE_INJECT</literal> environment should "
-"be used, and the integrator should implement the <xref linkend=\"ejb."
-"services.resolution\"/>, <xref linkend=\"resource.services\"/> and <xref "
-"linkend=\"jpa.services\"/>."
+msgid "Alternatively, the integrator may choose to use CDI to provide EE resource injection. In this case, the <literal>EE_INJECT</literal> environment should be used, and the integrator should implement the <xref linkend=\"ejb.services.resolution\" />, <xref linkend=\"resource.services\" /> and <xref linkend=\"jpa.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:189
 #, no-c-format
-msgid ""
-"CDI only provides annotation-based EE resource injection; if you wish to "
-"provide deployment descriptor (e.g. <literal>ejb-jar.xml</literal>) "
-"injection, you must use <xref linkend=\"injection.services\"/>."
+msgid "CDI only provides annotation-based EE resource injection; if you wish to provide deployment descriptor (e.g. <literal>ejb-jar.xml</literal>) injection, you must use <xref linkend=\"injection.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:195
 #, no-c-format
-msgid ""
-"If the container performs EE resource injection, the injected resources must "
-"be serializable. If EE resource injection is provided by Weld, the resolved "
-"resource must be serializable."
+msgid "If the container performs EE resource injection, the injected resources must be serializable. If EE resource injection is provided by Weld, the resolved resource must be serializable."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:201
 #, no-c-format
-msgid ""
-"If you use a non-EE environment then you may implement any of the EE service "
-"SPIs, and Weld will provide the associated functionality. There is no need "
-"to implement those services you don't need!"
+msgid "If you use a non-EE environment then you may implement any of the EE service SPIs, and Weld will provide the associated functionality. There is no need to implement those services you don't need!"
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:210
 #, no-c-format
 msgid "EJB services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:212
 #, no-c-format
 msgid "EJB services are split between two interfaces which are both per-BDA."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:216
 #, no-c-format
-msgid ""
-"<literal>EJBServices</literal> is used to resolve local EJBs used to back "
-"session beans, and must always be provided in an EE environment. "
-"<literal>EJBServices.resolveEjb(EjbDescriptor ejbDescriptor)</literal> "
-"returns a wrapper&#8212;<literal>SessionObjectReference</literal>&#8212;"
-"around the EJB reference. This wrapper allows Weld to request a reference "
-"that implements the given business interface, and, in the case of SFSBs, "
-"both request the removal of the EJB from the container and query whether the "
-"EJB has been previously removed."
+msgid "<literal>EJBServices</literal> is used to resolve local EJBs used to back session beans, and must always be provided in an EE environment. <literal>EJBServices.resolveEjb(EjbDescriptor ejbDescriptor)</literal> returns a wrapper—<literal>SessionObjectReference</literal>—around the EJB reference. This wrapper allows Weld to request a reference that implements the given business interface, and, in the case of SFSBs, both request the removal of the EJB from the container and query whether the EJB has been previously removed."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:225
 #, no-c-format
-msgid ""
-"<literal>EJBResolutionServices.resolveEjb(InjectionPoint ij)</literal> "
-"allows the resolution of <literal>@EJB</literal> (for injection into managed "
-"beans). This service is not required if the implementation of <xref linkend="
-"\"injection.services\"/> takes care of <literal>@EJB</literal> injection."
+msgid "<literal>EJBResolutionServices.resolveEjb(InjectionPoint ij)</literal> allows the resolution of <literal>@EJB</literal> (for injection into managed beans). This service is not required if the implementation of <xref linkend=\"injection.services\" /> takes care of <literal>@EJB</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:234
 #, no-c-format
 msgid "JPA services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:236
 #, no-c-format
-msgid ""
-"Just as EJB resolution is delegated to the container, resolution of "
-"<literal>@PersistenceContext</literal> for injection into managed beans "
-"(with the <literal>InjectionPoint</literal> provided), is delegated to the "
-"container."
+msgid "Just as EJB resolution is delegated to the container, resolution of <literal>@PersistenceContext</literal> for injection into managed beans (with the <literal>InjectionPoint</literal> provided), is delegated to the container."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:242
 #, no-c-format
-msgid ""
-"To allow JPA integration, the <literal>JpaServices</literal> interface "
-"should be implemented. This service is not required if the implementation of "
-"<xref linkend=\"injection.services\"/> takes care of "
-"<literal>@PersistenceContext</literal> injection."
+msgid "To allow JPA integration, the <literal>JpaServices</literal> interface should be implemented. This service is not required if the implementation of <xref linkend=\"injection.services\" /> takes care of <literal>@PersistenceContext</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:251
 #, no-c-format
 msgid "Transaction Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:253
 #, no-c-format
-msgid ""
-"Weld delegates JTA activities to the container. The SPI provides a couple "
-"hooks to easily achieve this with the <literal>TransactionServices</literal> "
-"interface."
+msgid "Weld delegates JTA activities to the container. The SPI provides a couple hooks to easily achieve this with the <literal>TransactionServices</literal> interface."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:258
 #, no-c-format
-msgid ""
-"Any <literal>javax.transaction.Synchronization</literal> implementation may "
-"be passed to the <literal>registerSynchronization()</literal> method and the "
-"SPI implementation should immediately register the synchronization with the "
-"JTA transaction manager used for the EJBs."
+msgid "Any <literal>javax.transaction.Synchronization</literal> implementation may be passed to the <literal>registerSynchronization()</literal> method and the SPI implementation should immediately register the synchronization with the JTA transaction manager used for the EJBs."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:264
 #, no-c-format
-msgid ""
-"To make it easier to determine whether or not a transaction is currently "
-"active for the requesting thread, the <literal>isTransactionActive()</"
-"literal> method can be used. The SPI implementation should query the same "
-"JTA transaction manager used for the EJBs."
+msgid "To make it easier to determine whether or not a transaction is currently active for the requesting thread, the <literal>isTransactionActive()</literal> method can be used. The SPI implementation should query the same JTA transaction manager used for the EJBs."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:272
 #, no-c-format
 msgid "Resource Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:274
 #, no-c-format
-msgid ""
-"The resolution of <literal>@Resource</literal> (for injection into managed "
-"beans) is delegated to the container. You must provide an implementation of "
-"<literal>ResourceServices</literal> which provides these operations. This "
-"service is not required if the implementation of <xref linkend=\"injection."
-"services\"/> takes care of <literal>@Resource</literal> injection."
+msgid "The resolution of <literal>@Resource</literal> (for injection into managed beans) is delegated to the container. You must provide an implementation of <literal>ResourceServices</literal> which provides these operations. This service is not required if the implementation of <xref linkend=\"injection.services\" /> takes care of <literal>@Resource</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:283
 #, no-c-format
 msgid "Injection Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:285
 #, no-c-format
-msgid ""
-"An integrator may wish to use <literal>InjectionServices</literal> to "
-"provide additional field or method injection over-and-above that provided by "
-"Weld. An integration into a Java EE environment may use "
-"<literal>InjectionServices</literal> to provide EE resource injection for "
-"managed beans."
+msgid "An integrator may wish to use <literal>InjectionServices</literal> to provide additional field or method injection over-and-above that provided by Weld. An integration into a Java EE environment may use <literal>InjectionServices</literal> to provide EE resource injection for managed beans."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:291
 #, no-c-format
-msgid ""
-"<literal>InjectionServices</literal> provides a very simple contract, the "
-"<literal>InjectionServices.aroundInject(InjectionContext ic);</literal> "
-"intercepter will be called for every instance that CDI injects, whether it "
-"is a contextual instance, or a non-contextual instance injected by "
-"<literal>InjectionTarget.inject()</literal>."
+msgid "<literal>InjectionServices</literal> provides a very simple contract, the <literal>InjectionServices.aroundInject(InjectionContext ic);</literal> intercepter will be called for every instance that CDI injects, whether it is a contextual instance, or a non-contextual instance injected by <literal>InjectionTarget.inject()</literal>."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:298
 #, no-c-format
-msgid ""
-"The <literal>InjectionContext</literal> can be used to discover additional "
-"information about the injection being performed, including the "
-"<literal>target</literal> being injected. <literal>ic.proceed()</literal> "
-"should be called to perform CDI-style injection, and call initializer "
-"methods."
+msgid "The <literal>InjectionContext</literal> can be used to discover additional information about the injection being performed, including the <literal>target</literal> being injected. <literal>ic.proceed()</literal> should be called to perform CDI-style injection, and call initializer methods."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:307
 #, no-c-format
 msgid "Security Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:309
 #, no-c-format
-msgid ""
-"In order to obtain the <literal>Principal</literal> representing the current "
-"caller identity, the container should provide an implementation of "
-"<literal>SecurityServices</literal>."
+msgid "In order to obtain the <literal>Principal</literal> representing the current caller identity, the container should provide an implementation of <literal>SecurityServices</literal>."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:317
 #, no-c-format
 msgid "Bean Validation Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:319
 #, no-c-format
-msgid ""
-"In order to obtain the default <literal>ValidatorFactory</literal> for the "
-"application deployment, the container should provide an implementation of "
-"<literal>ValidationServices</literal>."
+msgid "In order to obtain the default <literal>ValidatorFactory</literal> for the application deployment, the container should provide an implementation of <literal>ValidationServices</literal>."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:327
 #, no-c-format
 msgid "Identifying the BDA being addressed"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:329
 #, no-c-format
-msgid ""
-"When a client makes a request to an application which uses Weld, the request "
-"may be addressed at any of the BDAs in the application deployment. To allow "
-"Weld to correctly service the request, it needs to know which BDA the "
-"request is addressed at. Where possible, Weld will provide some context, but "
-"use of these by the integrator is optional."
+msgid "When a client makes a request to an application which uses Weld, the request may be addressed at any of the BDAs in the application deployment. To allow Weld to correctly service the request, it needs to know which BDA the request is addressed at. Where possible, Weld will provide some context, but use of these by the integrator is optional."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:337
 #, no-c-format
-msgid ""
-"Most Servlet contains use a classloader-per-WAR, this may provide a good way "
-"to identify the BDA in use for web requests."
+msgid "Most Servlet contains use a classloader-per-war, this may provide a good way to identify the BDA in use for web requests."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:343
 #, no-c-format
-msgid ""
-"When Weld needs to identify the BDA, it will use one of these services, "
-"depending on what is servicing the request:"
+msgid "When Weld needs to identify the BDA, it will use one of these services, depending on what is servicing the request:"
 msgstr ""
 
-#. Tag: literal
-#: ri-spi.xml:350
+#. Tag: term
 #, no-c-format
-msgid "ServletServices.getBeanDeploymentArchive(ServletContext ctx)"
+msgid "<literal>ServletServices.getBeanDeploymentArchive(ServletContext ctx)</literal>"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:352
 #, no-c-format
-msgid ""
-"Identify the WAR in use. The <literal>ServletContext</literal> is provided "
-"for additional context."
+msgid "Identify the war in use. The <literal>ServletContext</literal> is provided for additional context."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:362
 #, no-c-format
 msgid "The bean store"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:364
 #, no-c-format
-msgid ""
-"Weld uses a map like structure to store bean instances - <literal>org.jboss."
-"weld.context.api.BeanStore</literal>. You may find <literal>org.jboss.weld."
-"context.api.helpers.ConcurrentHashMapBeanStore</literal> useful."
+msgid "Weld uses a map like structure to store bean instances - <literal>org.jboss.weld.context.api.BeanStore</literal>. You may find <literal>org.jboss.weld.context.api.helpers.ConcurrentHashMapBeanStore</literal> useful."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:372
 #, no-c-format
 msgid "The application context"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:374
 #, no-c-format
-msgid ""
-"Weld expects the Application Server or other container to provide the "
-"storage for each application's context. The <literal>org.jboss.weld.context."
-"api.BeanStore</literal> should be implemented to provide an application "
-"scoped storage."
+msgid "Weld expects the Application Server or other container to provide the storage for each application's context. The <literal>org.jboss.weld.context.api.BeanStore</literal> should be implemented to provide an application scoped storage."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:383
 #, no-c-format
 msgid "Initialization and shutdown"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:384
 #, no-c-format
-msgid ""
-"The <literal>org.jboss.weld.bootstrap.api.Bootstrap</literal> interface "
-"defines the initialization for Weld, bean deployment and bean validation. To "
-"boot Weld, you must create an instance of <literal>org.jboss.weld.bootstrap."
-"WeldBeansBootstrap</literal> (which implements <literal>Boostrap</literal>), "
-"tell it about the services in use, and then request the container start."
+msgid "The <literal>org.jboss.weld.bootstrap.api.Bootstrap</literal> interface defines the initialization for Weld, bean deployment and bean validation. To boot Weld, you must create an instance of <literal>org.jboss.weld.bootstrap.WeldBeansBootstrap</literal> (which implements <literal>Boostrap</literal>), tell it about the services in use, and then request the container start."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:391
 #, no-c-format
-msgid ""
-"The bootstrap is split into phases, container initialization, bean "
-"deployment, bean validation and shutdown. Initialization will create a "
-"manager, and add the built-in contexts, and examine the deployment "
-"structure. Bean deployment will deploy any beans (defined using annotations, "
-"programtically, or built in). Bean validation will validate all beans."
+msgid "The bootstrap is split into phases, container initialization, bean deployment, bean validation and shutdown. Initialization will create a manager, and add the built-in contexts, and examine the deployment structure. Bean deployment will deploy any beans (defined using annotations, programtically, or built in). Bean validation will validate all beans."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:398
 #, no-c-format
-msgid ""
-"To initialize the container, you call <literal>Bootstrap.startInitialization"
-"()</literal>. Before calling <literal>startInitialization()</literal>, you "
-"must register any services required by the environment. You can do this by "
-"calling, for example, <literal>bootstrap.getServices().add(JpaServices."
-"class, new MyJpaServices())</literal>. You must also provide the application "
-"context bean store."
+msgid "To initialize the container, you call <literal>Bootstrap.startInitialization()</literal>. Before calling <literal>startInitialization()</literal>, you must register any services required by the environment. You can do this by calling, for example, <literal>bootstrap.getServices().add(JpaServices.class, new MyJpaServices())</literal>. You must also provide the application context bean store."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:405
 #, no-c-format
-msgid ""
-"Having called <literal>startInitialization()</literal>, the "
-"<literal>Manager</literal> for each BDA can be obtained by calling "
-"<literal>Bootstrap.getManager(BeanDeploymentArchive bda)</literal>."
+msgid "Having called <literal>startInitialization()</literal>, the <literal>Manager</literal> for each BDA can be obtained by calling <literal>Bootstrap.getManager(BeanDeploymentArchive bda)</literal>."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:410
 #, no-c-format
-msgid ""
-"To deploy the discovered beans, call <literal>Bootstrap.deployBeans()</"
-"literal>."
+msgid "To deploy the discovered beans, call <literal>Bootstrap.deployBeans()</literal>."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:414
 #, no-c-format
-msgid ""
-"To validate the deployed beans, call <literal>Bootstrap.validateBeans()</"
-"literal>."
+msgid "To validate the deployed beans, call <literal>Bootstrap.validateBeans()</literal>."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:418
 #, no-c-format
-msgid ""
-"To place the container into a state where it can service requests, call "
-"<literal>Bootstrap.endInitialization()</literal>"
+msgid "To place the container into a state where it can service requests, call <literal>Bootstrap.endInitialization()</literal>"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:423
 #, no-c-format
-msgid ""
-"To shutdown the container you call <literal>Bootstrap.shutdown()</literal>. "
-"This allows the container to perform any cleanup operations needed."
+msgid "To shutdown the container you call <literal>Bootstrap.shutdown()</literal>. This allows the container to perform any cleanup operations needed."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:431
 #, no-c-format
 msgid "Resource loading"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:433
 #, no-c-format
-msgid ""
-"Weld needs to load classes and resources from the classpath at various "
-"times. By default, they are loaded from the Thread Context ClassLoader if "
-"available, if not the same classloader that was used to load Weld, however "
-"this may not be correct for some environments. If this is case, you can "
-"implement <literal>org.jboss.weld.spi.ResourceLoader</literal>."
+msgid "Weld needs to load classes and resources from the classpath at various times. By default, they are loaded from the Thread Context ClassLoader if available, if not the same classloader that was used to load Weld, however this may not be correct for some environments. If this is case, you can implement <literal>org.jboss.weld.spi.ResourceLoader</literal>."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:445
 #, no-c-format
 msgid "The contract with the container"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:447
 #, no-c-format
-msgid ""
-"There are a number of requirements that Weld places on the container for "
-"correct functioning that fall outside implementation of APIs."
+msgid "There are a number of requirements that Weld places on the container for correct functioning that fall outside implementation of APIs."
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:454
 #, no-c-format
 msgid "Classloader isolation"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:458
 #, no-c-format
-msgid ""
-"If you are integrating Weld into an environment that supports deployment of "
-"multiple applications, you must enable, automatically, or through user "
-"configuation, classloader isolation for each CDI application."
+msgid "If you are integrating Weld into an environment that supports deployment of multiple applications, you must enable, automatically, or through user configuation, classloader isolation for each CDI application."
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:466
 #, no-c-format
 msgid "Servlet"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:470
 #, no-c-format
-msgid ""
-"If you are integrating Weld into a Servlet environment you must register "
-"<literal>org.jboss.weld.servlet.WeldListener</literal> as a Servlet "
-"listener, either automatically, or through user configuration, for each CDI "
-"application which uses Servlet."
+msgid "If you are integrating Weld into a Servlet environment you must register <literal>org.jboss.weld.servlet.WeldListener</literal> as a Servlet listener, either automatically, or through user configuration, for each CDI application which uses Servlet."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:475
 #, no-c-format
-msgid ""
-"You must ensure that that <literal>WeldListener.contextInitialized()</"
-"literal> is called after beans are deployed is complete (<literal>Bootstrap."
-"deployBeans()</literal> has been called)."
+msgid "You must ensure that that <literal>WeldListener.contextInitialized()</literal> is called after beans are deployed is complete (<literal>Bootstrap.deployBeans()</literal> has been called)."
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:482
 #, no-c-format
-msgid "<term>JSF</term>"
+msgid "JSF"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:487
 #, no-c-format
-msgid ""
-"If you are integrating Weld into a JSF environment you must register "
-"<literal>org.jboss.weld.jsf.WeldPhaseListener</literal> as a phase listener."
+msgid "If you are integrating Weld into a JSF environment you must register <literal>org.jboss.weld.jsf.WeldPhaseListener</literal> as a phase listener."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:492
 #, no-c-format
-msgid ""
-"If you are integrating Weld into a JSF environment you must register "
-"<literal>org.jboss.weld.el.WeldELContextListener</literal> as an EL Context "
-"listener."
+msgid "If you are integrating Weld into a JSF environment you must register <literal>org.jboss.weld.el.WeldELContextListener</literal> as an EL Context listener."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:497
 #, no-c-format
-msgid ""
-"If you are integrating Weld into a JSF environment you must register "
-"<literal>org.jboss.weld.jsf.ConversationAwareViewHandler</literal> as a "
-"delegating view handler."
+msgid "If you are integrating Weld into a JSF environment you must register <literal>org.jboss.weld.jsf.ConversationAwareViewHandler</literal> as a delegating view handler."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:502
 #, no-c-format
-msgid ""
-"If you are integrating Weld into a JSF environment you must obtain the bean "
-"manager for the module and then call <literal>BeanManager."
-"wrapExpressionFactory()</literal>, passing <literal>Application."
-"getExpressionFactory()</literal> as the argument. The wrapped expression "
-"factory must be used in all EL expression evaluations performed by JSF in "
-"this web application."
+msgid "If you are integrating Weld into a JSF environment you must obtain the bean manager for the module and then call <literal>BeanManager.wrapExpressionFactory()</literal>, passing <literal>Application.getExpressionFactory()</literal> as the argument. The wrapped expression factory must be used in all EL expression evaluations performed by JSF in this web application."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:509
 #, no-c-format
-msgid ""
-"If you are integrating Weld into a JSF environment you must obtain the bean "
-"manager for the module and then call <literal>BeanManager.getELResolver()</"
-"literal>, The returned EL resolver should be registered with JSF for this "
-"web application."
+msgid "If you are integrating Weld into a JSF environment you must obtain the bean manager for the module and then call <literal>BeanManager.getELResolver()</literal>, The returned EL resolver should be registered with JSF for this web application."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:516 ri-spi.xml:562
 #, no-c-format
-msgid ""
-"There are a number of ways you can obtain the bean manager for the module. "
-"You could call <literal>Bootstrap.getManager()</literal>, passing in the BDA "
-"for this module. Alternatively, you could use the injection into Java EE "
-"component classes, or look up the bean manager in JNDI."
+msgid "There are a number of ways you can obtain the bean manager for the module. You could call <literal>Bootstrap.getManager()</literal>, passing in the BDA for this module. Alternatively, you could use the injection into Java EE component classes, or look up the bean manager in JNDI."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:523
 #, no-c-format
-msgid ""
-"If you are integrating Weld into a JSF environment you must register "
-"<literal>org.jboss.weld.servlet.ConversationPropagationFilter</literal> as a "
-"Servlet listener, either automatically, or through user configuration, for "
-"each CDI application which uses JSF. This filter can be registered for all "
-"Servlet deployment safely."
+msgid "If you are integrating Weld into a JSF environment you must register <literal>org.jboss.weld.servlet.ConversationPropagationFilter</literal> as a Servlet listener, either automatically, or through user configuration, for each CDI application which uses JSF. This filter can be registered for all Servlet deployment safely."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:531
 #, no-c-format
 msgid "Weld only supports JSF 1.2 and above."
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:538
 #, no-c-format
-msgid "<term>JSP</term>"
+msgid "JSP"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:543
 #, no-c-format
-msgid ""
-"If you are integrating Weld into a JSP environment you must register "
-"<literal>org.jboss.weld.el.WeldELContextListener</literal> as an EL Context "
-"listener."
+msgid "If you are integrating Weld into a JSP environment you must register <literal>org.jboss.weld.el.WeldELContextListener</literal> as an EL Context listener."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:548
 #, no-c-format
-msgid ""
-"If you are integrating Weld into a JSP environment you must obtain the bean "
-"manager for the module and then call <literal>BeanManager."
-"wrapExpressionFactory()</literal>, passing <literal>Application."
-"getExpressionFactory()</literal> as the argument. The wrapped expression "
-"factory must be used in all EL expression evaluations performed by JSP."
+msgid "If you are integrating Weld into a JSP environment you must obtain the bean manager for the module and then call <literal>BeanManager.wrapExpressionFactory()</literal>, passing <literal>Application.getExpressionFactory()</literal> as the argument. The wrapped expression factory must be used in all EL expression evaluations performed by JSP."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:555
 #, no-c-format
-msgid ""
-"If you are integrating Weld into a JSP environment you must obtain the bean "
-"manager for the module and then call <literal>BeanManager.getELResolver()</"
-"literal>, The returned EL resolver should be registered with JSP for this "
-"web application."
+msgid "If you are integrating Weld into a JSP environment you must obtain the bean manager for the module and then call <literal>BeanManager.getELResolver()</literal>, The returned EL resolver should be registered with JSP for this web application."
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:572
 #, no-c-format
 msgid "Session Bean Interceptor"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:576
 #, no-c-format
-msgid ""
-"If you are integrating Weld into an EJB environment you must register "
-"<literal>org.jboss.weld.ejb.SessionBeanInterceptor</literal> as a EJB "
-"interceptor for all EJBs in the application, either automatically, or "
-"through user configuration, for each CDI application which uses enterprise "
-"beans."
+msgid "If you are integrating Weld into an EJB environment you must register the <literal>aroundInvoke</literal> method of <literal>org.jboss.weld.ejb.SessionBeanInterceptor</literal> as a EJB around-invoke interceptor for all EJBs in the application, either automatically, or through user configuration, for each CDI application which uses enterprise beans. If you are running in a EJB 3.1 environment, you should register this as an around-timeout interceptor as well."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:583
 #, no-c-format
-msgid ""
-"You must register the <literal>SessionBeanInterceptor</literal> as the inner "
-"most interceptor in the stack for all EJBs."
+msgid "You must register the <literal>SessionBeanInterceptor</literal> as the inner most interceptor in the stack for all EJBs."
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:591
 #, no-c-format
 msgid "The <literal>weld-core.jar</literal>"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:595
 #, no-c-format
-msgid ""
-"Weld can reside on an isolated classloader, or on a shared classloader. If "
-"you choose to use an isolated classloader, the default "
-"<literal>SingletonProvider</literal>, "
-"<literal>IsolatedStaticSingletonProvider</literal>, can be used. If you "
-"choose to use a shared classloader, then you will need to choose another "
-"strategy."
+msgid "Weld can reside on an isolated classloader, or on a shared classloader. If you choose to use an isolated classloader, the default <literal>SingletonProvider</literal>, <literal>IsolatedStaticSingletonProvider</literal>, can be used. If you choose to use a shared classloader, then you will need to choose another strategy."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:601
 #, no-c-format
-msgid ""
-"You can provide your own implementation of <literal>Singleton</literal> and "
-"<literal>SingletonProvider</literal> and register it for use using "
-"<literal>SingletonProvider.initialize(SingletonProvider provider)</literal>."
+msgid "You can provide your own implementation of <literal>Singleton</literal> and <literal>SingletonProvider</literal> and register it for use using <literal>SingletonProvider.initialize(SingletonProvider provider)</literal>."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:606
 #, no-c-format
-msgid ""
-"Weld also provides an implementation of Thread Context Classloader per "
-"application strategy, via the <literal>TCCLSingletonProvider</literal>."
+msgid "Weld also provides an implementation of Thread Context Classloader per application strategy, via the <literal>TCCLSingletonProvider</literal>."
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:613
 #, no-c-format
 msgid "Binding the manager in JNDI"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:617
 #, no-c-format
-msgid ""
-"You should bind the bean manager for the bean deployment archive into JNDI "
-"at <literal>java:comp/Manager</literal>. The type should be <literal>javax."
-"enterprise.inject.spi.BeanManager</literal>. To obtain the correct bean "
-"manager for the bean deployment archive, you may call <literal>bootstrap."
-"getBeanManager(beanDeploymentArchive)</literal>"
+msgid "You should bind the bean manager for the bean deployment archive into JNDI at <literal>java:comp/Manager</literal>. The type should be <literal>javax.enterprise.inject.spi.BeanManager</literal>. To obtain the correct bean manager for the bean deployment archive, you may call <literal>bootstrap.getBeanManager(beanDeploymentArchive)</literal>"
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:627
 #, no-c-format
 msgid "Performing CDI injection on Java EE component classes"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:631
 #, no-c-format
-msgid ""
-"The CDI specification requires the container to provide injection into non-"
-"contextual resources for all Java EE component classes. Weld delegates this "
-"responsibility to the container. This can be achieved using the CDI defined "
-"<literal>InjectionTarget</literal> SPI. Furthermore, you must perform this "
-"operation on the correct bean manager for the bean deployment archive "
-"containing the EE component class."
+msgid "The CDI specification requires the container to provide injection into non-contextual resources for all Java EE component classes. Weld delegates this responsibility to the container. This can be achieved using the CDI defined <literal>InjectionTarget</literal> SPI. Furthermore, you must perform this operation on the correct bean manager for the bean deployment archive containing the EE component class."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:639
 #, no-c-format
-msgid ""
-"The CDI specification also requires that a <literal>ProcessInjectionTarget</"
-"literal> event is fired for every Java EE component class. Furthermore, if "
-"an observer calls <literal>ProcessInjectionTarget.setInjectionTarget()</"
-"literal> the container must use <emphasis>the specified</emphasis> injection "
-"target to perform injection."
+msgid "The CDI specification also requires that a <literal>ProcessInjectionTarget</literal> event is fired for every Java EE component class. Furthermore, if an observer calls <literal>ProcessInjectionTarget.setInjectionTarget()</literal> the container must use <emphasis>the specified</emphasis> injection target to perform injection."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:646
 #, no-c-format
-msgid ""
-"To help the integrator, Weld provides <literal>WeldManager."
-"fireProcessInjectionTarget()</literal> which returns the "
-"<literal>InjectionTarget</literal> to use."
+msgid "To help the integrator, Weld provides <literal>WeldManager.fireProcessInjectionTarget()</literal> which returns the <literal>InjectionTarget</literal> to use."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:651
-#, no-c-format
-msgid ""
-"<![CDATA[// Fire ProcessInjectionTarget, returning the InjectionTarget\n"
-"// to use\n"
-"InjectionTarget it = weldBeanManager.fireProcessInjectionTarget(clazz);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = beanManager.createCreationalContext(null);\n"
-"\n"
-"// Produce the instance, performing any constructor injection required\n"
-"Object instance = it.produce();\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
-
 #. Tag: para
-#: ri-spi.xml:652
 #, no-c-format
-msgid ""
-"The container may intersperse other operations between these calls. Further, "
-"the integrator may choose to implement any of these calls in another manner, "
-"assuming the contract is fulfilled."
+msgid "The container may intersperse other operations between these calls. Further, the integrator may choose to implement any of these calls in another manner, assuming the contract is fulfilled."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:656
 #, no-c-format
-msgid ""
-"When performing injections on EJBs you must use the Weld-defined SPI, "
-"<literal>WeldManager</literal>. Furthermore, you must perform this operation "
-"on the correct bean manager for the bean deployment archive containing the "
-"EJB."
+msgid "When performing injections on EJBs you must use the Weld-defined SPI, <literal>WeldManager</literal>. Furthermore, you must perform this operation on the correct bean manager for the bean deployment archive containing the EJB."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:661
-#, no-c-format
-msgid ""
-"<![CDATA[// Obtain the EjbDescriptor for the EJB\n"
-"// You may choose to use this utility method to get the descriptor\n"
-"EjbDescriptor<?> ejbDescriptor = beanManager.getEjbDescriptor(ejbName);\n"
-"\n"
-"// Get an the Bean object\n"
-"Bean<?> bean = beanManager.getBean(ejbDescriptor);\n"
-"\n"
-"// Create the injection target\n"
-"InjectionTarget it = deploymentBeanManager.createInjectionTarget"
-"(ejbDescriptor);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = deploymentBeanManager.createCreationalContext"
-"(bean);\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// You may choose to have CDI call the post construct and pre destroy\n"
-"// lifecycle callbacks\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""

Modified: doc/trunk/reference/pot/scopescontexts.pot
===================================================================
--- doc/trunk/reference/pot/scopescontexts.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/scopescontexts.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,750 +1,399 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"PO-Revision-Date: 2010-03-02T13:07:18\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: scopescontexts.xml:5
 #, no-c-format
 msgid "Scopes and contexts"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:7
 #, no-c-format
-msgid ""
-"So far, we've seen a few examples of <emphasis>scope type annotations</"
-"emphasis>. The scope of a bean determines the lifecycle of instances of the "
-"bean. The scope also determines which clients refer to which instances of "
-"the bean. According to the CDI specification, a scope determines:"
+msgid "So far, we've seen a few examples of <emphasis>scope type annotations</emphasis>. The scope of a bean determines the lifecycle of instances of the bean. The scope also determines which clients refer to which instances of the bean. According to the CDI specification, a scope determines:"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:16
 #, no-c-format
 msgid "When a new instance of any bean with that scope is created"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:19
 #, no-c-format
 msgid "When an existing instance of any bean with that scope is destroyed"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:22
 #, no-c-format
-msgid ""
-"Which injected references refer to any instance of a bean with that scope"
+msgid "Which injected references refer to any instance of a bean with that scope"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:27
 #, no-c-format
-msgid ""
-"For example, if we have a session-scoped bean, <literal>CurrentUser</"
-"literal>, all beans that are called in the context of the same "
-"<literal>HttpSession</literal> will see the same instance of "
-"<literal>CurrentUser</literal>. This instance will be automatically created "
-"the first time a <literal>CurrentUser</literal> is needed in that session, "
-"and automatically destroyed when the session ends."
+msgid "For example, if we have a session-scoped bean, <literal>CurrentUser</literal>, all beans that are called in the context of the same <literal>HttpSession</literal> will see the same instance of <literal>CurrentUser</literal>. This instance will be automatically created the first time a <literal>CurrentUser</literal> is needed in that session, and automatically destroyed when the session ends."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:35
 #, no-c-format
-msgid ""
-"JPA entities aren't a great fit for this model. Entities have their whole "
-"own lifecycle and identity model which just doesn't map naturally to the "
-"model used in CDI. Therefore, we recommend against treating entities as CDI "
-"beans. You're certainly going to run into problems if you try to give an "
-"entity a scope other than the default scope <literal>@Dependent</literal>. "
-"The client proxy will get in the way if you try to pass an injected instance "
-"to the JPA <literal>EntityManager</literal>."
+msgid "JPA entities aren't a great fit for this model. Entities have their whole own lifecycle and identity model which just doesn't map naturally to the model used in CDI. Therefore, we recommend against treating entities as CDI beans. You're certainly going to run into problems if you try to give an entity a scope other than the default scope <literal>@Dependent</literal>. The client proxy will get in the way if you try to pass an injected instance to the JPA <literal>EntityManager</literal>."
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:45
 #, no-c-format
 msgid "Scope types"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:47
 #, no-c-format
-msgid ""
-"CDI features an <emphasis>extensible context model</emphasis>. It's possible "
-"to define new scopes by creating a new scope type annotation:"
+msgid "CDI features an <emphasis>extensible context model</emphasis>. It's possible to define new scopes by creating a new scope type annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:52
-#, no-c-format
-msgid ""
-"<![CDATA[@ScopeType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"public @interface ClusterScoped {}]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:54
 #, no-c-format
-msgid ""
-"Of course, that's the easy part of the job. For this scope type to be "
-"useful, we will also need to define a <literal>Context</literal> object that "
-"implements the scope! Implementing a <literal>Context</literal> is usually a "
-"very technical task, intended for framework development only. You can expect "
-"an implementation of the business scope, for instance, in a future version "
-"of Seam."
+msgid "Of course, that's the easy part of the job. For this scope type to be useful, we will also need to define a <literal>Context</literal> object that implements the scope! Implementing a <literal>Context</literal> is usually a very technical task, intended for framework development only. You can expect an implementation of the business scope, for instance, in a future version of Seam."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:61
 #, no-c-format
-msgid ""
-"We can apply a scope type annotation to a bean implementation class to "
-"specify the scope of the bean:"
+msgid "We can apply a scope type annotation to a bean implementation class to specify the scope of the bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:67
 #, no-c-format
 msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:72
 #, no-c-format
 msgid "Built-in scopes"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:74
 #, no-c-format
 msgid "CDI defines four built-in scopes:"
 msgstr ""
 
-#. Tag: literal
-#: scopescontexts.xml:78
+#. Tag: para
 #, no-c-format
-msgid "@RequestScoped"
+msgid "<literal>@RequestScoped</literal>"
 msgstr ""
 
-#. Tag: literal
-#: scopescontexts.xml:81
+#. Tag: para
 #, no-c-format
-msgid "@SessionScoped"
+msgid "<literal>@SessionScoped</literal>"
 msgstr ""
 
-#. Tag: literal
-#: scopescontexts.xml:84
+#. Tag: para
 #, no-c-format
-msgid "@ApplicationScoped"
+msgid "<literal>@ApplicationScoped</literal>"
 msgstr ""
 
-#. Tag: literal
-#: scopescontexts.xml:87
+#. Tag: para
 #, no-c-format
-msgid "@ConversationScoped"
+msgid "<literal>@ConversationScoped</literal>"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:91
 #, no-c-format
 msgid "For a web application that uses CDI:"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:95
 #, no-c-format
-msgid ""
-"any servlet request has access to active request, session and application "
-"scopes, and, additionally"
+msgid "any servlet request has access to active request, session and application scopes, and, additionally"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:100
 #, no-c-format
 msgid "any JSF request has access to an active conversation scope."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:105
 #, no-c-format
-msgid ""
-"A CDI extension can implement support for the conversation scope in other "
-"web frameworks."
+msgid "A CDI extension can implement support for the conversation scope in other web frameworks."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:108
 #, no-c-format
 msgid "The request and application scopes are also active:"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:112
 #, no-c-format
 msgid "during invocations of EJB remote methods,"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:115
 #, no-c-format
 msgid "during invocations of EJB asynchronous methods,"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:118
 #, no-c-format
 msgid "during EJB timeouts,"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:121
 #, no-c-format
 msgid "during message delivery to a message-driven bean,"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:124
 #, no-c-format
 msgid "during message delivery to a <literal>MessageListener</literal>, and"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:127
 #, no-c-format
 msgid "during web service invocations."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:131
 #, no-c-format
-msgid ""
-"If the application tries to invoke a bean with a scope that does not have an "
-"active context, a <literal>ContextNotActiveException</literal> is thrown by "
-"the container at runtime."
+msgid "If the application tries to invoke a bean with a scope that does not have an active context, a <literal>ContextNotActiveException</literal> is thrown by the container at runtime."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:136
 #, no-c-format
-msgid ""
-"Managed beans with scope <literal>@SessionScoped</literal> or "
-"<literal>@ConversationScoped</literal> must be serializable, since the "
-"container passivates the HTTP session from time to time."
+msgid "Managed beans with scope <literal>@SessionScoped</literal> or <literal>@ConversationScoped</literal> must be serializable, since the container passivates the HTTP session from time to time."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:141
 #, no-c-format
-msgid ""
-"Three of the four built-in scopes should be extremely familiar to every Java "
-"EE developer, so let's not waste time discussing them here. One of the "
-"scopes, however, is new."
+msgid "Three of the four built-in scopes should be extremely familiar to every Java EE developer, so let's not waste time discussing them here. One of the scopes, however, is new."
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:149
 #, no-c-format
 msgid "The conversation scope"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:151
 #, no-c-format
-msgid ""
-"The conversation scope is a bit like the traditional session scope in that "
-"it holds state associated with a user of the system, and spans multiple "
-"requests to the server. However, unlike the session scope, the conversation "
-"scope:"
+msgid "The conversation scope is a bit like the traditional session scope in that it holds state associated with a user of the system, and spans multiple requests to the server. However, unlike the session scope, the conversation scope:"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:159
 #, no-c-format
 msgid "is demarcated explicitly by the application, and"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:162
 #, no-c-format
-msgid ""
-"holds state associated with a particular web browser tab in a JSF "
-"application (browsers tend to share domain cookies, and hence the session "
-"cookie, between tabs, so this is not the case for the session scope)."
+msgid "holds state associated with a particular web browser tab in a JSF application (browsers tend to share domain cookies, and hence the session cookie, between tabs, so this is not the case for the session scope)."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:169
 #, no-c-format
-msgid ""
-"A conversation represents a task&#8212;a unit of work from the point of view "
-"of the user. The conversation context holds state associated with what the "
-"user is currently working on. If the user is doing multiple things at the "
-"same time, there are multiple conversations."
+msgid "A conversation represents a task—a unit of work from the point of view of the user. The conversation context holds state associated with what the user is currently working on. If the user is doing multiple things at the same time, there are multiple conversations."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:175
 #, no-c-format
-msgid ""
-"The conversation context is active during any JSF request. Most "
-"conversations are destroyed at the end of the request. If a conversation "
-"should hold state across multiple requests, it must be explicitly promoted "
-"to a <emphasis>long-running conversation</emphasis>."
+msgid "The conversation context is active during any JSF request. Most conversations are destroyed at the end of the request. If a conversation should hold state across multiple requests, it must be explicitly promoted to a <emphasis>long-running conversation</emphasis>."
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:182
 #, no-c-format
 msgid "Conversation demarcation"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:184
 #, no-c-format
-msgid ""
-"CDI provides a built-in bean for controlling the lifecycle of conversations "
-"in a JSF application. This bean may be obtained by injection:"
+msgid "CDI provides a built-in bean for controlling the lifecycle of conversations in a JSF application. This bean may be obtained by injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:189
-#, no-c-format
-msgid "@Inject Conversation conversation;"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:191
 #, no-c-format
-msgid ""
-"To promote the conversation associated with the current request to a long-"
-"running conversation, call the <literal>begin()</literal> method from "
-"application code. To schedule the current long-running conversation context "
-"for destruction at the end of the current request, call <literal>end()</"
-"literal>."
+msgid "To promote the conversation associated with the current request to a long-running conversation, call the <literal>begin()</literal> method from application code. To schedule the current long-running conversation context for destruction at the end of the current request, call <literal>end()</literal>."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:197
 #, no-c-format
-msgid ""
-"In the following example, a conversation-scoped bean controls the "
-"conversation with which it is associated:"
+msgid "In the following example, a conversation-scoped bean controls the conversation with which it is associated:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:201
-#, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"   private Order order;\n"
-"   private @Inject Conversation conversation;\n"
-"   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
-"   \n"
-"   @Produces public Order getOrder() {\n"
-"      return order;\n"
-"   }\n"
-"\n"
-"   public Order createOrder() {\n"
-"      order = new Order();\n"
-"      conversation.begin();\n"
-"      return order;\n"
-"   }\n"
-"   \n"
-"   public void addLineItem(Product product, int quantity) {\n"
-"      order.add(new LineItem(product, quantity));\n"
-"   }\n"
-"\n"
-"   public void saveOrder(Order order) {\n"
-"      em.persist(order);\n"
-"      conversation.end();\n"
-"   }\n"
-"   \n"
-"   @Remove\n"
-"   public void destroy() {}\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:203
 #, no-c-format
-msgid ""
-"This bean is able to control its own lifecycle through use of the "
-"<literal>Conversation</literal> API. But some other beans have a lifecycle "
-"which depends completely upon another object."
+msgid "This bean is able to control its own lifecycle through use of the <literal>Conversation</literal> API. But some other beans have a lifecycle which depends completely upon another object."
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:211
 #, no-c-format
 msgid "Conversation propagation"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:213
 #, no-c-format
-msgid ""
-"The conversation context automatically propagates with any JSF faces request "
-"(JSF form submission) or redirect. It does not automatically propagate with "
-"non-faces requests, for example, navigation via a link."
+msgid "The conversation context automatically propagates with any JSF faces request (JSF form submission) or redirect. It does not automatically propagate with non-faces requests, for example, navigation via a link."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:218
 #, no-c-format
-msgid ""
-"We can force the conversation to propagate with a non-faces request by "
-"including the unique identifier of the conversation as a request parameter. "
-"The CDI specification reserves the request parameter named <literal>cid</"
-"literal> for this use. The unique identifier of the conversation may be "
-"obtained from the <literal>Conversation</literal> object, which has the EL "
-"bean name <literal>conversation</literal>."
+msgid "We can force the conversation to propagate with a non-faces request by including the unique identifier of the conversation as a request parameter. The CDI specification reserves the request parameter named <literal>cid</literal> for this use. The unique identifier of the conversation may be obtained from the <literal>Conversation</literal> object, which has the EL bean name <literal>conversation</literal>."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:225
 #, no-c-format
 msgid "Therefore, the following link propagates the conversation:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:229
-#, no-c-format
-msgid ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:231
 #, no-c-format
 msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:235
-#, no-c-format
-msgid ""
-"<![CDATA[<h:link outcome=\"/addProduct.xhtml value=\"Add Product\">\n"
-"   <f:param name=\"cid\" value=\"#{conversation.id}\"/>\n"
-"</h:link>]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:238
 #, no-c-format
-msgid ""
-"The conversation context propagates across redirects, making it very easy to "
-"implement the common POST-then-redirect pattern, without resort to fragile "
-"constructs such as a \"flash\" object. The container automatically adds the "
-"conversation id to the redirect URL as a request parameter."
+msgid "The conversation context propagates across redirects, making it very easy to implement the common POST-then-redirect pattern, without resort to fragile constructs such as a \"flash\" object. The container automatically adds the conversation id to the redirect URL as a request parameter."
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:248
 #, no-c-format
 msgid "Conversation timeout"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:250
 #, no-c-format
-msgid ""
-"The container is permitted to destroy a conversation and all state held in "
-"its context at any time in order to conserve resources. A CDI implementation "
-"will normally do this on the basis of some kind of timeout&#8212;though this "
-"is not required by the specification. The timeout is the period of "
-"inactivity before the conversation is destroyed (as opposed to the amount of "
-"time the conversation is active)."
+msgid "The container is permitted to destroy a conversation and all state held in its context at any time in order to conserve resources. A CDI implementation will normally do this on the basis of some kind of timeout—though this is not required by the specification. The timeout is the period of inactivity before the conversation is destroyed (as opposed to the amount of time the conversation is active)."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:257
 #, no-c-format
-msgid ""
-"The <literal>Conversation</literal> object provides a method to set the "
-"timeout. This is a hint to the container, which is free to ignore the "
-"setting."
+msgid "The <literal>Conversation</literal> object provides a method to set the timeout. This is a hint to the container, which is free to ignore the setting."
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:262
-#, no-c-format
-msgid "conversation.setTimeout(timeoutInMillis);"
-msgstr ""
-
 #. Tag: title
-#: scopescontexts.xml:269
 #, no-c-format
 msgid "The singleton pseudo-scope"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:271
 #, no-c-format
-msgid ""
-"In addition to the four built-in scopes, CDI also supports two "
-"<emphasis>pseudo-scopes</emphasis>. The first is the <emphasis>singleton "
-"pseudo-scope</emphasis>, which we specify using the annotation "
-"<literal>@Singleton</literal>."
+msgid "In addition to the four built-in scopes, CDI also supports two <emphasis>pseudo-scopes</emphasis>. The first is the <emphasis>singleton pseudo-scope</emphasis>, which we specify using the annotation <literal>@Singleton</literal>."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:277
 #, no-c-format
-msgid ""
-"Unlike the other scopes, which belong to the package <literal>javax."
-"enterprise.context</literal>, the <literal>@Singleton</literal> annotation "
-"is defined in the package <literal>javax.inject</literal>."
+msgid "Unlike the other scopes, which belong to the package <literal>javax.enterprise.context</literal>, the <literal>@Singleton</literal> annotation is defined in the package <literal>javax.inject</literal>."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:283
 #, no-c-format
-msgid ""
-"You can guess what \"singleton\" means here. It means a bean that is "
-"instantiated once. Unfortunately, there's a little problem with this pseudo-"
-"scope. Beans with scope <literal>@Singleton</literal> don't have a proxy "
-"object. Clients hold a direct reference to the singleton instance. So we "
-"need to consider the case of a client that can be serialized, for example, "
-"any bean with scope <literal>@SessionScoped</literal> or "
-"<literal>@ConversationScoped</literal>, any dependent object of a bean with "
-"scope <literal>@SessionScoped</literal> or <literal>@ConversationScoped</"
-"literal>, or any stateful session bean."
+msgid "You can guess what \"singleton\" means here. It means a bean that is instantiated once. Unfortunately, there's a little problem with this pseudo-scope. Beans with scope <literal>@Singleton</literal> don't have a proxy object. Clients hold a direct reference to the singleton instance. So we need to consider the case of a client that can be serialized, for example, any bean with scope <literal>@SessionScoped</literal> or <literal>@ConversationScoped</literal>, any dependent object of a bean with scope <literal>@SessionScoped</literal> or <literal>@ConversationScoped</literal>, or any stateful session bean."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:292
 #, no-c-format
-msgid ""
-"Now, if the singleton instance is a simple, immutable, serializable object "
-"like a string, a number or a date, we probably don't mind too much if it "
-"gets duplicated via serialization. However, that makes it no stop being a "
-"true singleton, and we may as well have just declared it with the default "
-"scope."
+msgid "Now, if the singleton instance is a simple, immutable, serializable object like a string, a number or a date, we probably don't mind too much if it gets duplicated via serialization. However, that makes it no stop being a true singleton, and we may as well have just declared it with the default scope."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:298
 #, no-c-format
-msgid ""
-"There are several ways to ensure that the singleton bean remains a singleton "
-"when its client gets serialized:"
+msgid "There are several ways to ensure that the singleton bean remains a singleton when its client gets serialized:"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:302
 #, no-c-format
-msgid ""
-"have the singleton bean implement <literal>writeResolve()</literal> and "
-"<literal>readReplace()</literal> (as defined by the Java serialization "
-"specification),"
+msgid "have the singleton bean implement <literal>writeResolve()</literal> and <literal>readReplace()</literal> (as defined by the Java serialization specification),"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:308
 #, no-c-format
-msgid ""
-"make sure the client keeps only a transient reference to the singleton bean, "
-"or"
+msgid "make sure the client keeps only a transient reference to the singleton bean, or"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:313
 #, no-c-format
-msgid ""
-"give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
-"where <literal>X</literal> is the bean type of the singleton bean."
+msgid "give the client a reference of type <literal>Instance&lt;X&gt;</literal> where <literal>X</literal> is the bean type of the singleton bean."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:320
 #, no-c-format
-msgid ""
-"A fourth, better solution is to instead use <literal>@ApplicationScoped</"
-"literal>, allowing the container to proxy the bean, and take care of "
-"serialization problems automatically."
+msgid "A fourth, better solution is to instead use <literal>@ApplicationScoped</literal>, allowing the container to proxy the bean, and take care of serialization problems automatically."
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:326
 #, no-c-format
 msgid "The dependent pseudo-scope"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:328
 #, no-c-format
-msgid ""
-"Finally, CDI features the so-called <emphasis>dependent pseudo-scope</"
-"emphasis>. This is the default scope for a bean which does not explicitly "
-"declare a scope type."
+msgid "Finally, CDI features the so-called <emphasis>dependent pseudo-scope</emphasis>. This is the default scope for a bean which does not explicitly declare a scope type."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:333
 #, no-c-format
-msgid ""
-"For example, this bean has the scope type <literal>@Dependent</literal>:"
+msgid "For example, this bean has the scope type <literal>@Dependent</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:337
-#, no-c-format
-msgid "<![CDATA[public class Calculator { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:339
 #, no-c-format
-msgid ""
-"An instance of a dependent bean is never shared between different clients or "
-"different injection points. It is strictly a <emphasis>dependent object</"
-"emphasis> of some other object. It is instantiated when the object it "
-"belongs to is created, and destroyed when the object it belongs to is "
-"destroyed."
+msgid "An instance of a dependent bean is never shared between different clients or different injection points. It is strictly a <emphasis>dependent object</emphasis> of some other object. It is instantiated when the object it belongs to is created, and destroyed when the object it belongs to is destroyed."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:345
 #, no-c-format
-msgid ""
-"If a Unified EL expression refers to a dependent bean by EL name, an "
-"instance of the bean is instantiated every time the expression is evaluated. "
-"The instance is not reused during any other expression evaluation."
+msgid "If a Unified EL expression refers to a dependent bean by EL name, an instance of the bean is instantiated every time the expression is evaluated. The instance is not reused during any other expression evaluation."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:351
 #, no-c-format
-msgid ""
-"If you need to access a bean directly by EL name in a JSF page, you probably "
-"need to give it a scope other than <literal>@Dependent</literal>. Otherwise, "
-"any value that gets set to the bean by a JSF input will be lost immediately. "
-"That's why CDI features the <literal>@Model</literal> stereotype; it lets "
-"you give a bean a name, and set its scope to <literal>@RequestScoped</"
-"literal> in one stroke. If you need to access a bean that really "
-"<emphasis>has</emphasis> to have the scope <literal>@Dependent</literal> "
-"from a JSF page, inject it into a different bean, and expose it to EL via a "
-"getter method."
+msgid "If you need to access a bean directly by EL name in a JSF page, you probably need to give it a scope other than <literal>@Dependent</literal>. Otherwise, any value that gets set to the bean by a JSF input will be lost immediately. That's why CDI features the <literal>@Model</literal> stereotype; it lets you give a bean a name, and set its scope to <literal>@RequestScoped</literal> in one stroke. If you need to access a bean that really <emphasis>has</emphasis> to have the scope <literal>@Dependent</literal> from a JSF page, inject it into a different bean, and expose it to EL via a getter method."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:361
 #, no-c-format
-msgid ""
-"Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
-"The client holds a direct reference to its instance."
+msgid "Beans with scope <literal>@Dependent</literal> don't need a proxy object. The client holds a direct reference to its instance."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:366
 #, no-c-format
-msgid ""
-"CDI makes it easy to obtain a dependent instance of a bean, even if the bean "
-"is already declared as a bean with some other scope type."
+msgid "CDI makes it easy to obtain a dependent instance of a bean, even if the bean is already declared as a bean with some other scope type."
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:374
 #, no-c-format
 msgid "The <literal>@New</literal> qualifier"
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:376
 #, no-c-format
-msgid ""
-"The built-in qualifier <literal>@New</literal> allows us to obtain a "
-"dependent object of a specified class."
+msgid "The built-in qualifier <literal>@New</literal> allows us to obtain a dependent object of a specified class."
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:380
-#, no-c-format
-msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:382
 #, no-c-format
-msgid ""
-"The class must be a valid managed bean or session bean, but need not be an "
-"enabled bean."
+msgid "The class must be a valid managed bean or session bean, but need not be an enabled bean."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:384
 #, no-c-format
-msgid ""
-"This works even if <literal>Calculator</literal> is <emphasis>already</"
-"emphasis> declared with a different scope type, for example:"
+msgid "This works even if <literal>Calculator</literal> is <emphasis>already</emphasis> declared with a different scope type, for example:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:391
 #, no-c-format
-msgid ""
-"So the following injected attributes each get a different instance of "
-"<literal>Calculator</literal>:"
+msgid "So the following injected attributes each get a different instance of <literal>Calculator</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:395
-#, no-c-format
-msgid ""
-"<![CDATA[public class PaymentCalc {\n"
-"   @Inject Calculator calculator;\n"
-"   @Inject @New Calculator newCalculator;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:397
 #, no-c-format
-msgid ""
-"The <literal>calculator</literal> field has a conversation-scoped instance "
-"of <literal>Calculator</literal> injected. The <literal>newCalculator</"
-"literal> field has a new instance of <literal>Calculator</literal> injected, "
-"with a lifecycle that is bound to the owning <literal>PaymentCalc</literal>."
+msgid "The <literal>calculator</literal> field has a conversation-scoped instance of <literal>Calculator</literal> injected. The <literal>newCalculator</literal> field has a new instance of <literal>Calculator</literal> injected, with a lifecycle that is bound to the owning <literal>PaymentCalc</literal>."
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:403
 #, no-c-format
-msgid ""
-"This feature is particularly useful with producer methods, as we'll see in "
-"the next chapter."
+msgid "This feature is particularly useful with producer methods, as we'll see in the next chapter."
 msgstr ""
+

Modified: doc/trunk/reference/pot/specialization.pot
===================================================================
--- doc/trunk/reference/pot/specialization.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/specialization.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,358 +1,159 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"PO-Revision-Date: 2010-03-02T13:07:18\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: specialization.xml:5
 #, no-c-format
 msgid "Specialization, inheritance and alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:7
 #, no-c-format
-msgid ""
-"When you first start developing with CDI, you'll likely be dealing only with "
-"a single bean implementation for each bean type. In this case, it's easy to "
-"understand how beans get selected for injection. As the complexity of your "
-"application grows, multiple occurrences of the same bean type start "
-"appearing, either because you have multiple implementations or two beans "
-"share a common (Java) inheritance. That's when you have to begin studying "
-"the specialization, inheritance and alternative rules to work through "
-"unsatisfied or ambiguous dependencies or to avoid certain beans from being "
-"called."
+msgid "When you first start developing with CDI, you'll likely be dealing only with a single bean implementation for each bean type. In this case, it's easy to understand how beans get selected for injection. As the complexity of your application grows, multiple occurrences of the same bean type start appearing, either because you have multiple implementations or two beans share a common (Java) inheritance. That's when you have to begin studying the specialization, inheritance and alternative rules to work through unsatisfied or ambiguous dependencies or to avoid certain beans from being called."
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:16
 #, no-c-format
-msgid ""
-"The CDI specification recognizes two distinct scenarios in which one bean "
-"extends another:"
+msgid "The CDI specification recognizes two distinct scenarios in which one bean extends another:"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:23
 #, no-c-format
-msgid ""
-"The second bean <emphasis>specializes</emphasis> the first bean in certain "
-"deployment scenarios. In these deployments, the second bean completely "
-"replaces the first, fulfilling the same role in the system."
+msgid "The second bean <emphasis>specializes</emphasis> the first bean in certain deployment scenarios. In these deployments, the second bean completely replaces the first, fulfilling the same role in the system."
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:29
 #, no-c-format
-msgid ""
-"The second bean is simply reusing the Java implementation, and otherwise "
-"bears no relation to the first bean. The first bean may not even have been "
-"designed for use as a contextual object."
+msgid "The second bean is simply reusing the Java implementation, and otherwise bears no relation to the first bean. The first bean may not even have been designed for use as a contextual object."
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:37
 #, no-c-format
-msgid ""
-"The second case is the default assumed by CDI. It's possible to have two "
-"beans in the system with the same part bean type (interface or parent "
-"class). As you've learned, you select between the two implementations using "
-"qualifiers."
+msgid "The second case is the default assumed by CDI. It's possible to have two beans in the system with the same part bean type (interface or parent class). As you've learned, you select between the two implementations using qualifiers."
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:43
 #, no-c-format
-msgid ""
-"The first case is the exception, and also requires more care. In any given "
-"deployment, only one bean can fulfill a given role at a time. That means one "
-"bean needs to be enabled and the other disabled. There are a two modifiers "
-"involved: <literal>@Alternative</literal> and <literal>@Specializes</"
-"literal>. We'll start by looking at alternatives and then show the "
-"guarantees that specialization adds."
+msgid "The first case is the exception, and also requires more care. In any given deployment, only one bean can fulfill a given role at a time. That means one bean needs to be enabled and the other disabled. There are a two modifiers involved: <literal>@Alternative</literal> and <literal>@Specializes</literal>. We'll start by looking at alternatives and then show the guarantees that specialization adds."
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:51
 #, no-c-format
 msgid "Using alternative stereotypes"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:53
 #, no-c-format
-msgid ""
-"CDI lets you <emphasis>override</emphasis> the implementation of a bean type "
-"at deployment time using an alternative. For example, the following bean "
-"provides a default implementation of the <literal>PaymentProcessor</literal> "
-"interface:"
+msgid "CDI lets you <emphasis>override</emphasis> the implementation of a bean type at deployment time using an alternative. For example, the following bean provides a default implementation of the <literal>PaymentProcessor</literal> interface:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[public class DefaultPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:61
 #, no-c-format
-msgid ""
-"But in our staging environment, we don't really want to submit payments to "
-"the external system, so we override that implementation of "
-"<literal>PaymentProcessor</literal> with a different bean:"
+msgid "But in our staging environment, we don't really want to submit payments to the external system, so we override that implementation of <literal>PaymentProcessor</literal> with a different bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:66
-#, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:68
 #, no-c-format
-msgid "<para>or</para>"
+msgid "or"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:70
-#, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      extends DefaultPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:72
 #, no-c-format
-msgid ""
-"We've already seen how we can enable this alternative by listing its class "
-"in the <literal>beans.xml</literal> descriptor."
+msgid "We've already seen how we can enable this alternative by listing its class in the <literal>beans.xml</literal> descriptor."
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:77
 #, no-c-format
-msgid ""
-"But suppose we have many alternatives in the staging environment. It would "
-"be much more convenient to be able to enable them all at once. So let's make "
-"<literal>@Staging</literal> an <literal>@Alternative</literal> stereotype "
-"and annotate the staging beans with this stereotype instead. You'll see how "
-"this level of indirection pays off. First, we create the stereotype:"
+msgid "But suppose we have many alternatives in the staging environment. It would be much more convenient to be able to enable them all at once. So let's make <literal>@Staging</literal> an <literal>@Alternative</literal> stereotype and annotate the staging beans with this stereotype instead. You'll see how this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:84
-#, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Staging {}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:86
 #, no-c-format
-msgid ""
-"Then we replace the <literal>@Alternative</literal> annotation on our bean "
-"with <literal>@Staging</literal>:"
+msgid "Then we replace the <literal>@Alternative</literal> annotation on our bean with <literal>@Staging</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:90
-#, no-c-format
-msgid ""
-"<![CDATA[@Staging\n"
-"public class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:92
 #, no-c-format
-msgid ""
-"Finally, we activate the <literal>@Staging</literal> stereotype in the "
-"<literal>beans.xml</literal> descriptor:"
+msgid "Finally, we activate the <literal>@Staging</literal> stereotype in the <literal>beans.xml</literal> descriptor:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:96
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <stereotype>org.mycompany.myapp.Staging</stereotype>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:98
 #, no-c-format
-msgid ""
-"Now, no matter how many staging beans we have, they will all be enabled at "
-"once."
+msgid "Now, no matter how many staging beans we have, they will all be enabled at once."
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:105
 #, no-c-format
 msgid "A minor problem with alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:107
 #, no-c-format
-msgid ""
-"When we enable an alternative, does that mean the default implementation is "
-"disabled? Well, not exactly. If the default implementation has a qualifier, "
-"for instance <literal>@LargeTransaction</literal>, and the alternative does "
-"not, you could still inject the default implementation."
+msgid "When we enable an alternative, does that mean the default implementation is disabled? Well, not exactly. If the default implementation has a qualifier, for instance <literal>@LargeTransaction</literal>, and the alternative does not, you could still inject the default implementation."
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:113
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @LargeTransaction PaymentProcessor paymentProcessor;]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:115
 #, no-c-format
-msgid ""
-"So we haven't completely replaced the default implementation in this "
-"deployment of the system. The only way one bean can completely override a "
-"second bean at all injection points is if it implements all the bean types "
-"and declares all the qualifiers of the second bean. However, if the second "
-"bean declares a producer method or observer method, then even this is not "
-"enough to ensure that the second bean is never called! We need something "
-"extra."
+msgid "So we haven't completely replaced the default implementation in this deployment of the system. The only way one bean can completely override a second bean at all injection points is if it implements all the bean types and declares all the qualifiers of the second bean. However, if the second bean declares a producer method or observer method, then even this is not enough to ensure that the second bean is never called! We need something extra."
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:123
 #, no-c-format
-msgid ""
-"CDI provides a special feature, called <emphasis>specialization</emphasis>, "
-"that helps the developer avoid these traps. Specialization is a way of "
-"informing the system of your intent to completely replace and disable an "
-"implementation of a bean."
+msgid "CDI provides a special feature, called <emphasis>specialization</emphasis>, that helps the developer avoid these traps. Specialization is a way of informing the system of your intent to completely replace and disable an implementation of a bean."
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:132
 #, no-c-format
 msgid "Using specialization"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:134
 #, no-c-format
-msgid ""
-"When the goal is to replace one bean implementation with a second, to help "
-"prevent developer error, the first bean may:"
+msgid "When the goal is to replace one bean implementation with a second, to help prevent developer error, the first bean may:"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:141
 #, no-c-format
 msgid "directly extend the bean class of the second bean, or"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:146
 #, no-c-format
-msgid ""
-"directly override the producer method, in the case that the second bean is a "
-"producer method, and then"
+msgid "directly override the producer method, in the case that the second bean is a producer method, and then"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:152
 #, no-c-format
-msgid ""
-"explicitly declare that it <emphasis>specializes</emphasis> the second bean:"
+msgid "explicitly declare that it <emphasis>specializes</emphasis> the second bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:154
-#, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Specializes\n"
-"public class MockCreditCardPaymentProcessor \n"
-"      extends CreditCardPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:156
 #, no-c-format
-msgid ""
-"When an enabled bean specializes another bean, the other bean is never "
-"instantiated or called by the container. Even if the other bean defines a "
-"producer or observer method, the method will never be called."
+msgid "When an enabled bean specializes another bean, the other bean is never instantiated or called by the container. Even if the other bean defines a producer or observer method, the method will never be called."
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:161
 #, no-c-format
-msgid ""
-"So why does specialization work, and what does it have to do with "
-"inheritance?"
+msgid "So why does specialization work, and what does it have to do with inheritance?"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:165
 #, no-c-format
-msgid ""
-"Since we're informing the container that our alternative bean is meant to "
-"stand in as a replacement for the default implementation, the alternative "
-"implementation automatically inherits all qualifiers of the default "
-"implementation. Thus, in our example, "
-"<literal>MockCreditCardPaymentProcessor</literal> inherits the qualifiers "
-"<literal>@Default</literal> and <literal>@CreditCard</literal>."
+msgid "Since we're informing the container that our alternative bean is meant to stand in as a replacement for the default implementation, the alternative implementation automatically inherits all qualifiers of the default implementation. Thus, in our example, <literal>MockCreditCardPaymentProcessor</literal> inherits the qualifiers <literal>@Default</literal> and <literal>@CreditCard</literal>."
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:172
 #, no-c-format
-msgid ""
-"Furthermore, if the default implementation declares a bean EL name using "
-"<literal>@Named</literal>, the name is inherited by the specialized "
-"alternative bean."
+msgid "Furthermore, if the default implementation declares a bean EL name using <literal>@Named</literal>, the name is inherited by the specialized alternative bean."
 msgstr ""
+

Modified: doc/trunk/reference/pot/stereotypes.pot
===================================================================
--- doc/trunk/reference/pot/stereotypes.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/stereotypes.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,363 +1,179 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"PO-Revision-Date: 2010-03-02T13:07:18\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: stereotypes.xml:5
 #, no-c-format
 msgid "Stereotypes"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:7
 #, no-c-format
 msgid "The CDI specification defines a stereotype as follows:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:11
 #, no-c-format
-msgid ""
-"In many systems, use of architectural patterns produces a set of recurring "
-"bean roles. A stereotype allows a framework developer to identify such a "
-"role and declare some common metadata for beans with that role in a central "
-"place."
+msgid "In many systems, use of architectural patterns produces a set of recurring bean roles. A stereotype allows a framework developer to identify such a role and declare some common metadata for beans with that role in a central place."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:17
 #, no-c-format
 msgid "A stereotype encapsulates any combination of:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:21
 #, no-c-format
 msgid "a default scope, and"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:24
 #, no-c-format
 msgid "a set of interceptor bindings."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:28
 #, no-c-format
 msgid "A stereotype may also specify that:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:34
 #, no-c-format
 msgid "all beans with the stereotype have defaulted bean EL names, or that"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:37
 #, no-c-format
 msgid "all beans with the stereotype are alternatives."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:41
 #, no-c-format
-msgid ""
-"A bean may declare zero, one or multiple stereotypes. Stereotype annotations "
-"may be applied to a bean class or producer method or field."
+msgid "A bean may declare zero, one or multiple stereotypes. Stereotype annotations may be applied to a bean class or producer method or field."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:48
 #, no-c-format
-msgid ""
-"A stereotype is an annotation, annotated <literal>@Stereotype</literal>, "
-"that packages several other annotations. For instance, the following "
-"stereotype identifies action classes in some MVC framework:"
+msgid "A stereotype is an annotation, annotated <literal>@Stereotype</literal>, that packages several other annotations. For instance, the following stereotype identifies action classes in some MVC framework:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:53
-#, no-c-format
-msgid ""
-"<![CDATA[@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"...\n"
-"public @interface Action {}]]>"
-msgstr ""
-
 #. Tag: para
-#: stereotypes.xml:55
 #, no-c-format
 msgid "We use the stereotype by applying the annotation to a bean."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: stereotypes.xml:61
 #, no-c-format
-msgid ""
-"Of course, we need to apply some other annotations to our stereotype or else "
-"it wouldn't be adding much value."
+msgid "Of course, we need to apply some other annotations to our stereotype or else it wouldn't be adding much value."
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:66
 #, no-c-format
 msgid "Default scope for a stereotype"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:68
 #, no-c-format
-msgid ""
-"A stereotype may specify a default scope for beans annotated with the "
-"stereotype. For example:"
+msgid "A stereotype may specify a default scope for beans annotated with the stereotype. For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:72
-#, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-
 #. Tag: para
-#: stereotypes.xml:74
 #, no-c-format
 msgid "A particular action may still override this default if necessary:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:78
-#, no-c-format
-msgid ""
-"<![CDATA[@Dependent @Action \n"
-"public class DependentScopedLoginAction { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: stereotypes.xml:80
 #, no-c-format
-msgid ""
-"Naturally, overriding a single default isn't much use. But remember, "
-"stereotypes can define more than just the default scope."
+msgid "Naturally, overriding a single default isn't much use. But remember, stereotypes can define more than just the default scope."
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:88
 #, no-c-format
 msgid "Interceptor bindings for stereotypes"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:90
 #, no-c-format
-msgid ""
-"A stereotype may specify a set of interceptor bindings to be inherited by "
-"all beans with that stereotype."
+msgid "A stereotype may specify a set of interceptor bindings to be inherited by all beans with that stereotype."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:94
-#, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-
 #. Tag: para
-#: stereotypes.xml:96
 #, no-c-format
-msgid ""
-"This helps us get technical concerns, like transactions and security, even "
-"further away from the business code!"
+msgid "This helps us get technical concerns, like transactions and security, even further away from the business code!"
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:103
 #, no-c-format
 msgid "Name defaulting with stereotypes"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:105
 #, no-c-format
-msgid ""
-"We can specify that all beans with a certain stereotype have a defaulted EL "
-"name when a name is not explicitly defined for that bean. All we need to do "
-"is add an empty <literal>@Named</literal> annotation:"
+msgid "We can specify that all beans with a certain stereotype have a defaulted EL name when a name is not explicitly defined for that bean. All we need to do is add an empty <literal>@Named</literal> annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:110
-#, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-
 #. Tag: para
-#: stereotypes.xml:112
 #, no-c-format
-msgid ""
-"Now, the <literal>LoginAction</literal> bean will have the defaulted name "
-"<literal>loginAction</literal>."
+msgid "Now, the <literal>LoginAction</literal> bean will have the defaulted name <literal>loginAction</literal>."
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:119
 #, no-c-format
 msgid "Alternative stereotypes"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:121
 #, no-c-format
-msgid ""
-"A stereotype can indicate that all beans to which it is applied are "
-"<literal>@Alternative</literal>s. An <emphasis>alternative stereotype</"
-"emphasis> lets us classify beans by deployment scenario."
+msgid "A stereotype can indicate that all beans to which it is applied are <literal>@Alternative</literal>s. An <emphasis>alternative stereotype</emphasis> lets us classify beans by deployment scenario."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:126
-#, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Mock {}]]>"
-msgstr ""
-
 #. Tag: para
-#: stereotypes.xml:128
 #, no-c-format
-msgid ""
-"We can apply an alternative stereotype to a whole set of beans, and activate "
-"them all with one line of code in <literal>beans.xml</literal>."
+msgid "We can apply an alternative stereotype to a whole set of beans, and activate them all with one line of code in <literal>beans.xml</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:133
-#, no-c-format
-msgid ""
-"<![CDATA[@Mock\n"
-"public class MockLoginAction extends LoginAction { ... }]]>"
-msgstr ""
-
 #. Tag: title
-#: stereotypes.xml:141
 #, no-c-format
 msgid "Stereotype stacking"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:143
 #, no-c-format
-msgid ""
-"This may blow your mind a bit, but stereotypes may declare other "
-"stereotypes, which we'll call <emphasis>stereotype stacking</emphasis>. You "
-"may want to do this if you have two distinct stereotypes which are "
-"meaningful on their own, but in other situation may be meaningful when "
-"combined."
+msgid "This may blow your mind a bit, but stereotypes may declare other stereotypes, which we'll call <emphasis>stereotype stacking</emphasis>. You may want to do this if you have two distinct stereotypes which are meaningful on their own, but in other situation may be meaningful when combined."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:150
 #, no-c-format
-msgid ""
-"Here's an example that combines the <literal>@Action</literal> and "
-"<literal>@Auditable</literal> stereotypes:"
+msgid "Here's an example that combines the <literal>@Action</literal> and <literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:155
-#, no-c-format
-msgid ""
-"<![CDATA[@Auditable\n"
-"@Action\n"
-"@Stereotype\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface AuditableAction {}]]>"
-msgstr ""
-
 #. Tag: title
-#: stereotypes.xml:160
 #, no-c-format
 msgid "Built-in stereotypes"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:162
 #, no-c-format
-msgid ""
-"We've already met two standard stereotypes defined by the CDI specification: "
-"<literal>@Interceptor</literal> and <literal>@Decorator</literal>."
+msgid "We've already met two standard stereotypes defined by the CDI specification: <literal>@Interceptor</literal> and <literal>@Decorator</literal>."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:167
 #, no-c-format
-msgid ""
-"CDI defines one further standard stereotype, <literal>@Model</literal>, "
-"which is expected to be used frequently in web applications:"
+msgid "CDI defines one further standard stereotype, <literal>@Model</literal>, which is expected to be used frequently in web applications:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:172
-#, no-c-format
-msgid ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {}]]>"
-msgstr ""
-
 #. Tag: para
-#: stereotypes.xml:174
 #, no-c-format
-msgid ""
-"Instead of using JSF managed beans, just annotate a bean <literal>@Model</"
-"literal>, and use it directly in your JSF view!"
+msgid "Instead of using JSF managed beans, just annotate a bean <literal>@Model</literal>, and use it directly in your JSF view!"
 msgstr ""
+

Modified: doc/trunk/reference/pot/viewlayers.pot
===================================================================
--- doc/trunk/reference/pot/viewlayers.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/viewlayers.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,191 +1,104 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"PO-Revision-Date: 2010-03-02T13:07:18\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: viewlayers.xml:5
 #, no-c-format
 msgid "Alternative view layers"
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:8
 #, no-c-format
 msgid "Wicket CDI integration"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:10
 #, no-c-format
-msgid ""
-"Weld provides integration between the Apache Wicket web framework and CDI. "
-"This functionality is provided by the <literal>weld-wicket</literal> "
-"extension module, which naturally must be on the classpath of the Wicket "
-"application."
+msgid "Weld provides integration between the Apache Wicket web framework and CDI. This functionality is provided by the <literal>weld-wicket</literal> extension module, which naturally must be on the classpath of the Wicket application."
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:16
 #, no-c-format
-msgid ""
-"This section describes some of the utilities provided by the Wicket "
-"extension module to support the CDI integration."
+msgid "This section describes some of the utilities provided by the Wicket extension module to support the CDI integration."
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:22
 #, no-c-format
 msgid "The <literal>WebApplication</literal> class"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:24
 #, no-c-format
-msgid ""
-"Each wicket application must have a <literal>WebApplication</literal> "
-"subclass; Weld provides, for your utility, a subclass of this which sets up "
-"the Wicket CDI integration. You should subclass <literal>org.jboss.weld."
-"wicket.WeldApplication</literal>."
+msgid "Each wicket application must have a <literal>WebApplication</literal> subclass; Weld provides, for your utility, a subclass of this which sets up the Wicket CDI integration. You should subclass <literal>org.jboss.weld.wicket.WeldApplication</literal>."
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:31
 #, no-c-format
-msgid ""
-"If you would prefer not to subclass <literal>WeldApplication</literal>, you "
-"can manually add a (small!) number of overrides and listeners to your own "
-"<literal>WebApplication</literal> subclass. The JavaDocs of "
-"<literal>WeldApplication</literal>detail this."
+msgid "If you would prefer not to subclass <literal>WeldApplication</literal>, you can manually add a (small!) number of overrides and listeners to your own <literal>WebApplication</literal> subclass. The JavaDocs of <literal>WeldApplication</literal>detail this."
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:38
 #, no-c-format
 msgid "For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: viewlayers.xml:41
-#, no-c-format
-msgid ""
-"<![CDATA[public class SampleApplication extends WeldApplication {\n"
-"   @Override\n"
-"   public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: viewlayers.xml:45
 #, no-c-format
 msgid "Conversations with Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:46
 #, no-c-format
-msgid ""
-"Wicket can also take advantage of the conversation scope from CDI, provided "
-"by the Wicket extension module. This module takes care of:"
+msgid "Wicket can also take advantage of the conversation scope from CDI, provided by the Wicket extension module. This module takes care of:"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:52
 #, no-c-format
-msgid ""
-"Setting up the conversation context at the beginning of a Wicket request, "
-"and tearing it down afterwards"
+msgid "Setting up the conversation context at the beginning of a Wicket request, and tearing it down afterwards"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:58
 #, no-c-format
-msgid ""
-"Storing the id of any long-running conversation in Wicket's metadata when "
-"the page response is complete"
+msgid "Storing the id of any long-running conversation in Wicket's metadata when the page response is complete"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:64
 #, no-c-format
-msgid ""
-"Activating the correct long-running conversation based upon which page is "
-"being accessed"
+msgid "Activating the correct long-running conversation based upon which page is being accessed"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:69
 #, no-c-format
-msgid ""
-"Propagating the conversation context for any long-running conversation to "
-"new pages"
+msgid "Propagating the conversation context for any long-running conversation to new pages"
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:76
 #, no-c-format
 msgid "Starting and stopping conversations in Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:77
 #, no-c-format
-msgid ""
-"As in JSF applications, a conversation <emphasis>always</emphasis> exists "
-"for any request to Wicket, but its lifetime is only that of the current "
-"request unless it is marked as <emphasis>long-running</emphasis>. The "
-"boundaries of a long-running conversation are controlled in the same way as "
-"in JSF applications, by injecting the <literal>Conversation</literal> "
-"instance and invoking either the <literal>begin()</literal> or <literal>end()"
-"</literal> methods:"
+msgid "As in JSF applications, a conversation <emphasis>always</emphasis> exists for any request to Wicket, but its lifetime is only that of the current request unless it is marked as <emphasis>long-running</emphasis>. The boundaries of a long-running conversation are controlled in the same way as in JSF applications, by injecting the <literal>Conversation</literal> instance and invoking either the <literal>begin()</literal> or <literal>end()</literal> methods:"
 msgstr ""
 
-#. Tag: programlisting
-#: viewlayers.xml:86
-#, no-c-format
-msgid ""
-"<![CDATA[private @Inject Conversation conversation;\n"
-"...\n"
-"// begin a conversation\n"
-"conversation.begin();\n"
-"...\n"
-"// end a conversation\n"
-"conversation.end();]]>"
-msgstr ""
-
 #. Tag: title
-#: viewlayers.xml:91
 #, no-c-format
 msgid "Long running conversation propagation in Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:92
 #, no-c-format
-msgid ""
-"When a conversation is marked as long-running, the id of that conversation "
-"will be stored in Wicket's metadata for the current page. If a new page is "
-"created and set as the response target through <literal>setResponsePage()</"
-"literal>, this new page will also participate in this conversation. This "
-"occurs for both directly instantiated pages (<literal>setResponsePage(new "
-"OtherPage())</literal>), as well as for bookmarkable pages created with "
-"<literal>setResponsePage(OtherPage.class)</literal> where <literal>OtherPage."
-"class</literal> is mounted as bookmarkable from your "
-"<literal>WebApplication</literal> subclass (or through annotations). In the "
-"latter case, because the new page instance is not created until after a "
-"redirect, the conversation id will be propagated through a request "
-"parameter, and then stored in page metadata after the redirect."
+msgid "When a conversation is marked as long-running, the id of that conversation will be stored in Wicket's metadata for the current page. If a new page is created and set as the response target through <literal>setResponsePage()</literal>, this new page will also participate in this conversation. This occurs for both directly instantiated pages (<literal>setResponsePage(new OtherPage())</literal>), as well as for bookmarkable pages created with <literal>setResponsePage(OtherPage.class)</literal> where <literal>OtherPage.class</literal> is mounted as bookmarkable from your <literal>WebApplication</literal> subclass (or through annotations). In the latter case, because the new page instance is not created until after a redirect, the conversation id will be propagated through a request parameter, and then stored in page metadata after the redirect."
 msgstr ""
+

Modified: doc/trunk/reference/pot/weldexamples.pot
===================================================================
--- doc/trunk/reference/pot/weldexamples.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/weldexamples.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,1552 +1,589 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"PO-Revision-Date: 2010-03-02T13:07:18\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: weldexamples.xml:5
 #, no-c-format
 msgid "Diving into the Weld examples"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:7
 #, no-c-format
-msgid ""
-"It's time to pull the covers back and dive into the internals of Weld "
-"example applications. Let's start with the simpler of the two examples, "
-"<literal>weld-numberguess</literal>."
+msgid "It's time to pull the covers back and dive into the internals of Weld example applications. Let's start with the simpler of the two examples, <literal>weld-numberguess</literal>."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:13
 #, no-c-format
 msgid "The numberguess example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:15
 #, no-c-format
-msgid ""
-"In the numberguess application you get 10 attempts to guess a number between "
-"1 and 100. After each attempt, you're told whether your guess was too high "
-"or too low."
+msgid "In the numberguess application you get 10 attempts to guess a number between 1 and 100. After each attempt, you're told whether your guess was too high or too low."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:20
 #, no-c-format
-msgid ""
-"The numberguess example is comprised of a number of beans, configuration "
-"files and Facelets (JSF) views, packaged as a WAR module. Let's start by "
-"examining the configuration files."
+msgid "The numberguess example is comprised of a number of beans, configuration files and Facelets (JSF) views, packaged as a war module. Let's start by examining the configuration files."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:25
 #, no-c-format
-msgid ""
-"All the configuration files for this example are located in <literal>WEB-INF/"
-"</literal>, which can be found in the <literal>src/main/webapp</literal> "
-"directory of the example. First, we have the JSF 2.0 version of "
-"<literal>faces-config.xml</literal>. A standardized version of Facelets is "
-"the default view handler in JSF 2.0, so there's really nothing that we have "
-"to configure. Thus, the configuration consists of only the root element."
+msgid "All the configuration files for this example are located in <literal>WEB-INF/</literal>, which can be found in the <literal>src/main/webapp</literal> directory of the example. First, we have the JSF 2.0 version of <literal>faces-config.xml</literal>. A standardized version of Facelets is the default view handler in JSF 2.0, so there's really nothing that we have to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:33
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[<faces-config version=\"2.0\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd\">\n"
-"</faces-config>]]>"
+msgid "There's also an empty <literal>beans.xml</literal> file, which tells the container to look for beans in this application and to activate the CDI services."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:35
 #, no-c-format
-msgid ""
-"There's also an empty <literal>beans.xml</literal> file, which tells the "
-"container to look for beans in this application and to activate the CDI "
-"services."
+msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:40
 #, no-c-format
-msgid "Finally, there's the familiar <literal>web.xml</literal>:"
+msgid "Enable and initialize the JSF servlet"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:42
+#. Tag: para
 #, no-c-format
-msgid ""
-"<programlistingco> <areaspec> <area id=\"faces.servlet\" coords=\"10\"/> "
-"<area id=\"faces.servlet.mapping\" coords=\"16\"/> <area id=\"faces.default."
-"suffix\" coords=\"21\"/> <area id=\"session.timeout\" coords=\"26\"/> </"
-"areaspec> <programlisting role=\"XML\"><![CDATA[<web-app version=\"2.5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n"
-"   \n"
-"   <display-name>weld-jsf-numberguess-war</display-name>\n"
-"   <description>Weld JSF numberguess example (WAR)</description>\n"
-"\n"
-"   <servlet>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>\n"
-"      <load-on-startup>1</load-on-startup>\n"
-"   </servlet>\n"
-"\n"
-"   <servlet-mapping>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <url-pattern>*.jsf</url-pattern>\n"
-"   </servlet-mapping>\n"
-"   \n"
-"   <context-param>\n"
-"      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>\n"
-"      <param-value>.xhtml</param-value>\n"
-"   </context-param>\n"
-"\n"
-"   <session-config>\n"
-"      <session-timeout>10</session-timeout>\n"
-"   </session-config>\n"
-"\n"
-"</web-app>]]></programlisting> <calloutlist> <callout arearefs=\"faces."
-"servlet\"> <para> Enable and initialize the JSF servlet </para> </callout> "
-"<callout arearefs=\"faces.servlet.mapping\"> <para> Configure requests for "
-"URLs ending in <literal>.jsf</literal> to be handled by JSF </para> </"
-"callout> <callout arearefs=\"faces.default.suffix\"> <para> Tell JSF that we "
-"will be giving our JSF views (Facelets templates) an extension of <literal>."
-"xhtml</literal> </para> </callout> <callout arearefs=\"session.timeout\"> "
-"<para> Configure a session timeout of 10 minutes </para> </callout> </"
-"calloutlist> </programlistingco> <note> <para> This demo uses JSF 2 as the "
-"view framework, but you can use Weld with any servlet-based web framework, "
-"such as JSF 1.2 or Wicket. </para> </note> <para> Let's take a look at the "
-"main JSF view, <literal>src/main/webapp/home.xhtml</literal>. </para> "
-"<programlistingco> <areaspec> <area id=\"template\" coords=\"8\"/> <area id="
-"\"statusMessages\" coords=\"12\"/> <area id=\"instructions\" coords=\"20\"/> "
-"<area id=\"guess\" coords=\"27\"/> <area id=\"validator\" coords=\"29\"/> "
-"<area id=\"submit\" coords=\"30\"/> </areaspec> <programlisting role=\"XML"
-"\"><![CDATA[<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN"
-"\"\n"
-"   \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
-"<html xmlns=\"http://www.w3.org/1999/xhtml\"\n"
-"   xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n"
-"   xmlns:h=\"http://java.sun.com/jsf/html\"\n"
-"   xmlns:f=\"http://java.sun.com/jsf/core\">\n"
-"\n"
-"   <ui:composition template=\"/template.xhtml\">\n"
-"      <ui:define name=\"content\">\n"
-"         <h1>Guess a number...</h1>\n"
-"         <h:form id=\"numberGuess\">\n"
-"            <div style=\"color: red\">\n"
-"               <h:messages id=\"messages\" globalOnly=\"false\"/>\n"
-"               <h:outputText id=\"Higher\" value=\"Higher!\"\n"
-"                  rendered=\"#{game.number gt game.guess and game.guess ne 0}"
-"\"/>\n"
-"               <h:outputText id=\"Lower\" value=\"Lower!\"\n"
-"                  rendered=\"#{game.number lt game.guess and game.guess ne 0}"
-"\"/>\n"
-"            </div>\n"
-"    \n"
-"            <div>\n"
-"               I'm thinking of a number between #{game.smallest} and #{game."
-"biggest}.\n"
-"               You have #{game.remainingGuesses} guesses remaining.\n"
-"            </div>\n"
-"       \n"
-"            <div>\n"
-"               Your guess: \n"
-"               <h:inputText id=\"inputGuess\" value=\"#{game.guess}\"\n"
-"                  size=\"3\" required=\"true\" disabled=\"#{game.number eq "
-"game.guess}\"\n"
-"                  validator=\"#{game.validateNumberRange}\"/>\n"
-"               <h:commandButton id=\"guessButton\" value=\"Guess\" \n"
-"                  action=\"#{game.check}\" disabled=\"#{game.number eq game."
-"guess}\"/>\n"
-"            </div>\n"
-"            <div>\n"
-"              <h:commandButton id=\"restartButton\" value=\"Reset\" action="
-"\"#{game.reset}\" immediate=\"true\"/>\n"
-"            </div>\n"
-"         </h:form>\n"
-"      </ui:define>\n"
-"   </ui:composition>\n"
-"</html>]]></programlisting> <calloutlist> <callout arearefs=\"template\"> "
-"<para> Facelets is the built-in templating language for JSF. Here we are "
-"wrapping our page in a template which defines the layout. </para> </callout> "
-"<callout arearefs=\"statusMessages\"> <para> There are a number of messages "
-"which can be sent to the user, \"Higher!\", \"Lower!\" and \"Correct!\" </"
-"para> </callout> <callout arearefs=\"instructions\"> <para> As the user "
-"guesses, the range of numbers they can guess gets smaller - this sentence "
-"changes to make sure they know the number range of a valid guess. </para> </"
-"callout> <callout arearefs=\"guess\"> <para> This input field is bound to a "
-"bean property using a value expression. </para> </callout> <callout arearefs="
-"\"validator\"> <para> A validator binding is used to make sure the user "
-"doesn't accidentally input a number outside of the range in which they can "
-"guess - if the validator wasn't here, the user might use up a guess on an "
-"out of bounds number. </para> </callout> <callout arearefs=\"submit\"> "
-"<para> And, of course, there must be a way for the user to send their guess "
-"to the server. Here we bind to an action method on the bean. </para> </"
-"callout> </calloutlist> </programlistingco>"
+msgid "Configure requests for URLs ending in <literal>.jsf</literal> to be handled by JSF"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:142
 #, no-c-format
-msgid ""
-"The example exists of 4 classes, the first two of which are qualifiers. "
-"First, there is the <literal>@Random</literal> qualifier, used for injecting "
-"a random number:"
+msgid "Tell JSF that we will be giving our JSF views (Facelets templates) an extension of <literal>.xhtml</literal>"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:147
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Random {}]]>"
+msgid "Configure a session timeout of 10 minutes"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:149
 #, no-c-format
-msgid ""
-"There is also the <literal>@MaxNumber</literal> qualifier, used for "
-"injecting the maximum number that can be injected:"
+msgid "This demo uses JSF 2 as the view framework, but you can use Weld with any servlet-based web framework, such as JSF 1.2 or Wicket."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:154
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface MaxNumber {}\n"
-"]]>"
+msgid "Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:156
 #, no-c-format
-msgid ""
-"The application-scoped <literal>Generator</literal> class is responsible for "
-"creating the random number, via a producer method. It also exposes the "
-"maximum possible number via a producer method:"
+msgid "Facelets is the built-in templating language for JSF. Here we are wrapping our page in a template which defines the layout."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:161
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class Generator implements Serializable {\n"
-"\n"
-"   private java.util.Random random = new java.util.Random(System."
-"currentTimeMillis());\n"
-"   \n"
-"   private int maxNumber = 100;\n"
-"   \n"
-"   java.util.Random getRandom() {\n"
-"      return random;\n"
-"   }\n"
-"   \n"
-"   @Produces @Random int next() { \n"
-"      return getRandom().nextInt(maxNumber); \n"
-"   }\n"
-"   \n"
-"   @Produces @MaxNumber int getMaxNumber() {\n"
-"      return maxNumber;\n"
-"   }\n"
-"\n"
-"}]]>"
+msgid "There are a number of messages which can be sent to the user, \"Higher!\", \"Lower!\" and \"Correct!\""
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:163
 #, no-c-format
-msgid ""
-"The <literal>Generator</literal> is application scoped, so we don't get a "
-"different random each time."
+msgid "As the user guesses, the range of numbers they can guess gets smaller - this sentence changes to make sure they know the number range of a valid guess."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:168
 #, no-c-format
-msgid ""
-"The package declaration and imports have been excluded from these listings. "
-"The complete listing is available in the example source code."
+msgid "This input field is bound to a bean property using a value expression."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:174
 #, no-c-format
-msgid ""
-"The final bean in the application is the session-scoped <literal>Game</"
-"literal> class. This is the primary entry point of the application. It's "
-"responsible for setting up or resetting the game, capturing and validating "
-"the user's guess and providing feedback to the user with a "
-"<literal>FacesMessage</literal>. We've used the post-construct lifecycle "
-"method to initialize the game by retrieving a random number from the "
-"<literal>@Random Instance&lt;Integer&gt;</literal> bean."
+msgid "A validator binding is used to make sure the user doesn't accidentally input a number outside of the range in which they can guess - if the validator wasn't here, the user might use up a guess on an out of bounds number."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:182
 #, no-c-format
-msgid ""
-"You'll notice that we've also added the <literal>@Named</literal> annotation "
-"to this class. This annotation is only required when you want to make the "
-"bean accessible to a JSF view via EL (i.e., #{game})."
+msgid "And, of course, there must be a way for the user to send their guess to the server. Here we bind to an action method on the bean."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:187
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[@Named\n"
-"@SessionScoped\n"
-"public class Game implements Serializable {\n"
-"\n"
-"   private int number;\n"
-"   private int guess;\n"
-"   private int smallest;\n"
-"   private int biggest;\n"
-"   private int remainingGuesses;\n"
-"\n"
-"   @Inject @MaxNumber private int maxNumber;\n"
-"   @Inject @Random Instance<Integer> randomNumber;\n"
-"   \n"
-"   public Game() {}\n"
-"   \n"
-"   public void check() {\n"
-"      if (guess > number) {\n"
-"         biggest = guess - 1;\n"
-"      }\n"
-"      else if (guess < number) {\n"
-"         smallest = guess + 1;\n"
-"      }\n"
-"      else if (guess == number) {\n"
-"         FacesContext.getCurrentInstance().addMessage(null, new FacesMessage"
-"(\"Correct!\"));\n"
-"      }\n"
-"      remainingGuesses--;\n"
-"   }\n"
-"   \n"
-"   @PostConstruct\n"
-"   public void reset() {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = randomNumber.get();\n"
-"   }\n"
-"   \n"
-"   public void validateNumberRange(FacesContext context,  UIComponent "
-"toValidate, Object value) {\n"
-"      if (remainingGuesses <= 0) {\n"
-"         FacesMessage message = new FacesMessage(\"No guesses left!\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"         return;\n"
-"      }\n"
-"      int input = (Integer) value;\n"
-"\n"
-"      if (input < smallest || input > biggest) {\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"\n"
-"         FacesMessage message = new FacesMessage(\"Invalid guess\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"      }\n"
-"   }\n"
-"\n"
-"   public int getNumber() {\n"
-"      return number;\n"
-"   }\n"
-"   \n"
-"   public int getGuess() {\n"
-"      return guess;\n"
-"   }\n"
-"   \n"
-"   public void setGuess(int guess) {\n"
-"      this.guess = guess;\n"
-"   }\n"
-"   \n"
-"   public int getSmallest() {\n"
-"      return smallest;\n"
-"   }\n"
-"   \n"
-"   public int getBiggest() {\n"
-"      return biggest;\n"
-"   }\n"
-"   \n"
-"   public int getRemainingGuesses() {\n"
-"      return remainingGuesses;\n"
-"   }\n"
-"\n"
-"}]]>"
+msgid "The example exists of 4 classes, the first two of which are qualifiers. First, there is the <literal>@Random</literal> qualifier, used for injecting a random number:"
 msgstr ""
 
-#. Tag: title
-#: weldexamples.xml:190
+#. Tag: para
 #, no-c-format
-msgid "The numberguess example in Apache Tomcat or Jetty"
+msgid "There is also the <literal>@MaxNumber</literal> qualifier, used for injecting the maximum number that can be injected:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:192
 #, no-c-format
-msgid ""
-"A couple of modifications must be made to the numberguess artifact in order "
-"to deploy it to Tomcat or Jetty. First, Weld must be deployed as a Web "
-"Application library under <literal>WEB-INF/lib</literal> since the servlet "
-"container does not provide the CDI services. For your convenience we provide "
-"a single JAR suitable for running Weld in any servlet container (including "
-"Jetty), <literal>weld-servlet.jar</literal>."
+msgid "The application-scoped <literal>Generator</literal> class is responsible for creating the random number, via a producer method. It also exposes the maximum possible number via a producer method:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:200
 #, no-c-format
-msgid ""
-"You must also include the JARs for JSF, EL, and the common annotations "
-"(<literal>jsr250-api.jar</literal>), all of which are provided by the Java "
-"EE platform (a Java EE application server). Are you starting to appreciate "
-"why a Java EE platform is worth using?"
+msgid "The <literal>Generator</literal> is application scoped, so we don't get a different random each time."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:207
 #, no-c-format
-msgid ""
-"Second, we need to explicitly specify the servlet listener in <literal>web."
-"xml</literal>, again because the container isn't doing this stuff for you. "
-"The servlet listener boots Weld and controls it's interaction with requests."
+msgid "The package declaration and imports have been excluded from these listings. The complete listing is available in the example source code."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:213
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
+msgid "The final bean in the application is the session-scoped <literal>Game</literal> class. This is the primary entry point of the application. It's responsible for setting up or resetting the game, capturing and validating the user's guess and providing feedback to the user with a <literal>FacesMessage</literal>. We've used the post-construct lifecycle method to initialize the game by retrieving a random number from the <literal>@Random Instance&lt;Integer&gt;</literal> bean."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:215
 #, no-c-format
-msgid ""
-"When Weld boots, it places the <literal>javax.enterprise.inject.spi."
-"BeanManager</literal>, the portable SPI for obtaining bean instances, in the "
-"ServletContext under a variable name equal to the fully-qualified interface "
-"name. You generally don't need to access this interface, but Weld makes use "
-"of it."
+msgid "You'll notice that we've also added the <literal>@Named</literal> annotation to this class. This annotation is only required when you want to make the bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:226
 #, no-c-format
-msgid "The numberguess example for Apache Wicket"
+msgid "The numberguess example in Apache Tomcat or Jetty"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:227
 #, no-c-format
-msgid ""
-"Weld includes a number of portable extensions for JSR-299, including an "
-"extension for Wicket, which allows you to inject beans into Wicket "
-"components and leverage the conversation context. In this section, we'll "
-"walk you through the Wicket version of the numberguess example."
+msgid "A couple of modifications must be made to the numberguess artifact in order to deploy it to Tomcat or Jetty. First, Weld must be deployed as a Web Application library under <literal>WEB-INF/lib</literal> since the servlet container does not provide the CDI services. For your convenience we provide a single jar suitable for running Weld in any servlet container (including Jetty), <literal>weld-servlet.jar</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:234
 #, no-c-format
-msgid ""
-"You may want to review the Wicket documentation at <ulink url=\"http://"
-"wicket.apache.org/\">http://wicket.apache.org/</ulink> before reading this "
-"section, if you aren't already familiar with the framework."
+msgid "You must also include the jars for JSF, EL, and the common annotations (<literal>jsr250-api.jar</literal>), all of which are provided by the Java EE platform (a Java EE application server). Are you starting to appreciate why a Java EE platform is worth using?"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:241
 #, no-c-format
-msgid ""
-"Wicket is another environment that relies on the Weld servlet extension. The "
-"use of <ulink url=\"http://jetty.mortbay.org\">Jetty</ulink> is common in "
-"the Wicket community, and is thus chosen here as the runtime container. "
-"You've seen already that Jetty is perfectly capable of running CDI "
-"applications with Weld add-ons, and this environment is no different."
+msgid "Second, we need to explicitly specify the servlet listener in <literal>web.xml</literal>, again because the container isn't doing this stuff for you. The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:249
 #, no-c-format
-msgid ""
-"We'll also be using the Eclipse IDE in these examples. Instructions are "
-"provided later for running the example from the command line, but since "
-"you'll likely need to do more than just deploy examples, we'll get setup in "
-"this full development environment."
+msgid "When Weld boots, it places the <literal>javax.enterprise.inject.spi.BeanManager</literal>, the portable SPI for obtaining bean instances, in the ServletContext under a variable name equal to the fully-qualified interface name. You generally don't need to access this interface, but Weld makes use of it."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:257
 #, no-c-format
-msgid "Creating the Eclipse project"
+msgid "The numberguess example for Apache Wicket"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:259
 #, no-c-format
-msgid ""
-"To use the Wicket example in Eclipse, you have one of two choices. You can "
-"either use a Maven plugin to generate a regular Eclipse Web project, or you "
-"can open the example natively using the <ulink url=\"http://m2eclipse."
-"sonatype.org/\">m2eclipse plugin</ulink>. Since the Weld source code relies "
-"so heavily on Maven, we encourage you to bite the bullet and adopt the "
-"m2eclipse plugin. Both approaches are described here for your convenience.."
+msgid "Weld includes a number of portable extensions for JSR-299, including an extension for Wicket, which allows you to inject beans into Wicket components and leverage the conversation context. In this section, we'll walk you through the Wicket version of the numberguess example."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:267
 #, no-c-format
-msgid ""
-"If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -> Import... -> Maven Projects</"
-"emphasis>. Then, browse to the location of the Wicket numberguess example. "
-"You should see that Eclipse recognizes the existence of a Maven project."
+msgid "You may want to review the Wicket documentation at <ulink url=\"http://wicket.apache.org/\">http://wicket.apache.org/</ulink> before reading this section, if you aren't already familiar with the framework."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:279
 #, no-c-format
-msgid ""
-"This will create a project in your workspace called <literal>weld-wicket-"
-"numberguess</literal>."
+msgid "Wicket is another environment that relies on the Weld servlet extension. The use of <ulink url=\"http://jetty.mortbay.org\">Jetty</ulink> is common in the Wicket community, and is thus chosen here as the runtime container. You've seen already that Jetty is perfectly capable of running CDI applications with Weld add-ons, and this environment is no different."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:283
 #, no-c-format
-msgid ""
-"You'll notice after importing, the project has a build error. That's because "
-"we need to enable a Maven profile. Right-click on the project and select "
-"<emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> "
-"tab in the window that appears. In the form field labeled \"Active Maven "
-"Profiles (comma separated):\", type <literal>jetty</literal>. That will "
-"enable some extra dependencies that allow the project to compile. You're now "
-"ready to develop!"
+msgid "We'll also be using the Eclipse IDE in these examples. Instructions are provided later for running the example from the command line, but since you'll likely need to do more than just deploy examples, we'll get setup in this full development environment."
 msgstr ""
 
+#. Tag: title
+#, no-c-format
+msgid "Creating the Eclipse project"
+msgstr ""
+
 #. Tag: para
-#: weldexamples.xml:292
 #, no-c-format
-msgid ""
-"You are also advised to uncheck the box \"Skip Maven compiler when "
-"processing resources\" in the Maven properties screen because of conflicts "
-"with the Maven enforcer plugin."
+msgid "To use the Wicket example in Eclipse, you have one of two choices. You can either use a Maven plugin to generate a regular Eclipse Web project, or you can open the example natively using the <ulink url=\"http://m2eclipse.sonatype.org/\">m2eclipse plugin</ulink>. Since the Weld source code relies so heavily on Maven, we encourage you to bite the bullet and adopt the m2eclipse plugin. Both approaches are described here for your convenience.."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:298
 #, no-c-format
-msgid ""
-"If you are not using the m2eclipse plugin, you have to follow different "
-"steps to import the project. First, switch into the Wicket numberguess "
-"example, then execute the Maven Eclipse plugin with the jetty profile "
-"activated, as follows:"
+msgid "If you have m2eclipse installed, you can open any Maven project directly. From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven Projects</emphasis>. Then, browse to the location of the Wicket numberguess example. You should see that Eclipse recognizes the existence of a Maven project."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:304
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/wicket/numberguess\n"
-"mvn -Pjetty eclipse:eclipse]]>"
+msgid "This will create a project in your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:306
 #, no-c-format
-msgid ""
-"Then, from Eclipse, choose <emphasis>File -> Import... -> General -> "
-"Existing Projects into Workspace</emphasis>, select the root directory of "
-"the numberguess example, and click Finish. This will create a project in "
-"your workspace called <literal>weld-wicket-numberguess</literal>."
+msgid "You'll notice after importing, the project has a build error. That's because we need to enable a Maven profile. Right-click on the project and select <emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> tab in the window that appears. In the form field labeled \"Active Maven Profiles (comma separated):\", type <literal>jetty</literal>. That will enable some extra dependencies that allow the project to compile. Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven compile plugin when processing resources (recommended)\". That solves an incompatiblity between the m2eclipse plugin and the Maven enforcer plugin that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:318
 #, no-c-format
+msgid "Be sure to uncheck the box \"Skip Maven compile plugin when processing resources (recommended)\" in the Maven properties screen or else the example might not run in Eclipse because beans.xml will be missing from the classpath! See the <ulink url=\"https://issues.sonatype.org/browse/MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If you are not using the m2eclipse plugin, you have to follow different steps to import the project. First, switch into the Wicket numberguess example, then execute the Maven Eclipse plugin with the jetty profile activated, as follows:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -&gt; Existing Projects into Workspace</emphasis>, select the root directory of the numberguess example, and click Finish. This will create a project in your workspace called <literal>weld-wicket-numberguess</literal>."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:325
 #, no-c-format
 msgid "Running the example from Eclipse"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:327
 #, no-c-format
-msgid ""
-"This project follows the <literal>wicket-quickstart</literal> approach of "
-"creating an instance of Jetty in the <literal>Start</literal> class. So "
-"running the example is as simple as right-clicking on that Start class in "
-"<literal>src/test/java</literal> in the <emphasis>Package Explorer</"
-"emphasis> and choosing <emphasis>Run as Java Application</emphasis>. You "
-"should see console output related to Jetty starting up; then visit able "
-"<ulink url=\"http://localhost:9090\">http://localhost:9090</ulink> to view "
-"the app. To debug choose <emphasis>Debug as Java Application</emphasis> "
-"instead."
+msgid "This project follows the <literal>wicket-quickstart</literal> approach of creating an instance of Jetty in the <literal>Start</literal> class. So running the example is as simple as right-clicking on that Start class in <literal>src/test/java</literal> in the <emphasis>Package Explorer</emphasis> and choosing <emphasis>Run as Java Application</emphasis>. You should see console output related to Jetty starting up; then visit able <ulink url=\"http://localhost:9090\">http://localhost:9090</ulink> to view the app. To debug choose <emphasis>Debug as Java Application</emphasis> instead."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:338
 #, no-c-format
 msgid "Running the example from the command line in JBoss AS or Tomcat"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:340
 #, no-c-format
-msgid ""
-"This example can also be deployed from the command line in a (similar to the "
-"other examples). Assuming you have set up the <literal>local.build."
-"properties</literal> file in the <literal>examples</literal> directory to "
-"specify the location of JBoss AS or Tomcat, as previously described, you can "
-"run:"
+msgid "This example can also be deployed from the command line in a (similar to the other examples). Assuming you have set up the <literal>local.build.properties</literal> file in the <literal>examples</literal> directory to specify the location of JBoss AS or Tomcat, as previously described, you can run:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:346
+#. Tag: para
 #, no-c-format
-msgid "<![CDATA[$> ant deploy]]>"
+msgid "to deploy the example to JBoss AS, and:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:348
 #, no-c-format
-msgid "to deploy the example to JBoss AS, and:"
+msgid "to deploy the example to Tomcat. You can then access application at <ulink url=\"http://localhost:8080/weld-numberguess-wicket\">http://localhost:8080/weld-numberguess-wicket</ulink>."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:350
+#. Tag: para
 #, no-c-format
-msgid "<![CDATA[$> ant tomcat.deploy]]>"
+msgid "Alternatively, you can run the application in place on an embedded Jetty container using the following Maven command:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:352
 #, no-c-format
-msgid ""
-"to deploy the example to Tomcat. You can then access application at <ulink "
-"url=\"http://localhost:8080/weld-numberguess-wicket\">http://localhost:8080/"
-"weld-numberguess-wicket</ulink>."
+msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
+#. Tag: title
+#, no-c-format
+msgid "Understanding the code"
+msgstr ""
+
 #. Tag: para
-#: weldexamples.xml:357
 #, no-c-format
-msgid ""
-"Alternatively, you can run the application in place on an embedded Jetty "
-"container using the following Maven command:"
+msgid "The code in the wicket numberguess example is very similar to the JSF-based numberguess example. The business layer is identical! Where things differ is in view binding. JSF uses Unified EL expressions to bind XML-based view layer components in JSF views to beans. In contrast, Wicket defines its components in Java. These Java-based view components have a one-to-one mapping with HTML elements in an adjacent (pure) HTML file. All view logic, including binding of components to models and controlling the response of view actions, is handled in Java."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:362
+#. Tag: para
 #, no-c-format
-msgid "<![CDATA[$> mvn jetty:run -Pjetty]]>"
+msgid "The integration of Weld with Wicket takes advantage of the same qualifier annotations used in your business layer to provide injection into your <literal>WebPage</literal> subclass (or into other custom Wicket component subclasses)."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:364
 #, no-c-format
-msgid "Enough toying with deployment, let's dive into the code."
+msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
-#. Tag: title
-#: weldexamples.xml:371
+#. Tag: para
 #, no-c-format
-msgid "Understanding the code"
+msgid "Each wicket application must have a <literal>WeldApplication</literal> subclass. In our case, our application class is <literal>NumberGuessApplication</literal>:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:373
 #, no-c-format
-msgid ""
-"The code in the wicket numberguess example is very similar to the JSF-based "
-"numberguess example. The business layer is identical! Where things differ is "
-"in view binding. JSF uses Unified EL expressions to bind XML-based view "
-"layer components in JSF views to beans. In contrast, Wicket defines its "
-"components in Java. These Java-based view components have a one-to-one "
-"mapping with HTML elements in an adjacent (pure) HTML file. All view logic, "
-"including binding of components to models and controlling the response of "
-"view actions, is handled in Java."
+msgid "This class specifies which page Wicket should treat as our home page, in our case, <literal>HomePage.class</literal>"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:382
 #, no-c-format
-msgid ""
-"The integration of Weld with Wicket takes advantage of the same qualifier "
-"annotations used in your business layer to provide injection into your "
-"<literal>WebPage</literal> subclass (or into other custom Wicket component "
-"subclasses)."
+msgid "In <literal>HomePage</literal>, we see typical Wicket code to set up page elements. The bit that is interesting is the injection of the <literal>Game</literal> bean:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:388
 #, no-c-format
-msgid "Here's where things differ from the JSF numberguess example:"
+msgid "The <literal>Game</literal> bean is can then be used, for example, by the code for submitting a guess:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:394
 #, no-c-format
-msgid ""
-"Each wicket application must have a <literal>WeldApplication</literal> "
-"subclass. In our case, our application class is "
-"<literal>NumberGuessApplication</literal>:"
+msgid "All injections may be serialized; actual storage of the bean is managed by JSR-299. Note that Wicket components, like the <literal>HomePage</literal> and it subcomponents, are <emphasis>not</emphasis> JSR-299 beans."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:398
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[public class NumberGuessApplication extends WeldApplication {\n"
-"   @Override public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
+msgid "Wicket components allow injection, but they <emphasis>cannot</emphasis> use interceptors, decorators or lifecycle callbacks such as <literal>@PostConstruct</literal> or methods. The components would need to delegate to actual beans to leverage these features."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:399
 #, no-c-format
-msgid ""
-"This class specifies which page Wicket should treat as our home page, in our "
-"case, <literal>HomePage.class</literal>"
+msgid "The example uses AJAX for processing of button events, and dynamically hides buttons that are no longer relevant, for example when the user has won the game."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:405
 #, no-c-format
-msgid ""
-"In <literal>HomePage</literal>, we see typical Wicket code to set up page "
-"elements. The bit that is interesting is the injection of the <literal>Game</"
-"literal> bean:"
+msgid "In order to activate Wicket for this webapp, the Wicket filter is added to <literal>web.xml</literal>, and our application class is specified in <literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:410
+#. Tag: para
 #, no-c-format
-msgid "<![CDATA[@Inject Game game;]]>"
+msgid "The servlet listener is still required, as in the Tomcat example, to bootstrap CDI when Jetty starts and to hook CDI into the Jetty servlet request and session lifecycles. However, rather than putting it into the web.xml, it is placed into an override file, <literal>src/main/webapp/WEB-INF/jetty-additions-to-web.xml</literal>, that is passed to Jetty as an extra descriptor to be appended to the <literal>web.xml</literal> configuration."
 msgstr ""
 
+#. Tag: title
+#, no-c-format
+msgid "The numberguess example for Java SE with Swing"
+msgstr ""
+
 #. Tag: para
-#: weldexamples.xml:412
 #, no-c-format
-msgid ""
-"The <literal>Game</literal> bean is can then be used, for example, by the "
-"code for submitting a guess:"
+msgid "This example shows how to use the Weld SE extension to in a Java SE based Swing application with no EJB or servlet dependencies. This example can be found in the <literal>examples/se/numberguess</literal> folder of the Weld distribution."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:417
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[final Component guessButton = new AjaxButton(\"GuessButton\") {\n"
-"   protected void onSubmit(AjaxRequestTarget target, Form form) {\n"
-"      if (game.check()) {\n"
-"         info(\"Correct!\");\n"
-"         setVisible(false);\n"
-"         prompt.setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == 0) {\n"
-"         info(\"Sorry, the answer was \" + game.getNumber());\n"
-"         setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getNumber() > game.getGuess()) {\n"
-"         info(\"Higher!\");\n"
-"      }\n"
-"      else if (game.getNumber() < game.getGuess()) {\n"
-"         info(\"Lower\");\n"
-"      }\n"
-"      target.addComponent(form);\n"
-"   } \n"
-"};      ]]>"
+msgid "To run the example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:420
 #, no-c-format
-msgid ""
-"All injections may be serialized; actual storage of the bean is managed by "
-"JSR-299. Note that Wicket components, like the <literal>HomePage</literal> "
-"and it subcomponents, are <emphasis>not</emphasis> JSR-299 beans."
+msgid "Ensure that Maven 2 (version 2.0.10+) is installed and in your PATH"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:425
 #, no-c-format
-msgid ""
-"Wicket components allow injection, but they <emphasis>cannot</emphasis> use "
-"interceptors, decorators or lifecycle callbacks such as "
-"<literal>@PostConstruct</literal> or methods. The components would need to "
-"delegate to actual beans to leverage these features."
+msgid "Ensure that the <literal>JAVA_HOME</literal> environment variable is pointing to your JDK installation"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:433
 #, no-c-format
-msgid ""
-"The example uses AJAX for processing of button events, and dynamically hides "
-"buttons that are no longer relevant, for example when the user has won the "
-"game."
+msgid "Open a command line or terminal window in the <literal>examples/se/numberguess</literal> directory"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:440
 #, no-c-format
-msgid ""
-"In order to activate Wicket for this webapp, the Wicket filter is added to "
-"<literal>web.xml</literal>, and our application class is specified in "
-"<literal>web.xml</literal>:"
+msgid "Execute the following command"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:445
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[<filter>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-"
-"class>\n"
-"   <init-param>\n"
-"      <param-name>applicationClassName</param-name>\n"
-"      <param-value>org.jboss.weld.examples.wicket.NumberGuessApplication</"
-"param-value>\n"
-"   </init-param>\n"
-"</filter>\n"
-"\n"
-"<filter-mapping>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <url-pattern>/*</url-pattern>\n"
-"</filter-mapping>]]>"
+msgid "Let's have a look at the significant code and configuration files that make up this example."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:447
 #, no-c-format
-msgid ""
-"The servlet listener is still required, as in the Tomcat example, to "
-"bootstrap CDI when Jetty starts and to hook CDI into the Jetty servlet "
-"request and session lifecycles. However, rather than putting it into the web."
-"xml, it is placed into an override file, <literal>src/main/webapp/WEB-INF/"
-"jetty-additions-to-web.xml</literal>, that is passed to Jetty as an extra "
-"descriptor to be appended to the <literal>web.xml</literal> configuration."
+msgid "As usual, there is an empty <literal>beans.xml</literal> file in the root package (<literal>src/main/resources/beans.xml</literal>), which marks this application as a CDI application."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:455
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[<web-app version=\"2.4\" ...>\n"
-"   <listener>\n"
-"      <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"   </listener>\n"
-"</web-app>]]>"
+msgid "The game's main logic is located in <literal>Game.java</literal>. Here is the code for that class, highlighting the ways in which this differs from the web application version:"
 msgstr ""
 
-#. Tag: title
-#: weldexamples.xml:464
+#. Tag: para
 #, no-c-format
-msgid "The numberguess example for Java SE with Swing"
+msgid "The bean is application scoped rather than session scoped, since an instance of a Swing application typically represents a single 'session'."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:466
 #, no-c-format
-msgid ""
-"This example shows how to use the Weld SE extension to in a Java SE based "
-"Swing application with no EJB or servlet dependencies. This example can be "
-"found in the <literal>examples/se/numberguess</literal> folder of the Weld "
-"distribution."
+msgid "Notice that the bean is not named, since it doesn't need to be accessed via EL."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:473
 #, no-c-format
-msgid "To run the example:"
+msgid "In Java SE there is no JSF <literal>FacesContext</literal> to which messages can be added. Instead the <literal>Game</literal> class provides additional information about the state of the current game including:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:479
 #, no-c-format
-msgid "Ensure that Maven 2 (version 2.0.10+) is installed and in your PATH"
+msgid "If the game has been won or lost"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:484
 #, no-c-format
-msgid ""
-"Ensure that the <literal>JAVA_HOME</literal> environment variable is "
-"pointing to your JDK installation"
+msgid "If the most recent guess was invalid"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:490
 #, no-c-format
-msgid ""
-"Open a command line or terminal window in the <literal>examples/se/"
-"numberguess</literal> directory"
+msgid "This allows the Swing UI to query the state of the game, which it does indirectly via a class called <literal>MessageGenerator</literal>, in order to determine the appropriate messages to display to the user during the game."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:496
 #, no-c-format
-msgid "Execute the following command"
+msgid "Since there is no dedicated validation phase, validation of user input is performed during the <literal>check()</literal> method."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:499
+#. Tag: para
 #, no-c-format
-msgid "mvn -Drun"
+msgid "The <literal>reset()</literal> method makes a call to the injected <literal>rndGenerator</literal> in order to get the random number at the start of each game. Note that it can't use <literal>Instance.get()</literal> like the JSF example does because there will not be any active contexts like there are during a JSF request."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:503
 #, no-c-format
-msgid ""
-"Let's have a look at the significant code and configuration files that make "
-"up this example."
+msgid "The <literal>MessageGenerator</literal> class depends on the current instance of <literal>Game</literal> and queries its state in order to determine the appropriate messages to provide as the prompt for the user's next guess and the response to the previous guess. The code for <literal>MessageGenerator</literal> is as follows:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:508
 #, no-c-format
-msgid ""
-"As usual, there is an empty <literal>beans.xml</literal> file in the root "
-"package (<literal>src/main/resources/beans.xml</literal>), which marks this "
-"application as a CDI application."
+msgid "The instance of <literal>Game</literal> for the application is injected here."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:514
 #, no-c-format
-msgid ""
-"The game's main logic is located in <literal>Game.java</literal>. Here is "
-"the code for that class, highlighting the ways in which this differs from "
-"the web application version:"
+msgid "The <literal>Game</literal>'s state is interrogated to determine the appropriate challenge message ..."
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:518
+#. Tag: para
 #, no-c-format
-msgid ""
-"<programlistingco> <areaspec> <area id=\"scope\" coords=\"1\"/> <area id="
-"\"name\" coords=\"2\"/> <area id=\"messages1\" coords=\"26\"/> <area id="
-"\"validation\" coords=\"41\"/> <area id=\"reset\" coords=\"73\"/> </"
-"areaspec> <programlisting role=\"JAVA\"><![CDATA[@ApplicationScoped\n"
-"public class Game\n"
-"{\n"
-"\n"
-"   public static final int MAX_NUM_GUESSES = 10;\n"
-"\n"
-"   private Integer number;\n"
-"   private int guess = 0;\n"
-"   private int smallest = 0;\n"
-"\n"
-"   @Inject\n"
-"   @MaxNumber\n"
-"   private int maxNumber;\n"
-"\n"
-"   private int biggest;\n"
-"   private int remainingGuesses = MAX_NUM_GUESSES;\n"
-"   private boolean validNumberRange = true;\n"
-"\n"
-"   @Inject\n"
-"   Generator rndGenerator;\n"
-"\n"
-"   public Game()\n"
-"   {\n"
-"   }\n"
-"\n"
-"   ...\n"
-"\n"
-"   public boolean isValidNumberRange()\n"
-"   {\n"
-"      return validNumberRange;\n"
-"   }\n"
-"\n"
-"   public boolean isGameWon()\n"
-"   {\n"
-"      return guess == number;\n"
-"   }\n"
-"\n"
-"   public boolean isGameLost()\n"
-"   {\n"
-"      return guess != number && remainingGuesses <= 0;\n"
-"   }\n"
-"\n"
-"   public boolean check()\n"
-"   {\n"
-"      boolean result = false;\n"
-"\n"
-"      if (checkNewNumberRangeIsValid())\n"
-"      {\n"
-"         if (guess > number)\n"
-"         {\n"
-"            biggest = guess - 1;\n"
-"         }\n"
-"\n"
-"         if (guess < number)\n"
-"         {\n"
-"            smallest = guess + 1;\n"
-"         }\n"
-"\n"
-"         if (guess == number)\n"
-"         {\n"
-"            result = true;\n"
-"         }\n"
-"\n"
-"         remainingGuesses--;\n"
-"      }\n"
-"\n"
-"      return result;\n"
-"   }\n"
-"\n"
-"   private boolean checkNewNumberRangeIsValid()\n"
-"   {\n"
-"      return validNumberRange = ((guess >= smallest) && (guess <= "
-"biggest));\n"
-"   }\n"
-"\n"
-"   @PostConstruct\n"
-"   public void reset()\n"
-"   {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = rndGenerator.next();\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"scope\"> <para> The "
-"bean is application scoped rather than session scoped, since an instance of "
-"a Swing application typically represents a single 'session'. </para> </"
-"callout> <callout arearefs=\"name\"> <para> Notice that the bean is not "
-"named, since it doesn't need to be accessed via EL. </para> </callout> "
-"<callout arearefs=\"messages1\"> <para> In Java SE there is no JSF "
-"<literal>FacesContext</literal> to which messages can be added. Instead the "
-"<literal>Game</literal> class provides additional information about the "
-"state of the current game including: </para> <itemizedlist> <listitem> "
-"<para> If the game has been won or lost </para> </listitem> <listitem> "
-"<para> If the most recent guess was invalid </para> </listitem> </"
-"itemizedlist> <para> This allows the Swing UI to query the state of the "
-"game, which it does indirectly via a class called <literal>MessageGenerator</"
-"literal>, in order to determine the appropriate messages to display to the "
-"user during the game. </para> </callout> <callout arearefs=\"validation\"> "
-"<para> Since there is no dedicated validation phase, validation of user "
-"input is performed during the <literal>check()</literal> method. </para> </"
-"callout> <callout arearefs=\"reset\"> <para> The <literal>reset()</literal> "
-"method makes a call to the injected <literal>rndGenerator</literal> in order "
-"to get the random number at the start of each game. Note that it can't use "
-"<literal>Instance.get()</literal> like the JSF example does because there "
-"will not be any active contexts like there are during a JSF request. </para> "
-"</callout> </calloutlist> </programlistingco> <para> The "
-"<literal>MessageGenerator</literal> class depends on the current instance of "
-"<literal>Game</literal> and queries its state in order to determine the "
-"appropriate messages to provide as the prompt for the user's next guess and "
-"the response to the previous guess. The code for <literal>MessageGenerator</"
-"literal> is as follows: </para> <programlistingco> <areaspec> <area id=\"game"
-"\" coords=\"3\"/> <area id=\"challenge\" coords=\"6\"/> <area id=\"result\" "
-"coords=\"17\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA[public "
-"class MessageGenerator\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   public String getChallengeMessage()\n"
-"   {\n"
-"      StringBuilder challengeMsg = new StringBuilder(\"I'm thinking of a "
-"number between \");\n"
-"      challengeMsg.append(game.getSmallest());\n"
-"      challengeMsg.append(\" and \");\n"
-"      challengeMsg.append(game.getBiggest());\n"
-"      challengeMsg.append(\". Can you guess what it is?\");\n"
-"\n"
-"      return challengeMsg.toString();\n"
-"   }\n"
-"\n"
-"   public String getResultMessage()\n"
-"   {\n"
-"      if (game.isGameWon())\n"
-"      {\n"
-"         return \"You guessed it! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (game.isGameLost())\n"
-"      {\n"
-"         return \"You are fail! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (!game.isValidNumberRange())\n"
-"      {\n"
-"         return \"Invalid number range!\";\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == Game.MAX_NUM_GUESSES)\n"
-"      {\n"
-"         return \"What is your first guess?\";\n"
-"      }\n"
-"      else\n"
-"      {\n"
-"         String direction = null;\n"
-"\n"
-"         if (game.getGuess() < game.getNumber())\n"
-"         {\n"
-"            direction = \"Higher\";\n"
-"         }\n"
-"         else\n"
-"         {\n"
-"            direction = \"Lower\";\n"
-"         }\n"
-"\n"
-"         return direction + \"! You have \" + game.getRemainingGuesses() + "
-"\" guesses left.\";\n"
-"      }\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"game\"> <para> The "
-"instance of <literal>Game</literal> for the application is injected here. </"
-"para> </callout> <callout arearefs=\"challenge\"> <para> The <literal>Game</"
-"literal>'s state is interrogated to determine the appropriate challenge "
-"message ... </para> </callout> <callout arearefs=\"result\"> <para> ... and "
-"again to determine whether to congratulate, console or encourage the user to "
-"continue. </para> </callout> </calloutlist> </programlistingco> <para> "
-"Finally we come to the <literal>NumberGuessFrame</literal> class which "
-"provides the Swing front end to our guessing game. </para> "
-"<programlistingco> <areaspec> <area id=\"gameIn\" coords=\"3\"/> <area id="
-"\"messagesIn\" coords=\"6\"/> <area id=\"start\" coords=\"9\"/> <area id="
-"\"init\" coords=\"21\"/> <area id=\"guess1\" coords=\"38\"/> <area id="
-"\"replay\" coords=\"48\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA"
-"[public class NumberGuessFrame extends javax.swing.JFrame\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   @Inject\n"
-"   private MessageGenerator msgGenerator;\n"
-"\n"
-"   public void start(@Observes ContainerInitialized event)\n"
-"   {\n"
-"      java.awt.EventQueue.invokeLater(new Runnable()\n"
-"      {\n"
-"         public void run()\n"
-"         {\n"
-"            initComponents();\n"
-"            setVisible(true);\n"
-"         }\n"
-"      });\n"
-"   }\n"
-"\n"
-"   private void initComponents()\n"
-"   {\n"
-"\n"
-"      buttonPanel = new javax.swing.JPanel();\n"
-"      mainMsgPanel = new javax.swing.JPanel();\n"
-"      mainLabel = new javax.swing.JLabel();\n"
-"      messageLabel = new javax.swing.JLabel();\n"
-"      guessText = new javax.swing.JTextField();\n"
-"      ...\n"
-"      mainLabel.setText(msgGenerator.getChallengeMessage());\n"
-"      mainMsgPanel.add(mainLabel);\n"
-"\n"
-"      messageLabel.setText(msgGenerator.getResultMessage());\n"
-"      mainMsgPanel.add(messageLabel);\n"
-"      ...\n"
-"   }\n"
-"\n"
-"   private void guessButtonActionPerformed( java.awt.event.ActionEvent "
-"evt )\n"
-"   {\n"
-"      int guess =  Integer.parseInt(guessText.getText());\n"
-"      game.setGuess( guess );\n"
-"      game.check();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void replayBtnActionPerformed(java.awt.event.ActionEvent evt)\n"
-"   {\n"
-"      game.reset();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void refreshUI() {\n"
-"      mainLabel.setText( msgGenerator.getChallengeMessage() );\n"
-"      messageLabel.setText( msgGenerator.getResultMessage() );\n"
-"      guessText.setText( \"\" );\n"
-"      guessesLeftBar.setValue( game.getRemainingGuesses() );\n"
-"      guessText.requestFocus();\n"
-"   }\n"
-"\n"
-"   // swing components\n"
-"   private javax.swing.JPanel borderPanel;\n"
-"   ...\n"
-"   private javax.swing.JButton replayBtn;\n"
-"\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"gameIn\"> <para> The "
-"injected instance of the game (logic and state). </para> </callout> <callout "
-"arearefs=\"messagesIn\"> <para> The injected message generator for UI "
-"messages. </para> </callout> <callout arearefs=\"start\"> <para> This "
-"application is started in the prescribed Weld SE way, by observing the "
-"<literal>ContainerInitialized</literal> event. </para> </callout> <callout "
-"arearefs=\"init\"> <para> This method initializes all of the Swing "
-"components. Note the use of the <literal>msgGenerator</literal> here. </"
-"para> </callout> <callout arearefs=\"guess1\"> <para> "
-"<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
-"button is clicked, and it does the following: </para> <itemizedlist> "
-"<listitem> <para> Gets the guess entered by the user and sets it as the "
-"current guess in the <literal>Game</literal> </para> </listitem> <listitem> "
-"<para> Calls <literal>game.check()</literal> to validate and perform one "
-"'turn' of the game </para> </listitem> <listitem> <para> Calls "
-"<literal>refreshUI</literal>. If there were validation errors with the "
-"input, this will have been captured during <literal>game.check()</literal> "
-"and as such will be reflected in the messages returned by "
-"<literal>MessageGenerator</literal> and subsequently presented to the user. "
-"If there are no validation errors then the user will be told to guess again "
-"(higher or lower) or that the game has ended either in a win (correct guess) "
-"or a loss (ran out of guesses). </para> </listitem> </itemizedlist> </"
-"callout> <callout arearefs=\"replay\"> <para> "
-"<literal>replayBtnActionPerformed</literal> simply calls <literal>game.reset"
-"()</literal> to start a new game and refreshes the messages in the UI. </"
-"para> </callout> </calloutlist> </programlistingco>"
+msgid "... and again to determine whether to congratulate, console or encourage the user to continue."
 msgstr ""
 
-#. Tag: title
-#: weldexamples.xml:716
+#. Tag: para
 #, no-c-format
-msgid "The translator example in depth"
+msgid "Finally we come to the <literal>NumberGuessFrame</literal> class which provides the Swing front end to our guessing game."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:718
 #, no-c-format
-msgid ""
-"The translator example will take any sentences you enter, and translate them "
-"to Latin. (Well, not really, but the stub is there for you to implement, at "
-"least. Good luck!)"
+msgid "The injected instance of the game (logic and state)."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:723
 #, no-c-format
-msgid ""
-"The translator example is built as an EAR and contains EJBs. As a result, "
-"it's structure is more complex than the numberguess example."
+msgid "The injected message generator for UI messages."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:729
 #, no-c-format
-msgid ""
-"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a WAR, which "
-"will make this structure much simpler! Still, there are other advantages of "
-"using an EAR."
+msgid "This application is started in the prescribed Weld SE way, by observing the <literal>ContainerInitialized</literal> event."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:735
 #, no-c-format
-msgid ""
-"First, let's take a look at the EAR aggregator, which is located in the "
-"example's <literal>ear</literal> directory. Maven automatically generates "
-"the <literal>application.xml</literal> for us from this plugin configuration:"
+msgid "This method initializes all of the Swing components. Note the use of the <literal>msgGenerator</literal> here."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:740
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[<plugin>\n"
-"   <groupId>org.apache.maven.plugins</groupId>\n"
-"   <artifactId>maven-ear-plugin</artifactId>\n"
-"   <configuration>\n"
-"      <modules>\n"
-"         <webModule>\n"
-"            <groupId>org.jboss.weld.examples.jsf.translator</groupId>\n"
-"            <artifactId>weld-jsf-translator-war</artifactId>\n"
-"            <contextRoot>/weld-translator</contextRoot>\n"
-"         </webModule>\n"
-"      </modules>\n"
-"   </configuration>\n"
-"</plugin>]]>"
+msgid "<literal>guessButtonActionPerformed</literal> is called when the 'Guess' button is clicked, and it does the following:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:742
 #, no-c-format
-msgid ""
-"This configuration overrides the web context path, resulting in this "
-"application URL: <ulink url=\"http://localhost:8080/weld-translator\">http://"
-"localhost:8080/weld-translator</ulink>."
+msgid "Gets the guess entered by the user and sets it as the current guess in the <literal>Game</literal>"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:748
 #, no-c-format
-msgid ""
-"If you weren't using Maven to generate these files, you would need "
-"<literal>META-INF/application.xml</literal>:"
+msgid "Calls <literal>game.check()</literal> to validate and perform one 'turn' of the game"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:753
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[<application version=\"5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/application_5.xsd\">\n"
-"\n"
-"  <display-name>weld-jsf-translator-ear</display-name>\n"
-"  <description>The Weld JSF translator example (EAR)</description>\n"
-"  \n"
-"  <module>\n"
-"    <web>\n"
-"      <web-uri>weld-translator.war</web-uri>\n"
-"      <context-root>/weld-translator</context-root>\n"
-"    </web>\n"
-"  </module>\n"
-"  <module>\n"
-"    <ejb>weld-translator.jar</ejb>\n"
-"  </module>\n"
-"</application>]]>"
+msgid "Calls <literal>refreshUI</literal>. If there were validation errors with the input, this will have been captured during <literal>game.check()</literal> and as such will be reflected in the messages returned by <literal>MessageGenerator</literal> and subsequently presented to the user. If there are no validation errors then the user will be told to guess again (higher or lower) or that the game has ended either in a win (correct guess) or a loss (ran out of guesses)."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:756
 #, no-c-format
-msgid ""
-"Next, lets look at the WAR, which is located in the example's <literal>war</"
-"literal> directory. Just as in the numberguess example, we have a "
-"<literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</"
-"literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/"
-"main/webapp/WEB-INF</literal>."
+msgid "<literal>replayBtnActionPerformed</literal> simply calls <literal>game.reset()</literal> to start a new game and refreshes the messages in the UI."
 msgstr ""
 
+#. Tag: title
+#, no-c-format
+msgid "The translator example in depth"
+msgstr ""
+
 #. Tag: para
-#: weldexamples.xml:762
 #, no-c-format
-msgid ""
-"More interesting is the JSF view used to translate text. Just as in the "
-"numberguess example we have a template, which surrounds the form (ommitted "
-"here for brevity):"
+msgid "The translator example will take any sentences you enter, and translate them to Latin. (Well, not really, but the stub is there for you to implement, at least. Good luck!)"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:767
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[<h:form id=\"translator\">\n"
-"\n"
-"   <table>\n"
-"      <tr align=\"center\" style=\"font-weight: bold\">\n"
-"         <td>\n"
-"            Your text\n"
-"         </td>\n"
-"         <td>\n"
-"            Translation\n"
-"         </td>\n"
-"      </tr>\n"
-"      <tr>\n"
-"         <td>\n"
-"            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
-"required=\"true\" rows=\"5\" cols=\"80\"/>\n"
-"         </td>\n"
-"         <td>\n"
-"            <h:outputText value=\"#{translator.translatedText}\"/>\n"
-"         </td>\n"
-"      </tr>\n"
-"   </table>\n"
-"   <div>\n"
-"      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
-"{translator.translate}\"/>\n"
-"   </div>\n"
-"   \n"
-"</h:form>]]>"
+msgid "The translator example is built as an ear and contains EJBs. As a result, it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:769
 #, no-c-format
-msgid ""
-"The user can enter some text in the left-hand textarea, and hit the "
-"translate button to see the result to the right."
+msgid "Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a war, which will make this structure much simpler! Still, there are other advantages of using an ear."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:774
 #, no-c-format
-msgid ""
-"Finally, let's look at the EJB module, which is located in the example's "
-"<literal>ejb</literal> directory. In <literal>src/main/resources/META-INF</"
-"literal> there is just an empty <literal>beans.xml</literal>, used to mark "
-"the archive as containing beans."
+msgid "First, let's take a look at the ear aggregator, which is located in the example's <literal>ear</literal> directory. Maven automatically generates the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:780
 #, no-c-format
-msgid ""
-"We've saved the most interesting bit to last, the code! The project has two "
-"simple beans, <literal>SentenceParser</literal> and <literal>TextTranslator</"
-"literal> and two session beans, <literal>TranslatorControllerBean</literal> "
-"and <literal>SentenceTranslator</literal>. You should be getting quite "
-"familiar with what a bean looks like by now, so we'll just highlight the "
-"most interesting bits here."
+msgid "This configuration overrides the web context path, resulting in this application URL: <ulink url=\"http://localhost:8080/weld-translator\">http://localhost:8080/weld-translator</ulink>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:787
 #, no-c-format
-msgid ""
-"Both <literal>SentenceParser</literal> and <literal>TextTranslator</literal> "
-"are dependent beans, and <literal>TextTranslator</literal> uses constructor "
-"injection:"
+msgid "If you weren't using Maven to generate these files, you would need <literal>META-INF/application.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:792
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator implements Serializable { \n"
-"\n"
-"   private SentenceParser sentenceParser; \n"
-"\n"
-"   @EJB private Translator translator; \n"
-"   \n"
-"   @Inject public TextTranslator(SentenceParser sentenceParser) { \n"
-"      this.sentenceParser = sentenceParser; \n"
-"   }\n"
-"   \n"
-"   public String translate(String text) { \n"
-"      StringBuilder sb = new StringBuilder(); \n"
-"      for (String sentence: sentenceParser.parse(text)) { \n"
-"         sb.append(translator.translate(sentence)).append(\". \"); \n"
-"      } \n"
-"      return sb.toString().trim(); \n"
-"   }\n"
-"\n"
-"}]]>"
+msgid "Next, lets look at the war, which is located in the example's <literal>war</literal> directory. Just as in the numberguess example, we have a <literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/main/webapp/WEB-INF</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:794
 #, no-c-format
-msgid ""
-"<literal>TextTranslator</literal> uses the simple bean (really just a plain "
-"Java class!) <literal>SentenceParser</literal> to parse the sentence and "
-"then calls on the stateless bean with the local business interface "
-"<literal>Translator</literal> to perform the translation. That's where the "
-"magic happens. Of course, we couldn't develop a full translator, but it's "
-"convincing enough to anyone who doesn't understand Latin!"
+msgid "More interesting is the JSF view used to translate text. Just as in the numberguess example we have a template, which surrounds the form (ommitted here for brevity):"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:802
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator { \n"
-"\n"
-"   public String translate(String sentence) { \n"
-"      return \"Lorem ipsum dolor sit amet\"; \n"
-"   }\n"
-"\n"
-"}]]>"
+msgid "The user can enter some text in the left-hand textarea, and hit the translate button to see the result to the right."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:804
 #, no-c-format
-msgid ""
-"Finally, there is UI orientated controller. This is a request scoped, named, "
-"stateful session bean, which injects the translator. It collects the text "
-"from the user and dispatches it to the translator. The bean also has getters "
-"and setters for all the fields on the page."
+msgid "Finally, let's look at the EJB module, which is located in the example's <literal>ejb</literal> directory. In <literal>src/main/resources/META-INF</literal> there is just an empty <literal>beans.xml</literal>, used to mark the archive as containing beans."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:810
+#. Tag: para
 #, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"@RequestScoped\n"
-"@Named(\"translator\")\n"
-"public class TranslatorControllerBean implements TranslatorController {\n"
-"\n"
-"   @Inject private TextTranslator translator;\n"
-"   \n"
-"   private String inputText;\n"
-"   \n"
-"   private String translatedText;\n"
-"   \n"
-"   public void translate() {\n"
-"      translatedText = translator.translate(inputText);\n"
-"   }\n"
-"   \n"
-"   public String getText() {\n"
-"      return inputText;\n"
-"   }\n"
-"   \n"
-"   public void setText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"   \n"
-"   public String getTranslatedText() {\n"
-"      return translatedText;\n"
-"   }\n"
-"   \n"
-"   @Remove public void remove() {}\n"
-"\n"
-"}]]>"
+msgid "We've saved the most interesting bit to last, the code! The project has two simple beans, <literal>SentenceParser</literal> and <literal>TextTranslator</literal> and two session beans, <literal>TranslatorControllerBean</literal> and <literal>SentenceTranslator</literal>. You should be getting quite familiar with what a bean looks like by now, so we'll just highlight the most interesting bits here."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:814
 #, no-c-format
-msgid ""
-"That concludes our short tour of the Weld starter examples. For more "
-"information on Weld, please visit <ulink url=\"http://www.seamframework.org/"
-"Weld\">http://www.seamframework.org/Weld</ulink>."
+msgid "Both <literal>SentenceParser</literal> and <literal>TextTranslator</literal> are dependent beans, and <literal>TextTranslator</literal> uses constructor injection:"
 msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "<literal>TextTranslator</literal> uses the simple bean (really just a plain Java class!) <literal>SentenceParser</literal> to parse the sentence and then calls on the stateless bean with the local business interface <literal>Translator</literal> to perform the translation. That's where the magic happens. Of course, we couldn't develop a full translator, but it's convincing enough to anyone who doesn't understand Latin!"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "Finally, there is UI orientated controller. This is a request scoped, named, stateful session bean, which injects the translator. It collects the text from the user and dispatches it to the translator. The bean also has getters and setters for all the fields on the page."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "That concludes our short tour of the Weld starter examples. For more information on Weld, please visit <ulink url=\"http://www.seamframework.org/Weld\">http://www.seamframework.org/Weld</ulink>."
+msgstr ""
+

Modified: doc/trunk/reference/pot/xml.pot
===================================================================
--- doc/trunk/reference/pot/xml.pot	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pot/xml.pot	2010-03-02 13:24:32 UTC (rev 5973)
@@ -1,339 +1,149 @@
-# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# 
+# AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"Project-Id-Version: 0\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"PO-Revision-Date: 2010-03-02T13:07:18\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Type: application/x-publican; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: xml.xml:5
 #, no-c-format
 msgid "Defining beans using XML"
 msgstr ""
 
 #. Tag: para
-#: xml.xml:7
 #, no-c-format
-msgid ""
-"So far, we've seen plenty of examples of beans declared using annotations. "
-"However, there are a couple of occasions when we can't use annotations to "
-"define the bean:"
+msgid "So far, we've seen plenty of examples of beans declared using annotations. However, there are a couple of occasions when we can't use annotations to define the bean:"
 msgstr ""
 
 #. Tag: para
-#: xml.xml:14
 #, no-c-format
 msgid "when the implementation class comes from some preexisting library, or"
 msgstr ""
 
 #. Tag: para
-#: xml.xml:19
 #, no-c-format
 msgid "when there should be multiple beans with the same implementation class."
 msgstr ""
 
 #. Tag: para
-#: xml.xml:25
 #, no-c-format
-msgid ""
-"One way to address these problems is to write a producer method. Weld offers "
-"another option: declare the bean using XML. This feature will hopefully one "
-"day be part of the CDI specification. Until then, it remains a portable "
-"extension."
+msgid "One way to address these problems is to write a producer method. Weld offers another option: declare the bean using XML. This feature will hopefully one day be part of the CDI specification. Until then, it remains a portable extension."
 msgstr ""
 
 #. Tag: para
-#: xml.xml:31
 #, no-c-format
-msgid ""
-"Many frameworks use XML to provide metadata relating to Java classes. "
-"However, Weld uses a very different approach to specifying the names of Java "
-"classes, fields or methods to most other frameworks. Instead of writing "
-"class and member names as the string values of XML elements and attributes, "
-"Weld lets you use the class or member name as the name of the XML element."
+msgid "Many frameworks use XML to provide metadata relating to Java classes. However, Weld uses a very different approach to specifying the names of Java classes, fields or methods to most other frameworks. Instead of writing class and member names as the string values of XML elements and attributes, Weld lets you use the class or member name as the name of the XML element."
 msgstr ""
 
 #. Tag: para
-#: xml.xml:38
 #, no-c-format
-msgid ""
-"The advantage of this approach is that you can write an XML schema that "
-"prevents spelling errors in your XML document. It's even possible for a tool "
-"to generate the XML schema automatically from the compiled Java code. Or, an "
-"integrated development environment could perform the same validation without "
-"the need for the explicit intermediate generation step."
+msgid "The advantage of this approach is that you can write an XML schema that prevents spelling errors in your XML document. It's even possible for a tool to generate the XML schema automatically from the compiled Java code. Or, an integrated development environment could perform the same validation without the need for the explicit intermediate generation step."
 msgstr ""
 
 #. Tag: title
-#: xml.xml:46
 #, no-c-format
 msgid "Declaring beans"
 msgstr ""
 
 #. Tag: para
-#: xml.xml:48
 #, no-c-format
-msgid ""
-"For each Java package, Weld defines a corresponding XML namespace. The "
-"namespace is formed by prepending <literal>urn:java:</literal> to the Java "
-"package name. For the package <literal>com.mydomain.myapp</literal>, the XML "
-"namespace is <literal>urn:java:com.mydomain.myapp</literal>."
+msgid "For each Java package, Weld defines a corresponding XML namespace. The namespace is formed by prepending <literal>urn:java:</literal> to the Java package name. For the package <literal>com.mydomain.myapp</literal>, the XML namespace is <literal>urn:java:com.mydomain.myapp</literal>."
 msgstr ""
 
 #. Tag: para
-#: xml.xml:54
 #, no-c-format
-msgid ""
-"Java types belonging to a package are referred to using an XML element in "
-"the namespace corresponding to the package. The name of the element is the "
-"name of the Java type. Fields and methods of the type are specified by child "
-"elements in the same namespace. If the type is an annotation, members are "
-"specified by attributes of the element."
+msgid "Java types belonging to a package are referred to using an XML element in the namespace corresponding to the package. The name of the element is the name of the Java type. Fields and methods of the type are specified by child elements in the same namespace. If the type is an annotation, members are specified by attributes of the element."
 msgstr ""
 
 #. Tag: para
-#: xml.xml:61
 #, no-c-format
-msgid ""
-"For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
-"following XML fragment refers to the class <literal>java.util.Date</literal>:"
+msgid "For example, the element <literal>&lt;util:Date/&gt;</literal> in the following XML fragment refers to the class <literal>java.util.Date</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: xml.xml:66
-#, no-c-format
-msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:util=\"urn:java:java.util\">\n"
-"   <util:Date/>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: xml.xml:68
 #, no-c-format
-msgid ""
-"And this is all the code we need to declare that <literal>Date</literal> is "
-"a bean! An instance of <literal>Date</literal> may now be injected by any "
-"other bean:"
+msgid "And this is all the code we need to declare that <literal>Date</literal> is a bean! An instance of <literal>Date</literal> may now be injected by any other bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: xml.xml:73
-#, no-c-format
-msgid "<![CDATA[private @Inject Date date;]]>"
-msgstr ""
-
 #. Tag: title
-#: xml.xml:78
 #, no-c-format
 msgid "Declaring bean metadata"
 msgstr ""
 
 #. Tag: para
-#: xml.xml:80
 #, no-c-format
-msgid ""
-"We can declare the scope, deployment type and interceptor binding types "
-"using direct child elements of the bean declaration:"
+msgid "We can declare the scope, deployment type and interceptor binding types using direct child elements of the bean declaration:"
 msgstr ""
 
-#. Tag: programlisting
-#: xml.xml:85
-#, no-c-format
-msgid ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"   <SessionScoped/>\n"
-"   <myfwk:Transactional requiresNew=\"true\"/>\n"
-"   <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
-msgstr ""
-
 #. Tag: para
-#: xml.xml:87
 #, no-c-format
 msgid "We use exactly the same approach to specify names and qualifiers:"
 msgstr ""
 
-#. Tag: programlisting
-#: xml.xml:89
-#, no-c-format
-msgid ""
-"<![CDATA[<util:Date>\n"
-"   <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <SessionScoped/>\n"
-"   <myapp:Login/>\n"
-"   <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:SystemStart/>\n"
-"   <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
-msgstr ""
-
 #. Tag: para
-#: xml.xml:91
 #, no-c-format
-msgid ""
-"Where <literal>@Login</literal> and <literal>@SystemStart</literal> are "
-"qualifier annotations types."
+msgid "Where <literal>@Login</literal> and <literal>@SystemStart</literal> are qualifier annotations types."
 msgstr ""
 
-#. Tag: programlisting
-#: xml.xml:95
-#, no-c-format
-msgid ""
-"<![CDATA[private @Inject Date currentTime;\n"
-"private @Login Date loginTime;\n"
-"private @SystemStart Date systemStartTime;]]>"
-msgstr ""
-
 #. Tag: para
-#: xml.xml:97
 #, no-c-format
 msgid "As usual, a bean may support multiple qualifier types:"
 msgstr ""
 
-#. Tag: programlisting
-#: xml.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"   <myapp:PayByCheque/>\n"
-"   <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
-msgstr ""
-
 #. Tag: para
-#: xml.xml:101
 #, no-c-format
-msgid ""
-"Interceptors and decorators are beans as well, so they may be declared just "
-"like any other bean:"
+msgid "Interceptors and decorators are beans as well, so they may be declared just like any other bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: xml.xml:105
-#, no-c-format
-msgid ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"   <Interceptor/>\n"
-"   <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
-msgstr ""
-
 #. Tag: title
-#: xml.xml:110
 #, no-c-format
 msgid "Declaring bean members"
 msgstr ""
 
 #. Tag: para
-#: xml.xml:112
 #, no-c-format
 msgid "TODO!"
 msgstr ""
 
 #. Tag: title
-#: xml.xml:119
 #, no-c-format
 msgid "Declaring inline beans"
 msgstr ""
 
 #. Tag: para
-#: xml.xml:121
 #, no-c-format
 msgid "Weld lets us define a bean at an injection point. For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: xml.xml:123
-#, no-c-format
-msgid ""
-"<![CDATA[<myapp:System>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:admin>\n"
-"      <myapp:Name>\n"
-"         <myapp:firstname>Gavin</myapp:firstname>\n"
-"         <myapp:lastname>King</myapp:lastname>\n"
-"         <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"      </myapp:Name>\n"
-"   </myapp:admin>\n"
-"</myapp:System>]]>"
-msgstr ""
-
 #. Tag: para
-#: xml.xml:125
 #, no-c-format
-msgid ""
-"The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
-"<literal>@Dependent</literal> and class <literal>Name</literal>, with a set "
-"of initial field values. This bean has a special, container-generated "
-"qualifier and is therefore injectable only to the specific injection point "
-"at which it is declared."
+msgid "The <literal>&lt;Name&gt;</literal> element declares a bean of scope <literal>@Dependent</literal> and class <literal>Name</literal>, with a set of initial field values. This bean has a special, container-generated qualifier and is therefore injectable only to the specific injection point at which it is declared."
 msgstr ""
 
 #. Tag: para
-#: xml.xml:131
 #, no-c-format
-msgid ""
-"This simple but powerful feature allows the Weld XML format to be used to "
-"specify whole graphs of Java objects. It's not quite a full databinding "
-"solution, but it's close!"
+msgid "This simple but powerful feature allows the Weld XML format to be used to specify whole graphs of Java objects. It's not quite a full databinding solution, but it's close!"
 msgstr ""
 
 #. Tag: title
-#: xml.xml:139
 #, no-c-format
 msgid "Using a schema"
 msgstr ""
 
 #. Tag: para
-#: xml.xml:141
 #, no-c-format
-msgid ""
-"If we want our XML document format to be authored by people who aren't Java "
-"developers, or who don't have access to our code, we need to provide a "
-"schema. There's nothing specific to Weld about writing or using the schema."
+msgid "If we want our XML document format to be authored by people who aren't Java developers, or who don't have access to our code, we need to provide a schema. There's nothing specific to Weld about writing or using the schema."
 msgstr ""
 
-#. Tag: programlisting
-#: xml.xml:147
-#, no-c-format
-msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/beans-"
-"1.0.xsd\n"
-"   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"   <myapp:System>\n"
-"      ...\n"
-"   </myapp:System>\n"
-"\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: xml.xml:149
 #, no-c-format
-msgid ""
-"Writing an XML schema is quite tedious. Therefore, the Weld project will "
-"provide a tool which automatically generates the XML schema from compiled "
-"Java code."
+msgid "Writing an XML schema is quite tedious. Therefore, the Weld project will provide a tool which automatically generates the XML schema from compiled Java code."
 msgstr ""
+

Modified: doc/trunk/reference/pt-BR/Author_Group.po
===================================================================
--- doc/trunk/reference/pt-BR/Author_Group.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/Author_Group.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-12-19 17:59-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -13,123 +13,137 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Tag: author
-#: Author_Group.xml:5
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Gavin</firstname> <surname>King</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+msgid "Gavin"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:8
 #, no-c-format
 msgid "JSR-299: Contexts and Dependency Injection Lead"
 msgstr "Líder da JSR-299:  Contextos e Injeção de Dependência"
 
-#. Tag: author
-#: Author_Group.xml:14
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+msgid "Pete"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:17
 #, no-c-format
 msgid "Weld (JSR-299 RI) Lead"
 msgstr "Líder do Weld (Implementação de Referência da JSR-299)"
 
-#. Tag: author
-#: Author_Group.xml:24
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
-msgstr "<firstname>Dan</firstname> <surname>Allen</surname>"
+msgid "Dan"
+msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:31
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>David</firstname> <surname>Allen</surname>"
-msgstr "<firstname>David</firstname> <surname>Allen</surname>"
+msgid "David"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:35
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
-msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+msgid "Nicola"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:38
-#: Author_Group.xml:67
 #, no-c-format
 msgid "Italian Translation"
 msgstr "Italian Translation"
 
-#. Tag: othercredit
-#: Author_Group.xml:40
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
-msgstr "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+msgid "Gladys"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:43
 #, no-c-format
 msgid "Spanish Translation"
 msgstr "Spanish Translation"
 
-#. Tag: othercredit
-#: Author_Group.xml:48
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
-msgstr "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+msgid "Eun-Ju"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:51
 #, no-c-format
 msgid "Korean Translation"
 msgstr "Korean Translation"
 
-#. Tag: othercredit
-#: Author_Group.xml:56
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
-msgstr "<firstname>Terry</firstname> <surname>Chuang</surname>"
+msgid "Terry"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:59
 #, no-c-format
 msgid "Traditional Chinese Translation"
 msgstr "Traditional Chinese Translation"
 
-#. Tag: othercredit
-#: Author_Group.xml:64
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
-msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+msgid "Francesco"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:69
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
-msgstr "<firstname>Sean</firstname> <surname>Wu</surname>"
+msgid "Sean"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:72
 #, no-c-format
 msgid "Simplified Chinese Translation"
 msgstr "Simplified Chinese Translation"
 
+#~ msgid "<firstname>Gavin</firstname> <surname>King</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#~ msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
+#~ msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>Dan</firstname> <surname>Allen</surname>"
+
+#~ msgid "<firstname>David</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>David</firstname> <surname>Allen</surname>"
+
+#~ msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+#~ msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+
+#~ msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+#~ msgstr "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+
+#~ msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+#~ msgstr "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+
+#~ msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
+#~ msgstr "<firstname>Terry</firstname> <surname>Chuang</surname>"
+
+#~ msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+#~ msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+
+#~ msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
+#~ msgstr "<firstname>Sean</firstname> <surname>Wu</surname>"
+
 #~ msgid ""
 #~ "<jobtitle>JSR-299 specification lead</jobtitle> <orgname>Red Hat "
 #~ "Middleware LLC</orgname>"
 #~ msgstr ""
 #~ "<jobtitle>JSR-299 specification lead</jobtitle> <orgname>Red Hat "
 #~ "Middleware LLC</orgname>"
+
 #~ msgid ""
 #~ "<jobtitle>Web Beans (JSR-299 Reference Implementation) lead </jobtitle> "
 #~ "<orgname>Red Hat Middleware LLC</orgname>"
 #~ msgstr ""
 #~ "<jobtitle>Web Beans (JSR-299 Reference Implementation) lead </jobtitle> "
 #~ "<orgname>Red Hat Middleware LLC</orgname>"
+
 #~ msgid "Red Hat Middleware LLC"
 #~ msgstr "Red Hat Middleware LLC"
+
 #~ msgid "Kava Community"
 #~ msgstr "Kava Community"
-

Modified: doc/trunk/reference/pt-BR/Book_Info.po
===================================================================
--- doc/trunk/reference/pt-BR/Book_Info.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/Book_Info.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-12-19 17:55-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,17 +14,18 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: Book_Info.xml:4
 #, no-c-format
 msgid "Weld - JSR-299 Reference Implementation"
 msgstr "Weld - Implementação de Referência da JSR-299"
 
 #. Tag: subtitle
-#: Book_Info.xml:5
 #, no-c-format
-msgid "JSR-299: The new Java standard for dependency injection and contextual lifecycle management"
-msgstr "JSR-299: O novo padrão Java para injeção de dependência e gerenciamento de estado contextual"
+msgid ""
+"JSR-299: The new Java standard for dependency injection and contextual "
+"lifecycle management"
+msgstr ""
+"JSR-299: O novo padrão Java para injeção de dependência e gerenciamento de "
+"estado contextual"
 
 #~ msgid "Web Beans: Java Contexts and Dependency Injection"
 #~ msgstr "Web Beans: Contextos Java e Injeção de Dependência"
-

Modified: doc/trunk/reference/pt-BR/beans.po
===================================================================
--- doc/trunk/reference/pt-BR/beans.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/beans.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2010-01-11 17:41-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: beans.xml:4
 #, no-c-format
 msgid "More about beans"
 msgstr "Mais sobre beans"
 
 #. Tag: para
-#: beans.xml:6
 #, no-c-format
 msgid ""
 "A bean is usually an application class that contains business logic. It may "
@@ -38,7 +36,6 @@
 "emphasis>. O ciclo de vida de um bean é sempre gerenciado pelo contêiner."
 
 #. Tag: para
-#: beans.xml:13
 #, no-c-format
 msgid ""
 "Let's back up a second. What does it really mean to be <emphasis>contextual</"
@@ -59,7 +56,6 @@
 "referência."
 
 #. Tag: para
-#: beans.xml:21
 #, no-c-format
 msgid ""
 "However, like a stateless or singleton model, but <emphasis>unlike</"
@@ -73,13 +69,11 @@
 "dela. Em vez disso, o <emphasis>escopo</emphasis> do bean determina:"
 
 #. Tag: para
-#: beans.xml:29
 #, no-c-format
 msgid "the lifecycle of each instance of the bean and"
 msgstr "o ciclo de vida de cada instância do bean e"
 
 #. Tag: para
-#: beans.xml:32
 #, no-c-format
 msgid "which clients share a reference to a particular instance of the bean."
 msgstr ""
@@ -87,7 +81,6 @@
 "bean."
 
 #. Tag: para
-#: beans.xml:36
 #, no-c-format
 msgid ""
 "For a given thread in a CDI application, there may be an <emphasis>active "
@@ -104,7 +97,6 @@
 "escopo de aplicação)."
 
 #. Tag: para
-#: beans.xml:43
 #, no-c-format
 msgid ""
 "Clients (for example, other beans) executing in the same context will see "
@@ -116,7 +108,6 @@
 "uma instância diferente (dependendo do relacionamento entre os contextos)."
 
 #. Tag: para
-#: beans.xml:49
 #, no-c-format
 msgid ""
 "One great advantage of the contextual model is that it allows stateful beans "
@@ -134,26 +125,23 @@
 "seu próprio estado. Os beans são de baixo acoplamento porque:"
 
 #. Tag: para
-#: beans.xml:58
 #, no-c-format
 msgid "they interact via well-defined public APIs"
 msgstr "eles interagem por meio de APIs bem definidas e públicas"
 
 #. Tag: para
-#: beans.xml:61
 #, no-c-format
 msgid "their lifecycles are completely decoupled"
 msgstr "seus ciclos de vida são completamente desacoplados"
 
 #. Tag: para
-#: beans.xml:65
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "We can replace one bean with another different bean that implements the same "
 "interface and has a different lifecycle (a different scope) without "
 "affecting the other bean implementation. In fact, CDI defines a simple "
 "facility for overriding bean implementations at deployment time, as we will "
-"see in <xref linkend=\"alternatives\"/>."
+"see in <xref linkend=\"alternatives\" />."
 msgstr ""
 "Podemos substituir um bean por outro bean diferente que implementa a mesma "
 "interface e tem um ciclo de vida diferente (um escopo diferente) sem afetar "
@@ -162,13 +150,11 @@
 "na <xref linkend=\"alternatives\"/>."
 
 #. Tag: para
-#: beans.xml:71
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Note that not all clients of a bean are beans themselves. Other objects such "
-"as servlets or message-driven beans&#8212;which are by nature not "
-"injectable, contextual objects&#8212;may also obtain references to beans by "
-"injection."
+"as servlets or message-driven beans—which are by nature not injectable, "
+"contextual objects—may also obtain references to beans by injection."
 msgstr ""
 "Note que nem todos os clientes de um bean são eles próprios também beans. "
 "Outros objetos como servlets ou message-driven beans&#8212;que são por "
@@ -176,13 +162,11 @@
 "referências para beans por meio de injeção."
 
 #. Tag: title
-#: beans.xml:78
 #, no-c-format
 msgid "The anatomy of a bean"
 msgstr "A anatomia de um bean"
 
 #. Tag: para
-#: beans.xml:80
 #, no-c-format
 msgid ""
 "Enough hand-waving. More formally, the anatomy of a bean, according to the "
@@ -192,67 +176,56 @@
 "acordo com a especificação:"
 
 #. Tag: para
-#: beans.xml:84
 #, no-c-format
 msgid "A bean comprises the following attributes:"
 msgstr "Um bean abrange os seguintes atributos:"
 
 #. Tag: para
-#: beans.xml:87
 #, no-c-format
 msgid "A (nonempty) set of bean types"
 msgstr "Um conjunto (não vazio) de tipos de bean"
 
 #. Tag: para
-#: beans.xml:88
 #, no-c-format
 msgid "A (nonempty) set of qualifiers"
 msgstr "Um conjunto (não vazio) de qualificadores"
 
 #. Tag: para
-#: beans.xml:89
 #, no-c-format
 msgid "A scope"
 msgstr "Um escopo"
 
 #. Tag: para
-#: beans.xml:90
 #, no-c-format
 msgid "Optionally, a bean EL name"
 msgstr "Opcionalmente, um nome EL do bean"
 
 #. Tag: para
-#: beans.xml:91
 #, no-c-format
 msgid "A set of interceptor bindings"
 msgstr "Um conjunto de vinculações com interceptadores"
 
 #. Tag: para
-#: beans.xml:92
 #, no-c-format
 msgid "A bean implementation"
 msgstr "Uma implementação do bean"
 
 #. Tag: para
-#: beans.xml:95
 #, no-c-format
 msgid "Furthermore, a bean may or may not be an alternative."
 msgstr "Além disso, um bean pode ou não pode ser um bean alternativo."
 
 #. Tag: para
-#: beans.xml:99
 #, no-c-format
 msgid "Let's see what all this new terminology means."
 msgstr "Vamos ver o que toda esta nova terminologia significa."
 
 #. Tag: title
-#: beans.xml:102
 #, no-c-format
 msgid "Bean types, qualifiers and dependency injection"
 msgstr "Tipos e qualificadores de bean e injeção de dependência"
 
 #. Tag: para
-#: beans.xml:104
 #, no-c-format
 msgid ""
 "Beans usually acquire references to other beans via dependency injection. "
@@ -264,19 +237,16 @@
 "deve ser satisfeito pelo bean para ser injetado. O contrato é:"
 
 #. Tag: para
-#: beans.xml:110
 #, no-c-format
 msgid "a bean type, together with"
 msgstr "um tipo de bean, juntamente com"
 
 #. Tag: para
-#: beans.xml:111
 #, no-c-format
 msgid "a set of qualifiers."
 msgstr "um conjunto de qualificadores."
 
 #. Tag: para
-#: beans.xml:114
 #, no-c-format
 msgid ""
 "A bean type is a user-defined class or interface; a type that is client-"
@@ -291,24 +261,7 @@
 "bean pode possuir múltiplos tipos. Por exemplo, o seguinte bean possui "
 "quatro tipos de bean:"
 
-#. Tag: programlisting
-#: beans.xml:120
-#, no-c-format
-msgid ""
-"<![CDATA[public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-
 #. Tag: para
-#: beans.xml:122
 #, no-c-format
 msgid ""
 "The bean types are <literal>BookShop</literal>, <literal>Business</literal> "
@@ -322,7 +275,6 @@
 "tipo de bean válido)."
 
 #. Tag: para
-#: beans.xml:128
 #, no-c-format
 msgid ""
 "Meanwhile, this session bean has only the local interfaces "
@@ -335,39 +287,17 @@
 "lang.Object</literal> como tipos de bean, uma vez que a classe do bean, "
 "<literal>BookShopBean</literal>, não é um tipo visível ao cliente."
 
-#. Tag: programlisting
-#: beans.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"public class BookShopBean \n"
-"      extends Business \n"
-"      implements BookShop, Auditable {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateful\n"
-"public class BookShopBean \n"
-"      extends Business \n"
-"      implements BookShop, Auditable {\n"
-"   ...\n"
-"}]]>"
-
 #. Tag: para
-#: beans.xml:137
 #, no-c-format
 msgid ""
-"Most bean types you can probably figure out. One gotcha is primitive types. "
-"All primitive types are assumed to be identical to their corresponding "
-"wrapper types in <literal>java.lang</literal>."
+"The bean types of a session bean include local interfaces and the bean class "
+"local view (if any). EJB remote interfaces are not considered bean types of "
+"a session bean. You can't inject an EJB using its remote interface unless "
+"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
+"linkend=\"resources\" />."
 msgstr ""
-"A maioria dos tipos de bean você pode provavelmente descobrir. Uma pegadinha "
-"são os tipos primitivos. Todos os tipos primitivos são assumidos como "
-"idênticos aos seus correspondentes tipos adaptadores em <literal>java.lang</"
-"literal>."
 
 #. Tag: para
-#: beans.xml:143
 #, no-c-format
 msgid ""
 "Bean types may be restricted to an explicit set by annotating the bean with "
@@ -382,26 +312,7 @@
 "restritos a <literal>Shop&lt;Book&gt;</literal>, juntamente com "
 "<literal>java.lang.Object</literal>:"
 
-#. Tag: programlisting
-#: beans.xml:149
-#, no-c-format
-msgid ""
-"<![CDATA[@Typed(Shop.class)\n"
-"public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Typed(Shop.class)\n"
-"public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-
 #. Tag: para
-#: beans.xml:151
 #, no-c-format
 msgid ""
 "Sometimes, a bean type alone does not provide enough information for the "
@@ -425,7 +336,6 @@
 "um qualificador."
 
 #. Tag: para
-#: beans.xml:160
 #, no-c-format
 msgid ""
 "A qualifier is a user-defined annotation that is itself annotated "
@@ -439,22 +349,7 @@
 "recorrer a nomes baseados em strings. Aqui está um exemplo de uma anotação "
 "de qualificador:"
 
-#. Tag: programlisting
-#: beans.xml:166
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface CreditCard {}]]>"
-msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface CreditCard {}]]>"
-
 #. Tag: para
-#: beans.xml:168
 #, no-c-format
 msgid ""
 "You may not be used to seeing the definition of an annotation. In fact, this "
@@ -468,7 +363,6 @@
 "criando-os de vez em quando."
 
 #. Tag: para
-#: beans.xml:175
 #, no-c-format
 msgid ""
 "Pay attention to the names of the built-in annotations in CDI and EJB. "
@@ -482,7 +376,6 @@
 "para descrever os comportamentos e papéis da classe."
 
 #. Tag: para
-#: beans.xml:182
 #, no-c-format
 msgid ""
 "Now that we have defined a qualifier annotation, we can use it to "
@@ -495,14 +388,7 @@
 "possui o tipo de bean <literal>PaymentProcessor</literal> e o qualificador "
 "<literal>@CreditCard</literal>:"
 
-#. Tag: programlisting
-#: beans.xml:188
-#, no-c-format
-msgid "<![CDATA[@Inject @CreditCard PaymentProcessor paymentProcessor]]>"
-msgstr "<![CDATA[@Inject @CreditCard PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: beans.xml:191
 #, no-c-format
 msgid ""
 "If an injection point does not explicitly specify a qualifier, it has the "
@@ -512,7 +398,6 @@
 "qualificador padrão, <literal>@Default</literal>."
 
 #. Tag: para
-#: beans.xml:197
 #, no-c-format
 msgid ""
 "For each injection point, the container searches for a bean which satisfies "
@@ -526,7 +411,6 @@
 "não encontrar, ele reporta um erro ao usuário."
 
 #. Tag: para
-#: beans.xml:203
 #, no-c-format
 msgid ""
 "How do we specify that qualifiers of a bean? By annotating the bean class, "
@@ -539,20 +423,7 @@
 "literal> e implementa o tipo de bean <literal>PaymentProcessor</literal>. "
 "Portanto, ele satisfaz nosso ponto de injeção qualificado:"
 
-#. Tag: programlisting
-#: beans.xml:209
-#, no-c-format
-msgid ""
-"<![CDATA[@CreditCard\n"
-"public class CreditCardPaymentProcessor \n"
-"    implements PaymentProcessor { ... }]]>"
-msgstr ""
-"<![CDATA[@CreditCard\n"
-"public class CreditCardPaymentProcessor \n"
-"    implements PaymentProcessor { ... }]]>"
-
 #. Tag: para
-#: beans.xml:212
 #, no-c-format
 msgid ""
 "If a bean does not explicitly specify a qualifier, it has the default "
@@ -562,13 +433,12 @@
 "qualificador padrão, <literal>@Default</literal>."
 
 #. Tag: para
-#: beans.xml:225
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "That's not quite the end of the story. CDI also defines a simple "
 "<emphasis>resolution rule</emphasis> that helps the container decide what to "
 "do if there is more than one bean that satisfies a particular contract. "
-"We'll get into the details in <xref linkend=\"injection\"/>."
+"We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 "Esse não é bem o fim da história. CDI também define uma simples "
 "<emphasis>regra de resolução</emphasis> que ajuda o contêiner decidir o que "
@@ -576,13 +446,11 @@
 "entrar em mais detalhes no <xref linkend=\"injection\"/>."
 
 #. Tag: title
-#: beans.xml:245
 #, no-c-format
 msgid "Scope"
 msgstr "Escopo"
 
 #. Tag: para
-#: beans.xml:248
 #, no-c-format
 msgid ""
 "The <emphasis>scope</emphasis> of a bean defines the lifecycle and "
@@ -598,7 +466,6 @@
 "representado por um tipo de anotação."
 
 #. Tag: para
-#: beans.xml:255
 #, no-c-format
 msgid ""
 "For example, any web application may have <emphasis>session scoped</"
@@ -607,18 +474,7 @@
 "Por exemplo, qualquer aplicação web pode possuir beans com <emphasis>escopo "
 "de sessão</emphasis>:"
 
-#. Tag: programlisting
-#: beans.xml:259
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-"<![CDATA[public @SessionScoped\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-
 #. Tag: para
-#: beans.xml:261
 #, no-c-format
 msgid ""
 "An instance of a session-scoped bean is bound to a user session and is "
@@ -629,7 +485,6 @@
 "desta sessão."
 
 #. Tag: para
-#: beans.xml:265
 #, no-c-format
 msgid ""
 "Keep in mind that once a bean is bound to a context, it remains in that "
@@ -646,7 +501,6 @@
 "conversação."
 
 #. Tag: para
-#: beans.xml:273
 #, no-c-format
 msgid ""
 "If a scope is not explicitly specified, then the bean belongs to a special "
@@ -661,20 +515,17 @@
 "vida deste objeto."
 
 #. Tag: para
-#: beans.xml:279
-#, no-c-format
-msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\"/>."
+#, fuzzy, no-c-format
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 "Nós falaremos mais sobre escopos no <xref linkend=\"scopescontexts\"/>."
 
 #. Tag: title
-#: beans.xml:284
 #, no-c-format
 msgid "EL name"
 msgstr "Nome EL"
 
 #. Tag: para
-#: beans.xml:286
 #, no-c-format
 msgid ""
 "If you want to reference a bean in non-Java code that supports Unified EL "
@@ -686,7 +537,6 @@
 "assinar o bean com um <emphasis>nome EL</emphasis>."
 
 #. Tag: para
-#: beans.xml:291
 #, no-c-format
 msgid ""
 "The EL name is specified using the <literal>@Named</literal> annotation, as "
@@ -695,36 +545,12 @@
 "O nome EL é especificado usando a anotação <literal>@Named</literal>, como "
 "mostrado aqui:"
 
-#. Tag: programlisting
-#: beans.xml:295
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named(\"cart\")\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-"<![CDATA[public @SessionScoped @Named(\"cart\")\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-
 #. Tag: para
-#: beans.xml:297
 #, no-c-format
 msgid "Now we can easily use the bean in any JSF or JSP page:"
 msgstr "Agora podemos facilmente usar o bean em qualquer página JSF ou JSP:"
 
-#. Tag: programlisting
-#: beans.xml:299
-#, no-c-format
-msgid ""
-"<![CDATA[<h:dataTable value=\"#{cart.lineItems}\" var=\"item\">\n"
-"   ...\n"
-"</h:dataTable>]]>"
-msgstr ""
-"<![CDATA[<h:dataTable value=\"#{cart.lineItems}\" var=\"item\">\n"
-"   ...\n"
-"</h:dataTable>]]>"
-
 #. Tag: para
-#: beans.xml:302
 #, no-c-format
 msgid ""
 "The <literal>@Named</literal> annotation is not what makes the class a bean. "
@@ -738,7 +564,6 @@
 "a partir da EL, mais comumente a partir de uma visão JSF."
 
 #. Tag: para
-#: beans.xml:309
 #, no-c-format
 msgid ""
 "We can let CDI choose a name for us by leaving off the value of the "
@@ -747,18 +572,7 @@
 "Nós podemos deixar o CDI escolher um nome para nós, deixando de fora o valor "
 "da anotação <literal>@Named</literal>:"
 
-#. Tag: programlisting
-#: beans.xml:313
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-"<![CDATA[public @SessionScoped @Named\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-
 #. Tag: para
-#: beans.xml:315
 #, no-c-format
 msgid ""
 "The name defaults to the unqualified class name, decapitalized; in this "
@@ -768,13 +582,11 @@
 "caso, <literal>shoppingCart</literal>."
 
 #. Tag: title
-#: beans.xml:325
 #, no-c-format
 msgid "Alternatives"
 msgstr "Alternativos"
 
 #. Tag: para
-#: beans.xml:327
 #, no-c-format
 msgid ""
 "We've already seen how qualifiers let us choose between multiple "
@@ -793,25 +605,14 @@
 "<emphasis>alternativa</emphasis> seria declarar a classe de bean com a "
 "anotação <literal>@Alternative</literal>."
 
-#. Tag: programlisting
-#: beans.xml:335
-#, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class MockPaymentProcessor extends PaymentProcessorImpl { ... }]]>"
-msgstr ""
-"<![CDATA[public @Alternative\n"
-"class MockPaymentProcessor extends PaymentProcessorImpl { ... }]]>"
-
 #. Tag: para
-#: beans.xml:337
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "We normally annotate a bean <literal>@Alternative</literal> only when there "
 "is some other implementation of an interface it implements (or of any of its "
 "bean types). We can choose between alternatives at deployment time by "
 "<emphasis>selecting</emphasis> an alternative in the CDI deployment "
-"descriptor <literal>META-INF/beans.xml</literal> of the JAR or Java EE "
+"descriptor <literal>META-INF/beans.xml</literal> of the jar or Java EE "
 "module that uses it. Different modules can specify that they use different "
 "alternatives."
 msgstr ""
@@ -824,22 +625,19 @@
 "podem especificar que eles usam diferentes alternativas."
 
 #. Tag: para
-#: beans.xml:345
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"We cover alternatives in more detail in <xref linkend=\"alternatives\"/>."
+"We cover alternatives in more detail in <xref linkend=\"alternatives\" />."
 msgstr ""
 "Nós cobriremos os alternativos em mais detalhes na <xref linkend="
 "\"alternatives\"/>."
 
 #. Tag: title
-#: beans.xml:352
 #, no-c-format
 msgid "Interceptor binding types"
 msgstr "Tipos para vinculação de interceptador"
 
 #. Tag: para
-#: beans.xml:354
 #, no-c-format
 msgid ""
 "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, "
@@ -855,7 +653,6 @@
 "disso? Bem, bastante realmente. Vamos dar algumas explicações."
 
 #. Tag: para
-#: beans.xml:361
 #, no-c-format
 msgid ""
 "The way that interceptors were defined in Java EE 5 was counter-intuitive. "
@@ -884,7 +681,6 @@
 "um problema."
 
 #. Tag: para
-#: beans.xml:372
 #, no-c-format
 msgid ""
 "CDI provides a new approach to binding interceptors to beans that introduces "
@@ -898,7 +694,6 @@
 "que descreve o comportamento implementado pelo interceptador."
 
 #. Tag: para
-#: beans.xml:378
 #, no-c-format
 msgid ""
 "An interceptor binding type is a user-defined annotation that is itself "
@@ -911,24 +706,7 @@
 "Isto nos permite vincular as classes de interceptador a classes de bean com "
 "nenhuma dependência direta entre as duas classes."
 
-#. Tag: programlisting
-#: beans.xml:383
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Inherited\n"
-"@Target( { TYPE, METHOD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBinding\n"
-"@Inherited\n"
-"@Target( { TYPE, METHOD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-
 #. Tag: para
-#: beans.xml:385
 #, no-c-format
 msgid ""
 "The interceptor that implements transaction management declares this "
@@ -937,18 +715,7 @@
 "O interceptador que implementa o gerenciamento de transação declara esta "
 "anotação:"
 
-#. Tag: programlisting
-#: beans.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[public @Transactional @Interceptor\n"
-"class TransactionInterceptor { ... }]]>"
-msgstr ""
-"<![CDATA[public @Transactional @Interceptor\n"
-"class TransactionInterceptor { ... }]]>"
-
 #. Tag: para
-#: beans.xml:391
 #, no-c-format
 msgid ""
 "We can apply the interceptor to a bean by annotating the bean class with the "
@@ -957,18 +724,7 @@
 "Podemos aplicar o interceptador em um bean anotando a classe de bean com o "
 "mesmo tipo para vinculação de interceptador."
 
-#. Tag: programlisting
-#: beans.xml:395
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Transactional\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-"<![CDATA[public @SessionScoped @Transactional\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-
 #. Tag: para
-#: beans.xml:397
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
@@ -979,13 +735,12 @@
 "<literal>TransactionInterceptor</literal> não sabem nada sobre o outro."
 
 #. Tag: para
-#: beans.xml:402
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Interceptors are deployment-specific. (We don't need a "
 "<literal>TransactionInterceptor</literal> in our unit tests!) By default, an "
 "interceptor is disabled. We can enable an interceptor using the CDI "
-"deployment descriptor <literal>META-INF/beans.xml</literal> of the JAR or "
+"deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or "
 "Java EE module. This is also where we specify the interceptor ordering."
 msgstr ""
 "Interceptadores são específicos de implantação. (Não precisamos de um "
@@ -995,23 +750,20 @@
 "beans.xml</literal> do JAR ou módulo Java EE."
 
 #. Tag: para
-#: beans.xml:409
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
-"\"interceptors\"/> and <xref linkend=\"decorators\"/>."
+"\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 "Discutiremos sobre interceptadores, e seus primos decoradores, no <xref "
 "linkend=\"interceptors\"/> e <xref linkend=\"decorators\"/>."
 
 #. Tag: title
-#: beans.xml:419
 #, no-c-format
 msgid "What kinds of classes are beans?"
 msgstr "Quais categorias de classes são beans?"
 
 #. Tag: para
-#: beans.xml:421
 #, no-c-format
 msgid ""
 "We've already seen two types of beans: JavaBeans and EJB session beans. Is "
@@ -1023,13 +775,11 @@
 "categorias de beans que implementações CDI devem suportar sem modificações."
 
 #. Tag: title
-#: beans.xml:428
 #, no-c-format
 msgid "Managed beans"
 msgstr "Managed beans"
 
 #. Tag: para
-#: beans.xml:430
 #, no-c-format
 msgid ""
 "A managed bean is a Java class. The basic lifecycle and semantics of a "
@@ -1047,20 +797,17 @@
 "satisfaz as seguintes condições como um managed bean:"
 
 #. Tag: para
-#: beans.xml:441
 #, no-c-format
 msgid "It is not a non-static inner class."
 msgstr "Ela não é uma classe interna não-estática."
 
 #. Tag: para
-#: beans.xml:444
 #, no-c-format
 msgid "It is a concrete class, or is annotated <literal>@Decorator</literal>."
 msgstr ""
 "Ela é uma classe concreta, ou é anotada com <literal>@Decorator</literal>."
 
 #. Tag: para
-#: beans.xml:447
 #, no-c-format
 msgid ""
 "It is not annotated with an EJB component-defining annotation or declared as "
@@ -1070,7 +817,6 @@
 "declarada como classe de bean em <literal>ejb-jar.xml</literal>."
 
 #. Tag: para
-#: beans.xml:453
 #, no-c-format
 msgid ""
 "It does not implement <literal>javax.enterprise.inject.spi.Extension</"
@@ -1079,27 +825,35 @@
 "Ela não implementa <literal>javax.enterprise.inject.spi.Extension</literal>."
 
 #. Tag: para
-#: beans.xml:456
-#, no-c-format
-msgid "It has an appropriate constructor&#8212;either:"
+#, fuzzy, no-c-format
+msgid "It has an appropriate constructor—either:"
 msgstr "Ela tem um construtor apropriado&#8212;ou seja:"
 
 #. Tag: para
-#: beans.xml:461
 #, no-c-format
 msgid "the class has a constructor with no parameters, or"
 msgstr "a classe possui um construtor sem parâmetros, ou"
 
 #. Tag: para
-#: beans.xml:464
 #, no-c-format
 msgid "the class declares a constructor annotated <literal>@Inject</literal>."
 msgstr "a classe declara um construtor anotado com <literal>@Inject</literal>."
 
 #. Tag: para
-#: beans.xml:472
 #, no-c-format
 msgid ""
+"According to this definition, JPA entities are technically managed beans. "
+"However, entities have their own special lifecycle, state and identity model "
+"and are usually instantiated by JPA or using <literal>new</literal>. "
+"Therefore we don't recommend directly injecting an entity class. We "
+"especially recommend against assigning a scope other than "
+"<literal>@Dependent</literal> to an entity class, since JPA is not able to "
+"persist injected CDI proxies."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The unrestricted set of bean types for a managed bean contains the bean "
 "class, every superclass and all interfaces it implements directly or "
 "indirectly."
@@ -1109,7 +863,6 @@
 "implementa diretamente ou indiretamente."
 
 #. Tag: para
-#: beans.xml:475
 #, no-c-format
 msgid ""
 "If a managed bean has a public field, it must have the default scope "
@@ -1119,7 +872,6 @@
 "<literal>@Dependent</literal>."
 
 #. Tag: para
-#: beans.xml:477
 #, no-c-format
 msgid ""
 "Managed beans support the <literal>@PostConstruct</literal> and "
@@ -1129,7 +881,6 @@
 "<literal>@PreDestroy</literal> de seu ciclo de vida."
 
 #. Tag: para
-#: beans.xml:480
 #, no-c-format
 msgid ""
 "Session beans are also, technically, managed beans. However, since they have "
@@ -1143,13 +894,11 @@
 "fazem parte de uma categoria diferente de beans."
 
 #. Tag: title
-#: beans.xml:489
 #, no-c-format
 msgid "Session beans"
 msgstr "Session beans"
 
 #. Tag: para
-#: beans.xml:491
 #, no-c-format
 msgid ""
 "Session beans belong to the EJB specification. They have a special "
@@ -1169,7 +918,6 @@
 "observando um evento disparado por um session bean, e assim por diante."
 
 #. Tag: para
-#: beans.xml:500
 #, no-c-format
 msgid ""
 "Message-driven and entity beans are by nature non-contextual objects and may "
@@ -1187,7 +935,6 @@
 "mesmo aqueles que não são instâncias contextuais."
 
 #. Tag: para
-#: beans.xml:508
 #, no-c-format
 msgid ""
 "The unrestricted set of bean types for a session bean contains all local "
@@ -1206,7 +953,6 @@
 "tipos de bean."
 
 #. Tag: para
-#: beans.xml:516
 #, no-c-format
 msgid ""
 "There's no reason to explicitly declare the scope of a stateless session "
@@ -1222,16 +968,15 @@
 "lado, um stateful session bean pode possuir qualquer escopo."
 
 #. Tag: para
-#: beans.xml:520
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Stateful session beans may define a <emphasis>remove method</emphasis>, "
 "annotated <literal>@Remove</literal>, that is used by the application to "
 "indicate that an instance should be destroyed. However, for a contextual "
-"instance of the bean&#8212;an instance under the control of CDI&#8212;this "
-"method may only be called by the application if the bean has scope "
-"<literal>@Dependent</literal>. For beans with other scopes, the application "
-"must let the container destroy the bean."
+"instance of the bean—an instance under the control of CDI—this method may "
+"only be called by the application if the bean has scope <literal>@Dependent</"
+"literal>. For beans with other scopes, the application must let the "
+"container destroy the bean."
 msgstr ""
 "Stateful session beans podem definir um <emphasis>método de remoção</"
 "emphasis>, anotado com <literal>@Remove</literal>, que é utilizado pela "
@@ -1242,7 +987,6 @@
 "aplicação deve deixar o contêiner destruir o bean."
 
 #. Tag: para
-#: beans.xml:528
 #, no-c-format
 msgid ""
 "So, when should we use a session bean instead of a plain managed bean? "
@@ -1253,19 +997,16 @@
 "EJB, tais como:"
 
 #. Tag: para
-#: beans.xml:535
 #, no-c-format
 msgid "method-level transaction management and security,"
 msgstr "gerenciamento de transação e segurança em nível de método,"
 
 #. Tag: para
-#: beans.xml:538
 #, no-c-format
 msgid "concurrency management,"
 msgstr "gerenciamento de concorrência,"
 
 #. Tag: para
-#: beans.xml:541
 #, no-c-format
 msgid ""
 "instance-level passivation for stateful session beans and instance-pooling "
@@ -1275,19 +1016,16 @@
 "instâncias para stateless session beans,"
 
 #. Tag: para
-#: beans.xml:545
 #, no-c-format
 msgid "remote or web service invocation, or"
 msgstr "invocação remota ou de serviço web, ou"
 
 #. Tag: para
-#: beans.xml:548
 #, no-c-format
 msgid "timers and asynchronous methods,"
 msgstr "temporizadores e métodos assíncronos."
 
 #. Tag: para
-#: beans.xml:552
 #, no-c-format
 msgid ""
 "When we don't need any of these things, an ordinary managed bean will serve "
@@ -1297,7 +1035,6 @@
 "servirá muito bem."
 
 #. Tag: para
-#: beans.xml:554
 #, no-c-format
 msgid ""
 "Many beans (including any <literal>@SessionScoped</literal> or "
@@ -1312,7 +1049,6 @@
 "devem ser EJBs."
 
 #. Tag: para
-#: beans.xml:560
 #, no-c-format
 msgid ""
 "Beans which hold references to heavy-weight resources, or hold a lot of "
@@ -1326,7 +1062,6 @@
 "suporte a passivação e pooling de instâncias."
 
 #. Tag: para
-#: beans.xml:566
 #, no-c-format
 msgid ""
 "Finally, it's usually obvious when method-level transaction management, "
@@ -1338,7 +1073,6 @@
 "métodos assíncronos são utilizados."
 
 #. Tag: para
-#: beans.xml:571
 #, no-c-format
 msgid ""
 "The point we're trying to make is: use a session bean when you need the "
@@ -1358,7 +1092,6 @@
 "literal>, <literal>@Stateful</literal> ou <literal>@Singleton</literal>."
 
 #. Tag: para
-#: beans.xml:579
 #, no-c-format
 msgid ""
 "On the other hand, don't be scared to use session beans just because you've "
@@ -1379,13 +1112,11 @@
 "\"pesado\"."
 
 #. Tag: title
-#: beans.xml:590
 #, no-c-format
 msgid "Producer methods"
 msgstr "Métodos produtores"
 
 #. Tag: para
-#: beans.xml:592
 #, no-c-format
 msgid ""
 "Not everything that needs to be injected can be boiled down to a bean class "
@@ -1404,7 +1135,6 @@
 "consulta JPA?"
 
 #. Tag: para
-#: beans.xml:600
 #, no-c-format
 msgid ""
 "A <emphasis>producer method</emphasis> is a method that acts as a source of "
@@ -1420,7 +1150,6 @@
 "aplicação tome o controle total do processo de instanciação do bean."
 
 #. Tag: para
-#: beans.xml:607
 #, no-c-format
 msgid ""
 "A producer method is declared by annotating a method of a bean class with "
@@ -1429,45 +1158,17 @@
 "Um método produtor é declarado anotando um método de uma classe de bean com "
 "a anotação <literal>@Produces</literal>."
 
-#. Tag: programlisting
-#: beans.xml:612
-#, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class RandomNumberGenerator {\n"
-"   \n"
-"   private Random random = new Random(System.currentTimeMillis());\n"
-"       \n"
-"   @Produces @Named @Random int getRandomNumber() {\n"
-"      return random.nextInt(100);\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped\n"
-"public class RandomNumberGenerator {\n"
-"   \n"
-"   private Random random = new Random(System.currentTimeMillis());\n"
-"       \n"
-"   @Produces @Named @Random int getRandomNumber() {\n"
-"      return random.nextInt(100);\n"
-"   }\n"
-"   \n"
-"}]]>"
-
 #. Tag: para
-#: beans.xml:614
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "We can't write a bean class that is itself a random number. But we can "
 "certainly write a method that returns a random number. By making the method "
-"a producer method, we allow the return value of the method&#8212;in this "
-"case an <literal>Integer</literal>&#8212;to be injected. We can even specify "
-"a qualifier&#8212;in this case <literal>@Random</literal>, a scope&#8212;"
-"which in this case defaults to <literal>@Dependent</literal>, and an EL "
-"name&#8212;which in this case defaults to <literal>randomNumber</literal> "
-"according to the JavaBeans property name convention. Now we can get a random "
-"number anywhere:"
+"a producer method, we allow the return value of the method—in this case an "
+"<literal>Integer</literal>—to be injected. We can even specify a qualifier—"
+"in this case <literal>@Random</literal>, a scope—which in this case defaults "
+"to <literal>@Dependent</literal>, and an EL name—which in this case defaults "
+"to <literal>randomNumber</literal> according to the JavaBeans property name "
+"convention. Now we can get a random number anywhere:"
 msgstr ""
 "Não podemos escrever uma classe de bean que é ela própria um número "
 "aleatório. Mas podemos certamente escrever um método que retorna um número "
@@ -1480,26 +1181,12 @@
 "para nome de propriedades. Agora podemos obter um número aleatório em "
 "qualquer lugar:"
 
-#. Tag: programlisting
-#: beans.xml:623
-#, no-c-format
-msgid "<![CDATA[@Inject @Random int randomNumber;]]>"
-msgstr "<![CDATA[@Inject @Random int randomNumber;]]>"
-
 #. Tag: para
-#: beans.xml:625
 #, no-c-format
 msgid "Even in a Unified EL expression:"
 msgstr "Até mesmo em uma expressão Unified EL:"
 
-#. Tag: programlisting
-#: beans.xml:629
-#, no-c-format
-msgid "<![CDATA[<p>Your raffle number is #{randomNumber}.</p>]]>"
-msgstr "<![CDATA[<p>Your raffle number is #{randomNumber}.</p>]]>"
-
 #. Tag: para
-#: beans.xml:631
 #, no-c-format
 msgid ""
 "A producer method must be a non-abstract method of a managed bean class or "
@@ -1513,14 +1200,12 @@
 "método de negócio do EJB ou um método estático da classe do bean."
 
 #. Tag: para
-#: beans.xml:637
 #, no-c-format
 msgid "The bean types of a producer method depend upon the method return type:"
 msgstr ""
 "Os tipos de bean de um método produtor depende do tipo de retorno do método:"
 
 #. Tag: para
-#: beans.xml:643
 #, no-c-format
 msgid ""
 "If the return type is an interface, the unrestricted set of bean types "
@@ -1532,7 +1217,6 @@
 "indiretamente e <literal>java.lang.Object</literal>."
 
 #. Tag: para
-#: beans.xml:649
 #, no-c-format
 msgid ""
 "If a return type is primitive or is a Java array type, the unrestricted set "
@@ -1544,7 +1228,6 @@
 "retorno do método e <literal>java.lang.Object</literal>."
 
 #. Tag: para
-#: beans.xml:655
 #, no-c-format
 msgid ""
 "If the return type is a class, the unrestricted set of bean types contains "
@@ -1556,75 +1239,56 @@
 "implementadas direta ou indiretamente."
 
 #. Tag: para
-#: beans.xml:662
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
+"Producer methods and fields may have a primitive bean type. For the purpose "
+"of resolving dependencies, primitive types are considered to be identical to "
+"their corresponding wrapper types in <literal>java.lang</literal>."
+msgstr ""
+"A maioria dos tipos de bean você pode provavelmente descobrir. Uma pegadinha "
+"são os tipos primitivos. Todos os tipos primitivos são assumidos como "
+"idênticos aos seus correspondentes tipos adaptadores em <literal>java.lang</"
+"literal>."
+
+#. Tag: para
+#, fuzzy, no-c-format
+msgid ""
 "If the producer method has method parameters, the container will look for a "
 "bean that satisfies the type and qualifiers of each parameter and pass it to "
-"the method automatically&#8212;another form of dependency injection."
+"the method automatically—another form of dependency injection."
 msgstr ""
 "Se o método produtor possuir parâmetros, o contêiner buscará por um bean que "
 "satisfaça o tipo e os qualificadores de cada parâmetro e os passará para o "
 "método automaticamente&#8212;uma outra forma de injeção de dependência."
 
-#. Tag: programlisting
-#: beans.xml:668
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces Set<Roles> getRoles(User user) {\n"
-"   return user.getRoles();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces Set<Roles> getRoles(User user) {\n"
-"   return user.getRoles();\n"
-"}]]>"
-
 #. Tag: para
-#: beans.xml:670
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "We'll talk much more about producer methods in <xref linkend="
-"\"producermethods\"/>."
+"\"producermethods\" />."
 msgstr ""
 "Falaremos mais sobre métodos produtores no <xref linkend=\"producermethods\"/"
 ">."
 
 #. Tag: title
-#: beans.xml:675
 #, no-c-format
 msgid "Producer fields"
 msgstr "Campos produtores"
 
 #. Tag: para
-#: beans.xml:677
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>producer field</emphasis> is a simpler alternative to a producer "
 "method. A producer field is declared by annotating a field of a bean class "
-"with the <literal>@Produces</literal> annotation&#8212;the same annotation "
-"used for producer methods."
+"with the <literal>@Produces</literal> annotation—the same annotation used "
+"for producer methods."
 msgstr ""
 "Um <emphasis>campo produtor</emphasis> é uma alternativa mais simples para "
 "um método produtor. Um campo produtor é declarado ao anotar um campo de uma "
 "classe de bean com a anotação <literal>@Produces</literal>&#8212;a mesma "
 "anotação usada pelos métodos produtores."
 
-#. Tag: programlisting
-#: beans.xml:683
-#, no-c-format
-msgid ""
-"<![CDATA[public class Shop {\n"
-"   @Produces PaymentProcessor paymentProcessor = ....;\n"
-"   @Produces @Catalog List<Product> products = ....;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Shop {\n"
-"   @Produces PaymentProcessor paymentProcessor = ....;\n"
-"   @Produces @Catalog List<Product> products = ....;\n"
-"}]]>"
-
 #. Tag: para
-#: beans.xml:685
 #, no-c-format
 msgid ""
 "The rules for determining the bean types of a producer field parallel the "
@@ -1634,14 +1298,13 @@
 "assemelham-se às regras para métodos produtores."
 
 #. Tag: para
-#: beans.xml:689
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A producer field is really just a shortcut that lets us avoid writing a "
 "useless getter method. However, in addition to convenience, producer fields "
 "serve a specific purpose as an adaptor for Java EE component environment "
 "injection, but to learn more about that, you'll have to wait until <xref "
-"linkend=\"resources\"/>. Because we can't wait to get to work on some "
+"linkend=\"resources\" />. Because we can't wait to get to work on some "
 "examples."
 msgstr ""
 "Um campo produtor é realmente apenas um atalho que nos permite evitar "
@@ -1651,404 +1314,181 @@
 "isto, você terá que aguardar até o <xref linkend=\"resources\"/>. Porque não "
 "podemos esperar para começar a trabalhar em alguns exemplos."
 
-#. Tag: title
-#: beans.xml:701
-#, no-c-format
-msgid "The (minimal) bean descriptor"
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[public class BookShop \n"
+#~ "      extends Business \n"
+#~ "      implements Shop<Book> {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class BookShop \n"
+#~ "      extends Business \n"
+#~ "      implements Shop<Book> {\n"
+#~ "   ...\n"
+#~ "}]]>"
 
-#. Tag: para
-#: beans.xml:703
-#, no-c-format
-msgid ""
-"First, it's important to understand that the XML bean descriptor in CDI "
-"(beans.xml) is not there to define beans in XML, like in other popular bean "
-"containers. Rather, you use this file to enable CDI services for the current "
-"bean archive that is difficult to define consistently in Java or which you "
-"don't want to define in Java (e.g., to accomodate testing)."
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[@Stateful\n"
+#~ "public class BookShopBean \n"
+#~ "      extends Business \n"
+#~ "      implements BookShop, Auditable {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateful\n"
+#~ "public class BookShopBean \n"
+#~ "      extends Business \n"
+#~ "      implements BookShop, Auditable {\n"
+#~ "   ...\n"
+#~ "}]]>"
 
-#. Tag: para
-#: beans.xml:710
-#, no-c-format
-msgid ""
-"For example, the XML is used to enable interceptors (which are disabled by "
-"default) and define interceptor ordering. So the bean descriptor "
-"<emphasis>complements</emphasis> the metadata that is provided in the Java "
-"language syntax. (You may still want to define beans in XML for other "
-"reasons, but that is the concern of an extension)."
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[@Typed(Shop.class)\n"
+#~ "public class BookShop \n"
+#~ "      extends Business \n"
+#~ "      implements Shop<Book> {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Typed(Shop.class)\n"
+#~ "public class BookShop \n"
+#~ "      extends Business \n"
+#~ "      implements Shop<Book> {\n"
+#~ "   ...\n"
+#~ "}]]>"
 
-#. Tag: para
-#: beans.xml:717
-#, no-c-format
-msgid ""
-"Let's first ask why the beans.xml is required, then look at what services it "
-"is used used to enable."
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface CreditCard {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface CreditCard {}]]>"
 
-#. Tag: title
-#: beans.xml:722
-#, no-c-format
-msgid "Why is beans.xml required?"
-msgstr ""
+#~ msgid "<![CDATA[@Inject @CreditCard PaymentProcessor paymentProcessor]]>"
+#~ msgstr "<![CDATA[@Inject @CreditCard PaymentProcessor paymentProcessor]]>"
 
-#. Tag: para
-#: beans.xml:724
-#, no-c-format
-msgid ""
-"You may be wondering, if beans are not described using XML, why do we need "
-"beans.xml at all, particularly if you don't have anything that you would "
-"need the bean descriptor to enable (alternatives, interceptors or "
-"decorators)?"
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[@CreditCard\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "    implements PaymentProcessor { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@CreditCard\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "    implements PaymentProcessor { ... }]]>"
 
-#. Tag: para
-#: beans.xml:730
-#, no-c-format
-msgid "There are two things about CDI that we need to keep in mind:"
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[public @SessionScoped\n"
+#~ "class ShoppingCart implements Serializable { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @SessionScoped\n"
+#~ "class ShoppingCart implements Serializable { ... }]]>"
 
-#. Tag: para
-#: beans.xml:736
-#, no-c-format
-msgid ""
-"CDI does not require any special declaration for a Java class to be injected "
-"- that's right, no annotation or XML declaration at all!"
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[public @SessionScoped @Named(\"cart\")\n"
+#~ "class ShoppingCart implements Serializable { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @SessionScoped @Named(\"cart\")\n"
+#~ "class ShoppingCart implements Serializable { ... }]]>"
 
-#. Tag: para
-#: beans.xml:742
-#, no-c-format
-msgid ""
-"CDI does not define any special kind of module - CDI beans can be deployed "
-"in a library JAR, EJB JAR, WAR, RAR, or JVM classpath directory."
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[<h:dataTable value=\"#{cart.lineItems}\" var=\"item\">\n"
+#~ "   ...\n"
+#~ "</h:dataTable>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<h:dataTable value=\"#{cart.lineItems}\" var=\"item\">\n"
+#~ "   ...\n"
+#~ "</h:dataTable>]]>"
 
-#. Tag: para
-#: beans.xml:749
-#, no-c-format
-msgid ""
-"The CDI specification calls the process of identifying beans in modules "
-"<emphasis>bean discovery</emphasis>."
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[public @SessionScoped @Named\n"
+#~ "class ShoppingCart implements Serializable { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @SessionScoped @Named\n"
+#~ "class ShoppingCart implements Serializable { ... }]]>"
 
-#. Tag: para
-#: beans.xml:753
-#, no-c-format
-msgid ""
-"So there are potentially a lot of classes in the classpath which might be "
-"beans! We don't want to force the container to scan every one of those "
-"classes at startup and build its internal metamodel for each of them. This "
-"really could make bean discovery very slow."
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class MockPaymentProcessor extends PaymentProcessorImpl { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class MockPaymentProcessor extends PaymentProcessorImpl { ... }]]>"
 
-#. Tag: para
-#: beans.xml:759
-#, no-c-format
-msgid ""
-"But there's another reason we need to give the user some control over which "
-"classes are available for injection. We don't want every class in the "
-"classpath to potentially match an injection point, including classes that "
-"were never intended to be injected into things. This would force the "
-"developer to have to use qualifiers much more often to disambiguate "
-"injection points."
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Inherited\n"
+#~ "@Target( { TYPE, METHOD })\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Inherited\n"
+#~ "@Target( { TYPE, METHOD })\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
 
-#. Tag: para
-#: beans.xml:766
-#, no-c-format
-msgid "So we have two choices. We could have the developer:"
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[public @Transactional @Interceptor\n"
+#~ "class TransactionInterceptor { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @Transactional @Interceptor\n"
+#~ "class TransactionInterceptor { ... }]]>"
 
-#. Tag: para
-#: beans.xml:772
-#, no-c-format
-msgid "explicitly exclude modules which do not contain beans, or"
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[public @SessionScoped @Transactional\n"
+#~ "class ShoppingCart implements Serializable { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @SessionScoped @Transactional\n"
+#~ "class ShoppingCart implements Serializable { ... }]]>"
 
-#. Tag: para
-#: beans.xml:775
-#, no-c-format
-msgid "explicitly declare modules which do contain beans."
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped\n"
+#~ "public class RandomNumberGenerator {\n"
+#~ "   \n"
+#~ "   private Random random = new Random(System.currentTimeMillis());\n"
+#~ "       \n"
+#~ "   @Produces @Named @Random int getRandomNumber() {\n"
+#~ "      return random.nextInt(100);\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped\n"
+#~ "public class RandomNumberGenerator {\n"
+#~ "   \n"
+#~ "   private Random random = new Random(System.currentTimeMillis());\n"
+#~ "       \n"
+#~ "   @Produces @Named @Random int getRandomNumber() {\n"
+#~ "      return random.nextInt(100);\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "}]]>"
 
-#. Tag: para
-#: beans.xml:779
-#, no-c-format
-msgid ""
-"It should be clear that the second option is a much better way to go. Thus, "
-"CDI has the notion of a bean archive. A bean archive is just a module that "
-"has a file named beans.xml in the META-INF directory. The container looks "
-"for beans in bean archives. It ignores other modules."
-msgstr ""
+#~ msgid "<![CDATA[@Inject @Random int randomNumber;]]>"
+#~ msgstr "<![CDATA[@Inject @Random int randomNumber;]]>"
 
-#. Tag: para
-#: beans.xml:785
-#, no-c-format
-msgid ""
-"Now, you might be wondering if we've got the granularity wrong here. Why "
-"should module be the right criteria to use for including/excluding a class. "
-"Why not consider:"
-msgstr ""
+#~ msgid "<![CDATA[<p>Your raffle number is #{randomNumber}.</p>]]>"
+#~ msgstr "<![CDATA[<p>Your raffle number is #{randomNumber}.</p>]]>"
 
-#. Tag: para
-#: beans.xml:792
-#, no-c-format
-msgid "a class-level annotation,"
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[@Produces Set<Roles> getRoles(User user) {\n"
+#~ "   return user.getRoles();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces Set<Roles> getRoles(User user) {\n"
+#~ "   return user.getRoles();\n"
+#~ "}]]>"
 
-#. Tag: para
-#: beans.xml:795
-#, no-c-format
-msgid "the package,"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:798
-#, no-c-format
-msgid "some type it implements or extends, or"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:801
-#, no-c-format
-msgid "some naming convention."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:805
-#, no-c-format
-msgid ""
-"We've got the first option covered. Annotate a bean <literal>@Alternative</"
-"literal>, or with an alternative stereotype, and it will be considered "
-"disabled by CDI, as long as you don't explicitly enable it in beans.xml. "
-"That's not quite the same thing as excluding the class from scanning "
-"altogether, but it's close. (One difference is that a portable extension "
-"with still get a <literal>ProcessAnnotatedType</literal> event for that "
-"class)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:813
-#, no-c-format
-msgid ""
-"A future version of CDI might allow you to declare excluded packages in "
-"beans.xml. Excluding a bean by type or naming convention isn't really that "
-"appealing. In the world of CDI, we use stereotypes for identifying "
-"architectural roles. We don't use marker interfaces or naming conventions. "
-"Names really shouldn't affect functionality as it is too fragile."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:820
-#, no-c-format
-msgid "Enough theory, what elements are available in beans.xml?"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:826
-#, no-c-format
-msgid "Bean descriptor schema"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:828
-#, no-c-format
-msgid ""
-"If you don't need to activate any interceptors, decorators or alternatives "
-"(you just have plain beans that you need to use in an archive), the beans."
-"xml file can be <emphasis>empty</emphasis>. If you do have one of these "
-"requirements, then you need to start popularing the descriptor."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:834
-#, no-c-format
-msgid ""
-"The root element of a beans.xml file is <literal>beans</literal>, with the "
-"following <ulink url=\"http://anonsvn.jboss.org/repos/weld/api/trunk/cdi/src/"
-"main/resources/beans.xsd\">schema</ulink>:"
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:839
-#, no-c-format
-msgid ""
-"<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<beans xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee \n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"</beans>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:841
-#, no-c-format
-msgid ""
-"The <literal>beans</literal> element can have one or more of each of the "
-"following children:"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:847
-#, no-c-format
-msgid "interceptors"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:850
-#, no-c-format
-msgid "decorators"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:853
-#, no-c-format
-msgid "alternatives"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:857
-#, no-c-format
-msgid "Let's look at each element in detail."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:862
-#, no-c-format
-msgid "&lt;interceptors&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:864
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled interceptors bound via interceptor "
-"bindings. An interceptor must be explicitly enabled by listing the fully "
-"qualified class name in a child &lt;class&gt; element of &lt;"
-"interceptors&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:870
-#, no-c-format
-msgid ""
-"There may be zero or more interceptor class elements. The order of the class "
-"declarations determines the interceptor ordering. Interceptors which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an interceptor "
-"class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:877
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.intercept.SecurityInterceptor</class>\n"
-"   <class>com.acme.intercept.TransactionInterceptor</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:883
-#, no-c-format
-msgid "&lt;decorators&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:885
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled decorators. A decorator must be "
-"explicitly enabled by listing the fully qualified class name in a child &lt;"
-"class&gt; element of &lt;decorators&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:891
-#, no-c-format
-msgid ""
-"There may be zero or more decorator class elements. The order of the class "
-"declarations determines the decorator ordering. Decorators which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an decorator class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:898
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.decorate.BigAccountDecorator</class>\n"
-"   <class>com.acme.decorate.SpecialGiftDecorator</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:903
-#, no-c-format
-msgid "&lt;alternatives&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:905
-#, no-c-format
-msgid ""
-"An alternative is a bean that must be explicitly declared in the beans.xml "
-"file if it should be available for lookup, injection or EL resolution. By "
-"default, a bean archive has no active alternatives. An alternative must be "
-"explicitly declared using the fully qualified bean class name or stereotype "
-"class name in either a child &lt;class&gt; or &lt;stereotype&gt; element of "
-"&lt;alternatives&gt;, respectively."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:913
-#, no-c-format
-msgid ""
-"An alternative is selected for the bean archive if either: the alternative "
-"is a managed bean or session bean and the bean class of the bean is listed, "
-"or the alternative is a producer method, field or resource, and the bean "
-"class that declares the method or field is listed, or any "
-"<literal>@Alternative</literal> stereotype of the alternative is listed."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:920
-#, no-c-format
-msgid ""
-"There may be zero or more alternative bean class elements. The same class "
-"may not be listed twice. And of course, the class must exist and it must be "
-"an alternative bean class."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:925
-#, no-c-format
-msgid ""
-"There may also be zero or more <literal>@Alternative</literal> stereotype "
-"elements. The same stereotype may not be listed twice. And of course, the "
-"stereotype class must exist and it must be an stereotype annotation."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:931
-#, no-c-format
-msgid ""
-"<![CDATA[<stereotypes>\n"
-"   <class>com.acme.business.MockPaymentProcessor</class>\n"
-"   <stereotype>com.acme.stereotype.Mock</stereotype>\n"
-"</stereotypes>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:935
-#, no-c-format
-msgid ""
-"And that's it! A very simple schema, used only to activate and order CDI "
-"services."
-msgstr ""
+#~ msgid ""
+#~ "<![CDATA[public class Shop {\n"
+#~ "   @Produces PaymentProcessor paymentProcessor = ....;\n"
+#~ "   @Produces @Catalog List<Product> products = ....;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Shop {\n"
+#~ "   @Produces PaymentProcessor paymentProcessor = ....;\n"
+#~ "   @Produces @Catalog List<Product> products = ....;\n"
+#~ "}]]>"

Modified: doc/trunk/reference/pt-BR/decorators.po
===================================================================
--- doc/trunk/reference/pt-BR/decorators.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/decorators.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2010-01-07 10:22-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: decorators.xml:5
 #, no-c-format
 msgid "Decorators"
 msgstr "Decoradores"
 
 #. Tag: para
-#: decorators.xml:7
 #, no-c-format
 msgid ""
 "Interceptors are a powerful way to capture and separate concerns which are "
@@ -41,7 +39,6 @@
 "separação de questões relacionadas a negócios."
 
 #. Tag: para
-#: decorators.xml:15
 #, no-c-format
 msgid ""
 "The reverse is true of <emphasis>decorators</emphasis>. A decorator "
@@ -66,31 +63,11 @@
 "onde decoradores são bem convenientes."
 
 #. Tag: para
-#: decorators.xml:24
 #, no-c-format
 msgid "Suppose we have an interface that represents accounts:"
 msgstr "Suponha que temos uma interface que represente contas:"
 
-#. Tag: programlisting
-#: decorators.xml:26
-#, no-c-format
-msgid ""
-"<![CDATA[public interface Account {\n"
-"   public BigDecimal getBalance();\n"
-"   public User getOwner();\n"
-"   public void withdraw(BigDecimal amount);\n"
-"   public void deposit(BigDecimal amount);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface Account {\n"
-"   public BigDecimal getBalance();\n"
-"   public User getOwner();\n"
-"   public void withdraw(BigDecimal amount);\n"
-"   public void deposit(BigDecimal amount);\n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:28
 #, no-c-format
 msgid ""
 "Several different beans in our system implement the <literal>Account</"
@@ -105,7 +82,6 @@
 "decorador."
 
 #. Tag: para
-#: decorators.xml:34
 #, no-c-format
 msgid ""
 "A decorator is a bean (possibly even an abstract class) that implements the "
@@ -115,24 +91,7 @@
 "implementa o tipo que ele decora e é anotado com <literal>@Decorator</"
 "literal>."
 
-#. Tag: programlisting
-#: decorators.xml:39
-#, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   ...\n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:41
 #, no-c-format
 msgid ""
 "The decorator implements the methods of the decorated type that it wants to "
@@ -141,44 +100,7 @@
 "O decorador implementa os métodos do tipo decorado que ele deseja "
 "interceptar."
 
-#. Tag: programlisting
-#: decorators.xml:45
-#, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      ...\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      ...\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:47
 #, no-c-format
 msgid ""
 "Unlike other beans, a decorator may be an abstract class. Therefore, if "
@@ -191,7 +113,6 @@
 "método."
 
 #. Tag: para
-#: decorators.xml:52
 #, no-c-format
 msgid ""
 "Interceptors for a method are called before decorators that apply to the "
@@ -201,13 +122,11 @@
 "aplicam a esse método."
 
 #. Tag: title
-#: decorators.xml:57
 #, no-c-format
 msgid "Delegate object"
 msgstr "Objeto delegado"
 
 #. Tag: para
-#: decorators.xml:59
 #, no-c-format
 msgid ""
 "Decorators have a special injection point, called the <emphasis>delegate "
@@ -222,38 +141,17 @@
 "injeção delegado, que pode ser um parâmetro de construtor, um parâmetro de "
 "método inicializador ou um campo injetado."
 
-#. Tag: programlisting
-#: decorators.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"   ...\n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:67
 #, no-c-format
 msgid "A decorator is bound to any bean which:"
 msgstr "Um decorador é vinculado a qualquer bean que:"
 
 #. Tag: para
-#: decorators.xml:71
 #, no-c-format
 msgid "has the type of the delegate injection point as a bean type, and"
 msgstr "tenha o tipo do ponto de injeção delegado como um tipo de bean, e"
 
 #. Tag: para
-#: decorators.xml:74
 #, no-c-format
 msgid "has all qualifiers that are declared at the delegate injection point."
 msgstr ""
@@ -261,7 +159,6 @@
 "delegado."
 
 #. Tag: para
-#: decorators.xml:78
 #, no-c-format
 msgid ""
 "This delegate injection point specifies that the decorator is bound to all "
@@ -270,14 +167,7 @@
 "Este ponto de injeção delegado especifica que o decorador está vinculado a "
 "todos os beans que implementam <literal>Account</literal>:"
 
-#. Tag: programlisting
-#: decorators.xml:83
-#, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
-msgstr "<![CDATA[@Inject @Delegate @Any Account account;]]>"
-
 #. Tag: para
-#: decorators.xml:85
 #, no-c-format
 msgid ""
 "A delegate injection point may specify any number of qualifier annotations. "
@@ -287,14 +177,7 @@
 "de qualificador. O decorador só será vinculado a beans com os mesmos "
 "qualificadores."
 
-#. Tag: programlisting
-#: decorators.xml:90
-#, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
-msgstr "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
-
 #. Tag: para
-#: decorators.xml:92
 #, no-c-format
 msgid ""
 "The decorator may invoke the delegate object, which has much the same effect "
@@ -307,62 +190,12 @@
 "interceptador. A principal diferença é que o decorador pode invocar "
 "<emphasis>qualquer</emphasis> método de negócio sobre o objeto delegado."
 
-#. Tag: programlisting
-#: decorators.xml:98
-#, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      account.withdraw(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedWithdrawl(amount) );\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      account.deposit(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedDeposit(amount) );\n"
-"      }\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      account.withdraw(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedWithdrawl(amount) );\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      account.deposit(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedDeposit(amount) );\n"
-"      }\n"
-"   }\n"
-"}]]>"
-
 #. Tag: title
-#: decorators.xml:103
 #, no-c-format
 msgid "Enabling decorators"
 msgstr "Habilitando decoradores"
 
 #. Tag: para
-#: decorators.xml:105
 #, no-c-format
 msgid ""
 "By default, all decorators are disabled. We need to <emphasis>enable</"
@@ -374,34 +207,7 @@
 "xml</literal> de um arquivo de beans. Esta ativação somente se aplica aos "
 "beans neste arquivo."
 
-#. Tag: programlisting
-#: decorators.xml:111
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <decorators>\n"
-"         <class>org.mycompany.myapp.LargeTransactionDecorator</class>\n"
-"   </decorators>\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <decorators>\n"
-"         <class>org.mycompany.myapp.LargeTransactionDecorator</class>\n"
-"   </decorators>\n"
-"</beans>]]>"
-
 #. Tag: para
-#: decorators.xml:113
 #, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
@@ -411,7 +217,6 @@
 "<literal>&lt;interceptors&gt;</literal> tem para os interceptadores:"
 
 #. Tag: para
-#: decorators.xml:120
 #, no-c-format
 msgid ""
 "it enables us to specify a total ordering for all decorators in our system, "
@@ -421,9 +226,158 @@
 "nosso sistema, assegurando um comportamento determinístico, e"
 
 #. Tag: para
-#: decorators.xml:126
 #, no-c-format
 msgid "it lets us enable or disable decorator classes at deployment time."
 msgstr ""
 "isso permite habilitarmos ou desabilitarmos as classes decoradas em tempo de "
 "implantação."
+
+#~ msgid ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "   public BigDecimal getBalance();\n"
+#~ "   public User getOwner();\n"
+#~ "   public void withdraw(BigDecimal amount);\n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "   public BigDecimal getBalance();\n"
+#~ "   public User getOwner();\n"
+#~ "   public void withdraw(BigDecimal amount);\n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   ...\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "   ...\n"
+#~ "}]]>"
+
+#~ msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
+#~ msgstr "<![CDATA[@Inject @Delegate @Any Account account;]]>"
+
+#~ msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
+#~ msgstr "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      account.withdraw(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      account.deposit(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedDeposit(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      account.withdraw(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      account.deposit(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedDeposit(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<beans\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
+#~ "   <decorators>\n"
+#~ "         <class>org.mycompany.myapp.LargeTransactionDecorator</class>\n"
+#~ "   </decorators>\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<beans\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
+#~ "   <decorators>\n"
+#~ "         <class>org.mycompany.myapp.LargeTransactionDecorator</class>\n"
+#~ "   </decorators>\n"
+#~ "</beans>]]>"

Modified: doc/trunk/reference/pt-BR/dependencies.po
===================================================================
--- doc/trunk/reference/pt-BR/dependencies.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/dependencies.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-12-19 18:07-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: dependencies.xml:5
 #, no-c-format
 msgid "Weld project dependencies"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:7
 #, no-c-format
 msgid ""
 "This section lists compile-time and runtime dependencies for Weld. This list "
@@ -30,105 +28,88 @@
 msgstr ""
 
 #. Tag: title
-#: dependencies.xml:13
 #, no-c-format
 msgid "Artifacts coming from Sun"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:21 dependencies.xml:110
 #, no-c-format
 msgid "Artifact"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:24 dependencies.xml:113
 #, no-c-format
 msgid "Scope"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:33
-#, no-c-format
-msgid "javax.ejb:ejb-api:3.1"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>javax.ejb:ejb-api:3.1</literal>"
 msgstr "javax.ejb:ejb-api:3.1"
 
 #. Tag: para
-#: dependencies.xml:36 dependencies.xml:44 dependencies.xml:52
-#: dependencies.xml:60 dependencies.xml:68 dependencies.xml:76
-#: dependencies.xml:128
 #, no-c-format
 msgid "compile"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:41
-#, no-c-format
-msgid "javax.faces:jsf-api:2.0"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>javax.faces:jsf-api:2.0</literal>"
 msgstr "javax.faces:jsf-api:2.0"
 
-#. Tag: literal
-#: dependencies.xml:49
-#, no-c-format
-msgid "javax.el:el-api:2.1"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>javax.el:el-api:2.1</literal>"
 msgstr "javax.el:el-api:2.1"
 
-#. Tag: literal
-#: dependencies.xml:57
-#, no-c-format
-msgid "javax.persistence:persistence-api:2.0"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>javax.persistence:persistence-api:2.0</literal>"
 msgstr "javax.persistence:persistence-api:2.0"
 
-#. Tag: literal
-#: dependencies.xml:65
-#, no-c-format
-msgid "javax.servlet:servlet-api:3.0"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>javax.servlet:servlet-api:3.0</literal>"
 msgstr "javax.servlet:servlet-api:3.0"
 
-#. Tag: literal
-#: dependencies.xml:73
-#, no-c-format
-msgid "javax.interceptor:interceptor-api:1.1"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>javax.interceptor:interceptor-api:1.1</literal>"
 msgstr "javax.interceptor:interceptor-api:1.1"
 
-#. Tag: literal
-#: dependencies.xml:81
-#, no-c-format
-msgid "org.glasfish.web:el-impl:2.1.2"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>org.glasfish.web:el-impl:2.1.2</literal>"
 msgstr "org.glasfish.web:el-impl:2.1.2"
 
 #. Tag: para
-#: dependencies.xml:84 dependencies.xml:92
 #, no-c-format
 msgid "runtime"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:89
-#, no-c-format
-msgid "javax.faces:jsf-impl:2.0.x"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>javax.faces:jsf-impl:2.0.x</literal>"
 msgstr "javax.faces:jsf-impl:2.0.x"
 
 #. Tag: title
-#: dependencies.xml:101
 #, no-c-format
 msgid "Artifacts coming from Hibernate"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:116
 #, no-c-format
 msgid "Notes"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:125
-#, no-c-format
-msgid "javax.validation:validation-api"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>javax.validation:validation-api</literal>"
 msgstr "javax.validation:validation-api"
 
-#. Tag: ulink
-#: dependencies.xml:131
+#. Tag: para
 #, no-c-format
-msgid "BVAL-193"
+msgid ""
+"<ulink url=\"http://opensource.atlassian.com/projects/hibernate/browse/BVAL-"
+"193\">BVAL-193</ulink>"
 msgstr ""

Modified: doc/trunk/reference/pt-BR/ee.po
===================================================================
--- doc/trunk/reference/pt-BR/ee.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/ee.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-12-19 18:11-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: ee.xml:4
 #, no-c-format
 msgid "Java EE integration"
 msgstr "Integração com o Java EE"
 
 #. Tag: para
-#: ee.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "CDI is fully integrated into the Java EE environment. Beans have access to "
@@ -36,13 +34,11 @@
 "Servlets e Message-Driven Beans."
 
 #. Tag: title
-#: ee.xml:13
 #, no-c-format
 msgid "Built-in beans"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:15
 #, no-c-format
 msgid ""
 "In the Java EE environment, the container provides the following built-in "
@@ -50,20 +46,17 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:22
 #, no-c-format
 msgid "the current JTA <literal>UserTransaction</literal>,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:27
 #, no-c-format
 msgid ""
 "a <literal>Principal</literal> representing the current caller identity,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:32
 #, no-c-format
 msgid ""
 "the default <ulink url=\"http://jcp.org/en/jsr/detail?id=303\">Bean "
@@ -71,7 +64,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:38
 #, no-c-format
 msgid ""
 "a <literal>Validator</literal> for the default <literal>ValidationFactory</"
@@ -79,7 +71,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:45
 #, no-c-format
 msgid ""
 "The CDI specification does not require the servlet context objects, "
@@ -95,32 +86,18 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:57
 #, no-c-format
 msgid ""
 "Oh, you <emphasis>really</emphasis> want to inject the "
 "<literal>FacesContext</literal>? Alright then, try this producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[class FacesContextProducer {\n"
-"   @Produces @RequestScoped FacesContext getFacesContext() {\n"
-"      return FacesContext.getCurrentInstance();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: ee.xml:67
 #, no-c-format
 msgid "Injecting Java EE resources into a bean"
 msgstr "Injetando recursos Java EE em um bean"
 
 #. Tag: para
-#: ee.xml:69
 #, fuzzy, no-c-format
 msgid ""
 "All managed beans may take advantage of Java EE component environment "
@@ -135,46 +112,7 @@
 "Nós já vimos vários exemplos disso, embora  não demos muita ênfase até o "
 "momento:"
 
-#. Tag: programlisting
-#: ee.xml:76
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @Resource UserTransaction transaction;\n"
-"\n"
-"   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"throws Exception { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @Resource UserTransaction transaction;\n"
-"\n"
-"   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"throws Exception { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: ee.xml:78
-#, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Login implements Serializable {\n"
-"   @Inject Credentials credentials;\n"
-"   @PersistenceContext EntityManager userDatabase;\n"
-"    ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped\n"
-"public class Login implements Serializable {\n"
-"   @Inject Credentials credentials;\n"
-"   @PersistenceContext EntityManager userDatabase;\n"
-"    ...\n"
-"}]]>"
-
 #. Tag: para
-#: ee.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "The Java EE <literal>@PostConstruct</literal> and <literal>@PreDestroy</"
@@ -189,7 +127,6 @@
 "realizadas."
 
 #. Tag: para
-#: ee.xml:86
 #, no-c-format
 msgid ""
 "Of course, we advise that component environment injection be used to define "
@@ -197,13 +134,11 @@
 msgstr ""
 
 #. Tag: title
-#: ee.xml:94
 #, fuzzy, no-c-format
 msgid "Calling a bean from a servlet"
 msgstr "Invocando um Web Bean a partir de um Servlet"
 
 #. Tag: para
-#: ee.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
@@ -213,54 +148,7 @@
 "injetar o Web Bean usando a injeção de atributos ou de método de "
 "inicialização de Web Beans."
 
-#. Tag: programlisting
-#: ee.xml:101
-#, no-c-format
-msgid ""
-"<![CDATA[public class Login extends HttpServlet {\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject Login login;\n"
-"\n"
-"   @Override\n"
-"   public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"      throws ServletException, IOException {\n"
-"      credentials.setUsername(request.getParameter(\"username\")):\n"
-"      credentials.setPassword(request.getParameter(\"password\")):\n"
-"      login.login();\n"
-"      if ( login.isLoggedIn() ) {\n"
-"         response.sendRedirect(\"/home.jsp\");\n"
-"      }\n"
-"      else {\n"
-"         response.sendRedirect(\"/loginError.jsp\");\n"
-"      }\n"
-"   }\n"
-"            \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Login extends HttpServlet {\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject Login login;\n"
-"\n"
-"   @Override\n"
-"   public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"      throws ServletException, IOException {\n"
-"      credentials.setUsername(request.getParameter(\"username\")):\n"
-"      credentials.setPassword(request.getParameter(\"password\")):\n"
-"      login.login();\n"
-"      if ( login.isLoggedIn() ) {\n"
-"         response.sendRedirect(\"/home.jsp\");\n"
-"      }\n"
-"      else {\n"
-"         response.sendRedirect(\"/loginError.jsp\");\n"
-"      }\n"
-"   }\n"
-"            \n"
-"}]]>"
-
 #. Tag: para
-#: ee.xml:103
 #, fuzzy, no-c-format
 msgid ""
 "Since instances of servlets are shared across all incoming threads, the bean "
@@ -274,13 +162,11 @@
 "e sessão HTTP atuais."
 
 #. Tag: title
-#: ee.xml:112
 #, fuzzy, no-c-format
 msgid "Calling a bean from a message-driven bean"
 msgstr "Invocando um Web Bean de um Message-Driven Bean"
 
 #. Tag: para
-#: ee.xml:114
 #, no-c-format
 msgid ""
 "CDI injection applies to all EJBs, even when they aren't managed beans. In "
@@ -289,39 +175,13 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:119
 #, fuzzy, no-c-format
 msgid "You can even use CDI interceptor bindings for message-driven Beans."
 msgstr ""
 "Você ainda pode usar bindings de interceptadores Web Beans em Message-Driven "
 "Beans."
 
-#. Tag: programlisting
-#: ee.xml:121
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"   @Inject Inventory inventory;\n"
-"   @PersistenceContext EntityManager em;\n"
-"\n"
-"   public void onMessage(Message message) {\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"   @Inject Inventory inventory;\n"
-"   @PersistenceContext EntityManager em;\n"
-"\n"
-"   public void onMessage(Message message) {\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-
 #. Tag: para
-#: ee.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "Please note that there is no session or conversation context available when "
@@ -336,19 +196,16 @@
 "Web Beans estão disponíveis."
 
 #. Tag: para
-#: ee.xml:129
 #, no-c-format
 msgid "But how about beans which <emphasis>send</emphasis> JMS messages?"
 msgstr ""
 
 #. Tag: title
-#: ee.xml:136
 #, no-c-format
 msgid "JMS endpoints"
 msgstr "Endpoints JMS"
 
 #. Tag: para
-#: ee.xml:138
 #, no-c-format
 msgid ""
 "Sending messages using JMS can be quite complex, because of the number of "
@@ -372,141 +229,20 @@
 "ciclo de vida e modelo de threads, com que temos de nos preocupar."
 
 #. Tag: para
-#: ee.xml:147
 #, no-c-format
 msgid ""
 "You can use producer fields and methods to prepare all of these resources "
 "for injection into a bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[public class OrderResources {\n"
-"   @Resource(name=\"jms/ConnectionFactory\")\n"
-"   private ConnectionFactory connectionFactory;\n"
-"  \n"
-"   @Resource(name=\"jms/OrderQueue\")\n"
-"   private Queue orderQueue;\n"
-"  \n"
-"   @Produces @OrderConnection\n"
-"   public Connection createOrderConnection() throws JMSException {\n"
-"    return connectionFactory.createConnection();\n"
-"   }\n"
-"  \n"
-"   public void closeOrderConnection(@Disposes @OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      connection.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderSession\n"
-"   public Session createOrderSession(@OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      return connection.createSession(true, Session.AUTO_ACKNOWLEDGE);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderSession(@Disposes @OrderSession Session session)\n"
-"         throws JMSException {\n"
-"      session.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderMessageProducer\n"
-"   public MessageProducer createOrderMessageProducer(@OrderSession Session "
-"session)\n"
-"         throws JMSException {\n"
-"      return session.createProducer(orderQueue);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderMessageProducer(@Disposes @OrderMessageProducer "
-"MessageProducer producer)\n"
-"         throws JMSException {\n"
-"      producer.close();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class OrderResources {\n"
-"   @Resource(name=\"jms/ConnectionFactory\")\n"
-"   private ConnectionFactory connectionFactory;\n"
-"  \n"
-"   @Resource(name=\"jms/OrderQueue\")\n"
-"   private Queue orderQueue;\n"
-"  \n"
-"   @Produces @OrderConnection\n"
-"   public Connection createOrderConnection() throws JMSException {\n"
-"    return connectionFactory.createConnection();\n"
-"   }\n"
-"  \n"
-"   public void closeOrderConnection(@Disposes @OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      connection.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderSession\n"
-"   public Session createOrderSession(@OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      return connection.createSession(true, Session.AUTO_ACKNOWLEDGE);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderSession(@Disposes @OrderSession Session session)\n"
-"         throws JMSException {\n"
-"      session.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderMessageProducer\n"
-"   public MessageProducer createOrderMessageProducer(@OrderSession Session "
-"session)\n"
-"         throws JMSException {\n"
-"      return session.createProducer(orderQueue);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderMessageProducer(@Disposes @OrderMessageProducer "
-"MessageProducer producer)\n"
-"         throws JMSException {\n"
-"      producer.close();\n"
-"   }\n"
-"}]]>"
-
 #. Tag: para
-#: ee.xml:153
 #, no-c-format
 msgid ""
 "In this example, we can just inject the prepared <literal>MessageProducer</"
 "literal>, <literal>Connection</literal> or <literal>QueueSession</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:158
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject Order order;\n"
-"@Inject @OrderMessageProducer MessageProducer producer;\n"
-"@Inject @OrderSession QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"   MapMessage msg = orderSession.createMapMessage();\n"
-"   msg.setLong(\"orderId\", order.getId());\n"
-"   ...\n"
-"   producer.send(msg);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Inject Order order;\n"
-"@Inject @OrderMessageProducer MessageProducer producer;\n"
-"@Inject @OrderSession QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"   MapMessage msg = orderSession.createMapMessage();\n"
-"   msg.setLong(\"orderId\", order.getId());\n"
-"   ...\n"
-"   producer.send(msg);\n"
-"}]]>"
-
 #. Tag: para
-#: ee.xml:164
 #, fuzzy, no-c-format
 msgid ""
 "The lifecycle of the injected JMS objects is completely controlled by the "
@@ -516,22 +252,20 @@
 "gerenciador do Web Bean."
 
 #. Tag: title
-#: ee.xml:171
 #, no-c-format
 msgid "Packaging and deployment"
 msgstr "Empacotamento e implantação"
 
 #. Tag: para
-#: ee.xml:173
 #, fuzzy, no-c-format
 msgid ""
 "CDI doesn't define any special deployment archive. You can package beans in "
-"JARs, EJB-JARs or WARs&#8212;any deployment location in the application "
-"classpath. However, the archive must be a \"bean archive\". That means each "
-"archive that contains beans <emphasis>must</emphasis> include a file named "
+"jars, ejb jars or wars—any deployment location in the application classpath. "
+"However, the archive must be a \"bean archive\". That means each archive "
+"that contains beans <emphasis>must</emphasis> include a file named "
 "<literal>beans.xml</literal> in the <literal>META-INF</literal> directory of "
 "the classpath or <literal>WEB-INF</literal> directory of the web root (for "
-"WAR archives). The file may be empty. Beans deployed in archives that do not "
+"war archives). The file may be empty. Beans deployed in archives that do not "
 "have a <literal>beans.xml</literal> file will not be available for use in "
 "the application."
 msgstr ""
@@ -546,7 +280,6 @@
 "aplicação."
 
 #. Tag: para
-#: ee.xml:182
 #, fuzzy, no-c-format
 msgid ""
 "In an embeddable EJB container, beans may be deployed in any location in "
@@ -559,6 +292,216 @@
 "localização deve conter o arquivo <literal>web-beans.xml</literal>."
 
 #~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "throws Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "throws Exception { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login implements Serializable {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @PersistenceContext EntityManager userDatabase;\n"
+#~ "    ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login implements Serializable {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @PersistenceContext EntityManager userDatabase;\n"
+#~ "    ...\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class Login extends HttpServlet {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject Login login;\n"
+#~ "\n"
+#~ "   @Override\n"
+#~ "   public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "      throws ServletException, IOException {\n"
+#~ "      credentials.setUsername(request.getParameter(\"username\")):\n"
+#~ "      credentials.setPassword(request.getParameter(\"password\")):\n"
+#~ "      login.login();\n"
+#~ "      if ( login.isLoggedIn() ) {\n"
+#~ "         response.sendRedirect(\"/home.jsp\");\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "            \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Login extends HttpServlet {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject Login login;\n"
+#~ "\n"
+#~ "   @Override\n"
+#~ "   public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "      throws ServletException, IOException {\n"
+#~ "      credentials.setUsername(request.getParameter(\"username\")):\n"
+#~ "      credentials.setPassword(request.getParameter(\"password\")):\n"
+#~ "      login.login();\n"
+#~ "      if ( login.isLoggedIn() ) {\n"
+#~ "         response.sendRedirect(\"/home.jsp\");\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "            \n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "   @Inject Inventory inventory;\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "   public void onMessage(Message message) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "   @Inject Inventory inventory;\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "   public void onMessage(Message message) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class OrderResources {\n"
+#~ "   @Resource(name=\"jms/ConnectionFactory\")\n"
+#~ "   private ConnectionFactory connectionFactory;\n"
+#~ "  \n"
+#~ "   @Resource(name=\"jms/OrderQueue\")\n"
+#~ "   private Queue orderQueue;\n"
+#~ "  \n"
+#~ "   @Produces @OrderConnection\n"
+#~ "   public Connection createOrderConnection() throws JMSException {\n"
+#~ "    return connectionFactory.createConnection();\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   public void closeOrderConnection(@Disposes @OrderConnection Connection "
+#~ "connection)\n"
+#~ "         throws JMSException {\n"
+#~ "      connection.close();\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   @Produces @OrderSession\n"
+#~ "   public Session createOrderSession(@OrderConnection Connection "
+#~ "connection)\n"
+#~ "         throws JMSException {\n"
+#~ "      return connection.createSession(true, Session.AUTO_ACKNOWLEDGE);\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   public void closeOrderSession(@Disposes @OrderSession Session "
+#~ "session)\n"
+#~ "         throws JMSException {\n"
+#~ "      session.close();\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   @Produces @OrderMessageProducer\n"
+#~ "   public MessageProducer createOrderMessageProducer(@OrderSession "
+#~ "Session session)\n"
+#~ "         throws JMSException {\n"
+#~ "      return session.createProducer(orderQueue);\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   public void closeOrderMessageProducer(@Disposes @OrderMessageProducer "
+#~ "MessageProducer producer)\n"
+#~ "         throws JMSException {\n"
+#~ "      producer.close();\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class OrderResources {\n"
+#~ "   @Resource(name=\"jms/ConnectionFactory\")\n"
+#~ "   private ConnectionFactory connectionFactory;\n"
+#~ "  \n"
+#~ "   @Resource(name=\"jms/OrderQueue\")\n"
+#~ "   private Queue orderQueue;\n"
+#~ "  \n"
+#~ "   @Produces @OrderConnection\n"
+#~ "   public Connection createOrderConnection() throws JMSException {\n"
+#~ "    return connectionFactory.createConnection();\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   public void closeOrderConnection(@Disposes @OrderConnection Connection "
+#~ "connection)\n"
+#~ "         throws JMSException {\n"
+#~ "      connection.close();\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   @Produces @OrderSession\n"
+#~ "   public Session createOrderSession(@OrderConnection Connection "
+#~ "connection)\n"
+#~ "         throws JMSException {\n"
+#~ "      return connection.createSession(true, Session.AUTO_ACKNOWLEDGE);\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   public void closeOrderSession(@Disposes @OrderSession Session "
+#~ "session)\n"
+#~ "         throws JMSException {\n"
+#~ "      session.close();\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   @Produces @OrderMessageProducer\n"
+#~ "   public MessageProducer createOrderMessageProducer(@OrderSession "
+#~ "Session session)\n"
+#~ "         throws JMSException {\n"
+#~ "      return session.createProducer(orderQueue);\n"
+#~ "   }\n"
+#~ "  \n"
+#~ "   public void closeOrderMessageProducer(@Disposes @OrderMessageProducer "
+#~ "MessageProducer producer)\n"
+#~ "         throws JMSException {\n"
+#~ "      producer.close();\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Inject Order order;\n"
+#~ "@Inject @OrderMessageProducer MessageProducer producer;\n"
+#~ "@Inject @OrderSession QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "   MapMessage msg = orderSession.createMapMessage();\n"
+#~ "   msg.setLong(\"orderId\", order.getId());\n"
+#~ "   ...\n"
+#~ "   producer.send(msg);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Inject Order order;\n"
+#~ "@Inject @OrderMessageProducer MessageProducer producer;\n"
+#~ "@Inject @OrderSession QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "   MapMessage msg = orderSession.createMapMessage();\n"
+#~ "   msg.setLong(\"orderId\", order.getId());\n"
+#~ "   ...\n"
+#~ "   producer.send(msg);\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "There is one restriction to be aware of here: <literal>@PersistenceContext"
 #~ "(type=EXTENDED)</literal> is not supported for simple Web Beans."
 #~ msgstr ""

Modified: doc/trunk/reference/pt-BR/environments.po
===================================================================
--- doc/trunk/reference/pt-BR/environments.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/environments.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-12-19 18:10-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -15,22 +15,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: environments.xml:4
 #, fuzzy, no-c-format
 msgid "Application servers and environments supported by Weld"
 msgstr "Servidores de Aplicação e ambientes suportados pela Web Beans"
 
 #. Tag: title
-#: environments.xml:7
 #, fuzzy, no-c-format
 msgid "Using Weld with JBoss AS"
 msgstr "Utilizando a Web Beans com o JBoss AS"
 
 #. Tag: para
-#: environments.xml:9
 #, no-c-format
 msgid ""
-"If you are using JBoss AS 5.2, no additional configuration is required to "
+"If you are using JBoss AS 6.0, no additional configuration is required to "
 "use Weld (or CDI for that matter). All you need to do is make your "
 "application a bean bean archive by adding <literal>META-INF/beans.xml</"
 "literal> to the classpath or <literal>WEB-INF/beans.xml</literal> to the web "
@@ -38,52 +35,39 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:15
 #, no-c-format
 msgid ""
 "Unfortunately, you can't use Weld with earlier versions of JBoss AS since "
 "they are missing key libraries. If you want to learn how to upgrade the "
-"built-in support on JBoss AS 5.2, then read on."
+"built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:20
 #, no-c-format
 msgid ""
-"Upgrading the Weld add-on is easy. The Weld distribution has a build that "
-"can take care of this task for you in a single command. First, we need to "
-"tell Weld where JBoss AS is located. Create a new file named <literal>local."
-"build.properties</literal> in the examples directory of the Weld "
-"distribution and assign the path of your JBoss AS installation to the "
-"property key <literal>jboss.home</literal>, as follows:"
+"If there is a newer release of Weld than what is included in the latest "
+"JBoss AS 6 release, upgrading the Weld add-on is easy. The Weld distribution "
+"includes a build script that can take care of this task for you in a single "
+"command."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:27
+#. Tag: para
 #, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"
-msgstr "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"
+msgid ""
+"First, we need to tell Weld where JBoss AS is located. This information is "
+"communicated by assigning the <literal>JBOSS_HOME</literal> environment "
+"variable. In a bash shell, you can assign the environment variable as "
+"follows:"
+msgstr ""
 
 #. Tag: para
-#: environments.xml:29
 #, no-c-format
 msgid ""
 "Now we can install the Weld deployer from the <literal>jboss-as</literal> "
 "directory of the Weld distribution:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:33
-#, fuzzy, no-c-format
-msgid ""
-"$> cd jboss-as\n"
-"$> ant update"
-msgstr ""
-"$ cd webbeans-$VERSION/jboss-as\n"
-"$ ant update"
-
 #. Tag: para
-#: environments.xml:36
 #, fuzzy, no-c-format
 msgid ""
 "A new deployer, <literal>weld.deployer</literal> is added to JBoss AS. This "
@@ -98,13 +82,11 @@
 "sua aplicação."
 
 #. Tag: title
-#: environments.xml:46
 #, no-c-format
 msgid "GlassFish"
 msgstr "GlassFish"
 
 #. Tag: para
-#: environments.xml:48
 #, no-c-format
 msgid ""
 "Weld is also built into GlassFish from V3 onwards. Since GlassFish V3 is the "
@@ -115,13 +97,11 @@
 msgstr ""
 
 #. Tag: title
-#: environments.xml:56
 #, fuzzy, no-c-format
 msgid "Servlet containers (such as Tomcat or Jetty)"
 msgstr "Servlet Containers (como o Tomcat ou Jetty)"
 
 #. Tag: para
-#: environments.xml:58
 #, fuzzy, no-c-format
 msgid ""
 "While JSR-299 does not require support for servlet environments, Weld can be "
@@ -131,7 +111,6 @@
 "6.0 ou Jetty 6.1."
 
 #. Tag: para
-#: environments.xml:64
 #, fuzzy, no-c-format
 msgid ""
 "There is a major limitation to using a servlet container. Weld doesn't "
@@ -145,7 +124,6 @@
 "<literal>@PersistenceContext</literal>, ou eventos transacionais no Tomcat."
 
 #. Tag: para
-#: environments.xml:72
 #, fuzzy, no-c-format
 msgid ""
 "Weld should be used as a web application library in a servlet container. You "
@@ -161,62 +139,52 @@
 "\"hiper-jar\", disponível para a sua conveniência. Em vez disso, você pode "
 "utilizar os componentes do jars:"
 
-#. Tag: literal
-#: environments.xml:84
+#. Tag: para
 #, no-c-format
-msgid "jsr299-api.jar"
-msgstr "jsr299-api.jar"
+msgid "<literal>jsr299-api.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:89
-#, fuzzy, no-c-format
-msgid "weld-api.jar"
-msgstr "webbeans-api.jar"
+#. Tag: para
+#, no-c-format
+msgid "<literal>weld-api.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:94
-#, fuzzy, no-c-format
-msgid "weld-spi.jar"
-msgstr "webbeans-spi.jar"
+#. Tag: para
+#, no-c-format
+msgid "<literal>weld-spi.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:99
-#, fuzzy, no-c-format
-msgid "weld-core.jar"
-msgstr "webbeans-core.jar"
+#. Tag: para
+#, no-c-format
+msgid "<literal>weld-core.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:104
+#. Tag: para
 #, fuzzy, no-c-format
-msgid "weld-logging.jar"
+msgid "<literal>weld-logging.jar</literal>"
 msgstr "webbeans-logging.jar"
 
-#. Tag: literal
-#: environments.xml:109
+#. Tag: para
 #, fuzzy, no-c-format
-msgid "weld-servlet-int.jar"
+msgid "<literal>weld-servlet-int.jar</literal>"
 msgstr "webbeans-servlet-int.jar"
 
-#. Tag: literal
-#: environments.xml:114
+#. Tag: para
 #, no-c-format
-msgid "javassist.jar"
-msgstr "javassist.jar"
+msgid "<literal>javassist.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:119
+#. Tag: para
 #, no-c-format
-msgid "dom4j.jar"
-msgstr "dom4j.jar"
+msgid "<literal>dom4j.jar</literal>"
+msgstr ""
 
-#. Tag: literal
-#: environments.xml:124
+#. Tag: para
 #, no-c-format
-msgid "google-collections.jar"
+msgid "<literal>google-collections.jar</literal>"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:129
 #, fuzzy, no-c-format
 msgid ""
 "You also need to explicitly specify the servlet listener (used to boot Weld, "
@@ -227,28 +195,12 @@
 "(utilizado para \"bootar\" a Web Beans e controlar a interação com as "
 "requisições) no <literal>web.xml</literal>:"
 
-#. Tag: programlisting
-#: environments.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-
 #. Tag: title
-#: environments.xml:137
 #, no-c-format
 msgid "Tomcat"
 msgstr "Tomcat"
 
 #. Tag: para
-#: environments.xml:139
 #, fuzzy, no-c-format
 msgid ""
 "Tomcat has a read-only JNDI, so Weld can't automatically bind the "
@@ -260,26 +212,7 @@
 "automaticamente o Manager. Para vincular o Manager no JNDI, você deve "
 "adicionar o seguinte ao seu <literal>META-INF/context.xml</literal>:"
 
-#. Tag: programlisting
-#: environments.xml:145
-#, no-c-format
-msgid ""
-"<![CDATA[<Context>\n"
-"   <Resource name=\"BeanManager\" \n"
-"      auth=\"Container\"\n"
-"      type=\"javax.enterprise.inject.spi.BeanManager\"\n"
-"      factory=\"org.jboss.weld.resources.ManagerObjectFactory\"/>\n"
-"</Context>]]>"
-msgstr ""
-"<![CDATA[<Context>\n"
-"   <Resource name=\"BeanManager\" \n"
-"      auth=\"Container\"\n"
-"      type=\"javax.enterprise.inject.spi.BeanManager\"\n"
-"      factory=\"org.jboss.weld.resources.ManagerObjectFactory\"/>\n"
-"</Context>]]>"
-
 #. Tag: para
-#: environments.xml:147
 #, fuzzy, no-c-format
 msgid ""
 "and make it available to your deployment by adding this to the bottom of "
@@ -288,26 +221,7 @@
 "e torná-lo disponível para a sua implantação, acrescentando-o ao "
 "<literal>web.xml</literal>:"
 
-#. Tag: programlisting
-#: environments.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[<resource-env-ref>\n"
-"   <resource-env-ref-name>BeanManager</resource-env-ref-name>\n"
-"   <resource-env-ref-type>\n"
-"      javax.enterprise.inject.spi.BeanManager\n"
-"   </resource-env-ref-type>\n"
-"</resource-env-ref>]]>"
-msgstr ""
-"<![CDATA[<resource-env-ref>\n"
-"   <resource-env-ref-name>BeanManager</resource-env-ref-name>\n"
-"   <resource-env-ref-type>\n"
-"      javax.enterprise.inject.spi.BeanManager\n"
-"   </resource-env-ref-type>\n"
-"</resource-env-ref>]]>"
-
 #. Tag: para
-#: environments.xml:153
 #, fuzzy, no-c-format
 msgid ""
 "Tomcat only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -319,7 +233,6 @@
 "env/app/Manager</literal>"
 
 #. Tag: para
-#: environments.xml:158
 #, no-c-format
 msgid ""
 "Weld also supports Servlet injection in Tomcat. To enable this, place the "
@@ -327,24 +240,12 @@
 "literal>, and add the following to <literal>META-INF/context.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:164
-#, no-c-format
-msgid ""
-"<![CDATA[<Listener className=\"org.jboss.weld.environment.tomcat."
-"WeldLifecycleListener\"/>]]>"
-msgstr ""
-"<![CDATA[<Listener className=\"org.jboss.weld.environment.tomcat."
-"WeldLifecycleListener\"/>]]>"
-
 #. Tag: title
-#: environments.xml:169
 #, no-c-format
 msgid "Jetty"
 msgstr "Jetty"
 
 #. Tag: para
-#: environments.xml:171
 #, fuzzy, no-c-format
 msgid ""
 "Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind "
@@ -355,50 +256,7 @@
 "automaticamente o Manager. Para vincular o Manager no JNDI, você deve "
 "adicionar o seguinte ao seu <literal>META-INF/context.xml</literal>:"
 
-#. Tag: programlisting
-#: environments.xml:176
-#, no-c-format
-msgid ""
-"<![CDATA[<!DOCTYPE Configure PUBLIC \"-//Mort Bay Consulting//DTD Configure//"
-"EN\"\n"
-"   \"http://jetty.mortbay.org/configure.dtd\">\n"
-"<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext"
-"\">\n"
-"   <New id=\"BeanManager\" class=\"org.mortbay.jetty.plus.naming.Resource"
-"\">\n"
-"      <Arg><Ref id=\"webAppCtx\"/></Arg> \n"
-"      <Arg>BeanManager</Arg>\n"
-"      <Arg>\n"
-"         <New class=\"javax.naming.Reference\">\n"
-"            <Arg>javax.enterprise.inject.spi.BeanManager</Arg> \n"
-"            <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>\n"
-"            <Arg/>\n"
-"         </New>\n"
-"      </Arg>\n"
-"   </New>\n"
-"</Configure>]]>"
-msgstr ""
-"<![CDATA[<!DOCTYPE Configure PUBLIC \"-//Mort Bay Consulting//DTD Configure//"
-"EN\"\n"
-"   \"http://jetty.mortbay.org/configure.dtd\">\n"
-"<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext"
-"\">\n"
-"   <New id=\"BeanManager\" class=\"org.mortbay.jetty.plus.naming.Resource"
-"\">\n"
-"      <Arg><Ref id=\"webAppCtx\"/></Arg> \n"
-"      <Arg>BeanManager</Arg>\n"
-"      <Arg>\n"
-"         <New class=\"javax.naming.Reference\">\n"
-"            <Arg>javax.enterprise.inject.spi.BeanManager</Arg> \n"
-"            <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>\n"
-"            <Arg/>\n"
-"         </New>\n"
-"      </Arg>\n"
-"   </New>\n"
-"</Configure>]]>"
-
 #. Tag: para
-#: environments.xml:178
 #, no-c-format
 msgid ""
 "Notice that Jetty doesn't not have built-in support for an <literal>javax."
@@ -408,7 +266,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:184
 #, fuzzy, no-c-format
 msgid ""
 "Jetty only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -420,19 +277,16 @@
 "env/app/Manager</literal>"
 
 #. Tag: para
-#: environments.xml:189
 #, fuzzy, no-c-format
 msgid "Weld does not currently support Servlet injection in Jetty."
 msgstr "Web Beans atualmente não suporta injeção de Servlet no Jetty."
 
 #. Tag: title
-#: environments.xml:198
 #, no-c-format
 msgid "Java SE"
 msgstr "Java SE"
 
 #. Tag: para
-#: environments.xml:200
 #, no-c-format
 msgid ""
 "In addition to improved integration of the Enterprise Java stack, the "
@@ -445,7 +299,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:208
 #, fuzzy, no-c-format
 msgid ""
 "When executing in the SE environment the following features of Weld are "
@@ -455,7 +308,6 @@
 "estão disponíveis:"
 
 #. Tag: para
-#: environments.xml:214
 #, no-c-format
 msgid ""
 "Managed beans with <literal>@PostConstruct</literal> and "
@@ -463,13 +315,11 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:220
 #, no-c-format
 msgid "Dependency injection with qualifiers and alternatives"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:225
 #, no-c-format
 msgid ""
 "<literal>@Application</literal>, <literal>@Dependent</literal> and "
@@ -477,43 +327,36 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:231
 #, no-c-format
 msgid "Interceptors and decorators"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:236
 #, no-c-format
 msgid "Stereotypes"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:241
 #, no-c-format
 msgid "Events"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:246
 #, no-c-format
 msgid "Portable extension support"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:252
 #, no-c-format
 msgid "EJB beans are not supported."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:257
 #, fuzzy, no-c-format
 msgid "CDI SE Module"
 msgstr "Módulo Web Beans SE"
 
 #. Tag: para
-#: environments.xml:259
 #, no-c-format
 msgid ""
 "Weld provides an extension which will boot a CDI bean manager in Java SE, "
@@ -521,26 +364,12 @@
 "command line parameters can be injected using either of the following:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:264
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters List<String> params;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: environments.xml:266
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters String[] paramsArray;]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:268
 #, no-c-format
 msgid "The second form is useful for compatibility with existing classes."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:273
 #, no-c-format
 msgid ""
 "The command line parameters do not become available for injection until the "
@@ -551,55 +380,27 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:282
 #, fuzzy, no-c-format
 msgid "Here's an example of a simple CDI SE application:"
 msgstr "Aqui está um exemplo de uma simples aplicação Web Beans SE:"
 
-#. Tag: programlisting
-#: environments.xml:286
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Singleton\n"
-"public class HelloWorld\n"
-"{\n"
-"   public void printHello(@Observes ContainerInitialized event, @Parameters "
-"List<String> parameters) {\n"
-"       System.out.println(\"Hello \" + parameters.get(0));\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped\n"
-"public class HelloWorld\n"
-"{\n"
-"   @Inject @Parameters List<String> parameters;\n"
-"\n"
-"   public void printHello(@Observes ContainerInitialized event) {\n"
-"       System.out.println(\"Hello \" + parameters.get(0));\n"
-"   }\n"
-"}]]>"
-
 #. Tag: title
-#: environments.xml:292
 #, no-c-format
 msgid "Bootstrapping CDI SE"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:294
 #, fuzzy, no-c-format
 msgid "CDI SE applications can be bootstrapped in the following ways."
 msgstr ""
 "Aplicações Web Beans SE são iniciadas executando o seguinte método principal."
 
 #. Tag: title
-#: environments.xml:300
 #, no-c-format
 msgid "The ContainerInitialized Event"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:302
 #, no-c-format
 msgid ""
 "Thanks to the power of CDI's typesafe event model, application developers "
@@ -611,7 +412,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:310
 #, fuzzy, no-c-format
 msgid ""
 "In this case your application can be started by calling the provided main "
@@ -619,20 +419,12 @@
 msgstr ""
 "Aplicações Web Beans SE são iniciadas executando o seguinte método principal."
 
-#. Tag: programlisting
-#: environments.xml:313
-#, no-c-format
-msgid "<![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]>"
-msgstr "<![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]>"
-
 #. Tag: title
-#: environments.xml:319
 #, no-c-format
 msgid "Programatic Bootstrap API"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:321
 #, no-c-format
 msgid ""
 "For added flexibility, CDI SE also comes with a bootstrap API which can be "
@@ -641,90 +433,65 @@
 "classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:327
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class Weld\n"
-"{\n"
-"\n"
-"   /** Boots Weld and creates and returns a WeldContainer instance, through "
-"which\n"
-"    * beans and events can be accesed. */\n"
-"   public WeldContainer initialize() {...}\n"
-"\n"
-"   /** Convenience method for shutting down the container. */\n"
-"   public void shutdown() {...}\n"
-"\n"
-"}]]>"
+"Here's an example application main method which uses this API to initialize "
+"a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:329
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class WeldContainer\n"
-"{\n"
-"\n"
-"   /** Provides access to all beans within the application. */\n"
-"   public Instance<Object> instance() {...}\n"
-"\n"
-"   /** Provides access to all events within the application. */\n"
-"   public Event<Object> event() {...}\n"
-"\n"
-"   /** Provides direct access to the BeanManager. */\n"
-"   public BeanManager getBeanManager() {...}\n"
-"\n"
-"}]]>"
+"Alternatively the application could be started by firing a custom event "
+"which would then be observed by another simple bean. The following example "
+"fires <literal>MyEvent</literal> on startup."
 msgstr ""
 
-#. Tag: para
-#: environments.xml:331
+#. Tag: title
 #, no-c-format
-msgid ""
-"Here's an example application main method which uses this API to initialize "
-"a bean of type <literal>MyApplicationBean</literal>."
+msgid "Thread Context"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:334
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.instance().select(MyApplicationBean.class).get();\n"
-"   weld.shutdown();\n"
-"}]]>"
+"In contrast to Java EE applications, Java SE applications place no "
+"restrictions on developers regarding the creation and usage of threads. "
+"Therefore Weld SE provides a custom scope annotation, "
+"<literal>@ThreadScoped</literal>, and corresponding context implementation "
+"which can be used to bind bean instances to the current thread. It is "
+"intended to be used in scenarios where you might otherwise use "
+"<literal>ThreadLocal</literal>, and does in fact use <literal>ThreadLocal</"
+"literal> under the hood."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:336
 #, no-c-format
 msgid ""
-"Alternatively the application could be started by firing a custom event "
-"which would then be observed by another simple bean. The following example "
-"fires <literal>MyEvent</literal> on startup."
+"To use the @ThreadScoped annotation you need to enable the "
+"<literal>RunnableDecorator</literal> which 'listens' for all executions of "
+"<literal>Runnable.run()</literal> and decorates them by setting up the "
+"thread context beforehand, bound to the current thread, and destroying the "
+"context afterwards."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:340
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.event().select(MyEvent.class).fire( new MyEvent() );\n"
-"   weld.shutdown();\n"
-"}]]>"
+"It is not necessary to use @ThreadScoped in all multithreaded applications. "
+"The thread context is not intended as a replacement for defining your own "
+"application-specific contexts. It is generally only useful in situtations "
+"where you would otherwise have used ThreadLocal directly, which are "
+"typically rare."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:348
 #, no-c-format
 msgid "Setting the Classpath"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:350
 #, no-c-format
 msgid ""
 "Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld "
@@ -733,7 +500,150 @@
 "classes and dependant jars, is the Weld SE jar."
 msgstr ""
 
+#~ msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"
+#~ msgstr "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"
+
+#, fuzzy
 #~ msgid ""
+#~ "$> cd jboss-as\n"
+#~ "$> ant update"
+#~ msgstr ""
+#~ "$ cd webbeans-$VERSION/jboss-as\n"
+#~ "$ ant update"
+
+#~ msgid "jsr299-api.jar"
+#~ msgstr "jsr299-api.jar"
+
+#, fuzzy
+#~ msgid "weld-api.jar"
+#~ msgstr "webbeans-api.jar"
+
+#, fuzzy
+#~ msgid "weld-spi.jar"
+#~ msgstr "webbeans-spi.jar"
+
+#, fuzzy
+#~ msgid "weld-core.jar"
+#~ msgstr "webbeans-core.jar"
+
+#~ msgid "javassist.jar"
+#~ msgstr "javassist.jar"
+
+#~ msgid "dom4j.jar"
+#~ msgstr "dom4j.jar"
+
+#~ msgid ""
+#~ "<![CDATA[<listener>\n"
+#~ "   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
+#~ "class>\n"
+#~ "</listener>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<listener>\n"
+#~ "   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
+#~ "class>\n"
+#~ "</listener>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<Context>\n"
+#~ "   <Resource name=\"BeanManager\" \n"
+#~ "      auth=\"Container\"\n"
+#~ "      type=\"javax.enterprise.inject.spi.BeanManager\"\n"
+#~ "      factory=\"org.jboss.weld.resources.ManagerObjectFactory\"/>\n"
+#~ "</Context>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<Context>\n"
+#~ "   <Resource name=\"BeanManager\" \n"
+#~ "      auth=\"Container\"\n"
+#~ "      type=\"javax.enterprise.inject.spi.BeanManager\"\n"
+#~ "      factory=\"org.jboss.weld.resources.ManagerObjectFactory\"/>\n"
+#~ "</Context>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<resource-env-ref>\n"
+#~ "   <resource-env-ref-name>BeanManager</resource-env-ref-name>\n"
+#~ "   <resource-env-ref-type>\n"
+#~ "      javax.enterprise.inject.spi.BeanManager\n"
+#~ "   </resource-env-ref-type>\n"
+#~ "</resource-env-ref>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<resource-env-ref>\n"
+#~ "   <resource-env-ref-name>BeanManager</resource-env-ref-name>\n"
+#~ "   <resource-env-ref-type>\n"
+#~ "      javax.enterprise.inject.spi.BeanManager\n"
+#~ "   </resource-env-ref-type>\n"
+#~ "</resource-env-ref>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<Listener className=\"org.jboss.weld.environment.tomcat."
+#~ "WeldLifecycleListener\"/>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<Listener className=\"org.jboss.weld.environment.tomcat."
+#~ "WeldLifecycleListener\"/>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<!DOCTYPE Configure PUBLIC \"-//Mort Bay Consulting//DTD "
+#~ "Configure//EN\"\n"
+#~ "   \"http://jetty.mortbay.org/configure.dtd\">\n"
+#~ "<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext"
+#~ "\">\n"
+#~ "   <New id=\"BeanManager\" class=\"org.mortbay.jetty.plus.naming.Resource"
+#~ "\">\n"
+#~ "      <Arg><Ref id=\"webAppCtx\"/></Arg> \n"
+#~ "      <Arg>BeanManager</Arg>\n"
+#~ "      <Arg>\n"
+#~ "         <New class=\"javax.naming.Reference\">\n"
+#~ "            <Arg>javax.enterprise.inject.spi.BeanManager</Arg> \n"
+#~ "            <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>\n"
+#~ "            <Arg/>\n"
+#~ "         </New>\n"
+#~ "      </Arg>\n"
+#~ "   </New>\n"
+#~ "</Configure>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<!DOCTYPE Configure PUBLIC \"-//Mort Bay Consulting//DTD "
+#~ "Configure//EN\"\n"
+#~ "   \"http://jetty.mortbay.org/configure.dtd\">\n"
+#~ "<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext"
+#~ "\">\n"
+#~ "   <New id=\"BeanManager\" class=\"org.mortbay.jetty.plus.naming.Resource"
+#~ "\">\n"
+#~ "      <Arg><Ref id=\"webAppCtx\"/></Arg> \n"
+#~ "      <Arg>BeanManager</Arg>\n"
+#~ "      <Arg>\n"
+#~ "         <New class=\"javax.naming.Reference\">\n"
+#~ "            <Arg>javax.enterprise.inject.spi.BeanManager</Arg> \n"
+#~ "            <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>\n"
+#~ "            <Arg/>\n"
+#~ "         </New>\n"
+#~ "      </Arg>\n"
+#~ "   </New>\n"
+#~ "</Configure>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Singleton\n"
+#~ "public class HelloWorld\n"
+#~ "{\n"
+#~ "   public void printHello(@Observes ContainerInitialized event, "
+#~ "@Parameters List<String> parameters) {\n"
+#~ "       System.out.println(\"Hello \" + parameters.get(0));\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped\n"
+#~ "public class HelloWorld\n"
+#~ "{\n"
+#~ "   @Inject @Parameters List<String> parameters;\n"
+#~ "\n"
+#~ "   public void printHello(@Observes ContainerInitialized event) {\n"
+#~ "       System.out.println(\"Hello \" + parameters.get(0));\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid "<![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]>"
+#~ msgstr "<![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]>"
+
+#~ msgid ""
 #~ "<![CDATA[@Inject @Parameters List<String> params;\n"
 #~ "@Inject @Parameters String[] paramsArray; // useful for compatability "
 #~ "with existing classes]]>"

Modified: doc/trunk/reference/pt-BR/events.po
===================================================================
--- doc/trunk/reference/pt-BR/events.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/events.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-12-19 18:11-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,607 +14,716 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: events.xml:4
 #, no-c-format
 msgid "Events"
 msgstr "Eventos"
 
 #. Tag: para
-#: events.xml:6
 #, no-c-format
-msgid "Dependency injection enables loose-coupling by allowing the implementation of the injected bean type to vary, either a deployment time or runtime. Events go one step further, allowing beans to interact with no compile time dependency at all. Event <emphasis>producers</emphasis> raise events that are delivered to event <emphasis>observers</emphasis> by the container."
+msgid ""
+"Dependency injection enables loose-coupling by allowing the implementation "
+"of the injected bean type to vary, either a deployment time or runtime. "
+"Events go one step further, allowing beans to interact with no compile time "
+"dependency at all. Event <emphasis>producers</emphasis> raise events that "
+"are delivered to event <emphasis>observers</emphasis> by the container."
 msgstr ""
 
 #. Tag: para
-#: events.xml:13
 #, no-c-format
-msgid "This basic schema might sound like the familiar observer/observable pattern, but there are a couple of twists:"
+msgid ""
+"This basic schema might sound like the familiar observer/observable pattern, "
+"but there are a couple of twists:"
 msgstr ""
 
 #. Tag: para
-#: events.xml:18
 #, no-c-format
-msgid "not only are event producers decoupled from observers; observers are completely decoupled from producers,"
-msgstr "não só os produtores são desacoplados dos observadores; os observadores são totalmente desacoplados dos produtores,"
+msgid ""
+"not only are event producers decoupled from observers; observers are "
+"completely decoupled from producers,"
+msgstr ""
+"não só os produtores são desacoplados dos observadores; os observadores são "
+"totalmente desacoplados dos produtores,"
 
 #. Tag: para
-#: events.xml:22
 #, no-c-format
-msgid "observers can specify a combination of \"selectors\" to narrow the set of event notifications they will receive, and"
-msgstr "os observadores podem especificar uma combinação de \"seletores\" para reduzir o conjunto de eventos que irão receber notificações, e"
+msgid ""
+"observers can specify a combination of \"selectors\" to narrow the set of "
+"event notifications they will receive, and"
+msgstr ""
+"os observadores podem especificar uma combinação de \"seletores\" para "
+"reduzir o conjunto de eventos que irão receber notificações, e"
 
 #. Tag: para
-#: events.xml:28
 #, fuzzy, no-c-format
-msgid "observers can be notified immediately, or can specify that delivery of the event should be delayed until the end of the current transaction."
-msgstr "os observadores podem ser notificados imediatamente ou podem especificar que a notificação do evento deveria esperar até o término da transação corrente"
+msgid ""
+"observers can be notified immediately, or can specify that delivery of the "
+"event should be delayed until the end of the current transaction."
+msgstr ""
+"os observadores podem ser notificados imediatamente ou podem especificar que "
+"a notificação do evento deveria esperar até o término da transação corrente"
 
 #. Tag: para
-#: events.xml:35
 #, no-c-format
-msgid "The CDI event notification facility uses more or less the same typesafe approach that we've already seen with the dependency injection service."
+msgid ""
+"The CDI event notification facility uses more or less the same typesafe "
+"approach that we've already seen with the dependency injection service."
 msgstr ""
 
 #. Tag: title
-#: events.xml:39
 #, fuzzy, no-c-format
 msgid "Event payload"
 msgstr "Produtores de Eventos"
 
 #. Tag: para
-#: events.xml:41
 #, no-c-format
-msgid "The event object carries state from producer to consumer. The event object is nothing more than an instance of a concrete Java class. (The only restriction is that an event type may not contain type variables). An event may be assigned qualifiers, which allows observers to distinguish it from other events of the same type. The qualifiers function like topic selectors, allowing an observer to narrow the set of events it observes."
+msgid ""
+"The event object carries state from producer to consumer. The event object "
+"is nothing more than an instance of a concrete Java class. (The only "
+"restriction is that an event type may not contain type variables). An event "
+"may be assigned qualifiers, which allows observers to distinguish it from "
+"other events of the same type. The qualifiers function like topic selectors, "
+"allowing an observer to narrow the set of events it observes."
 msgstr ""
 
 #. Tag: para
-#: events.xml:48
 #, no-c-format
-msgid "An event qualifier is just a normal qualifier, defined using <literal>@Qualifier</literal>. Here's an example:"
-msgstr ""
-
-#. Tag: programlisting
-#: events.xml:52
-#, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({FIELD, PARAMETER})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated {}]]>"
+"An event qualifier is just a normal qualifier, defined using "
+"<literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Target({FIELD, PARAMETER})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated {}]]>"
 
 #. Tag: title
-#: events.xml:57
 #, no-c-format
 msgid "Event observers"
 msgstr "Observadores de eventos"
 
 #. Tag: para
-#: events.xml:59
 #, fuzzy, no-c-format
-msgid "An <emphasis>observer method</emphasis> is a method of a bean with a parameter annotated <literal>@Observes</literal>."
-msgstr "Um <emphasis>método observador (observer method)</emphasis> é um método de um Web Bean com um parâmetro anotado<literal>@Observes</literal>."
+msgid ""
+"An <emphasis>observer method</emphasis> is a method of a bean with a "
+"parameter annotated <literal>@Observes</literal>."
+msgstr ""
+"Um <emphasis>método observador (observer method)</emphasis> é um método de "
+"um Web Bean com um parâmetro anotado<literal>@Observes</literal>."
 
-#. Tag: programlisting
-#: events.xml:64
-#, no-c-format
-msgid "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) { ... }]]>"
-msgstr "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:66
 #, fuzzy, no-c-format
-msgid "The annotated parameter is called the <emphasis>event parameter</emphasis>. The type of the event parameter is the observed <emphasis>event type</emphasis>, in this case <literal>Document</literal>. The event parameter may also specify qualifiers."
-msgstr "O parâmetro anotado é chamado <emphasis>parâmetro de evento</emphasis>. O tipo do parâmetro de evento é observado pelo <emphasis>event type</emphasis>. Os métodos observadores também podem especificar \"seletores\", que são apenas instâncias de tipo de bindings de Web Beans. Quando um tipo de binding é utilizado como um seletor de evento, é chamado de <emphasis>tipo de binding de evento</emphasis>."
+msgid ""
+"The annotated parameter is called the <emphasis>event parameter</emphasis>. "
+"The type of the event parameter is the observed <emphasis>event type</"
+"emphasis>, in this case <literal>Document</literal>. The event parameter may "
+"also specify qualifiers."
+msgstr ""
+"O parâmetro anotado é chamado <emphasis>parâmetro de evento</emphasis>. O "
+"tipo do parâmetro de evento é observado pelo <emphasis>event type</"
+"emphasis>. Os métodos observadores também podem especificar \"seletores\", "
+"que são apenas instâncias de tipo de bindings de Web Beans. Quando um tipo "
+"de binding é utilizado como um seletor de evento, é chamado de "
+"<emphasis>tipo de binding de evento</emphasis>."
 
-#. Tag: programlisting
-#: events.xml:72
-#: events.xml:240
-#, no-c-format
-msgid "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document document) { ... }]]>"
-msgstr "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:74
 #, fuzzy, no-c-format
-msgid "An observer method need not specify any event qualifiers&#8212;in this case it is interested in <emphasis>all</emphasis> events of a particular type. If it does specify qualifiers, it's only interested in events which have those qualifiers."
-msgstr "Um método observador não necessita especificar nenhum binding de evento &#151; nesse caso, ele está interessado em <emphasis>todos</emphasis> os eventos de um determinado tipo. Se ele especificar o bindings de evento, ele estará apenas interessado em eventos que também têm esses bindings de evento."
+msgid ""
+"An observer method need not specify any event qualifiers—in this case it is "
+"interested in <emphasis>all</emphasis> events of a particular type. If it "
+"does specify qualifiers, it's only interested in events which have those "
+"qualifiers."
+msgstr ""
+"Um método observador não necessita especificar nenhum binding de evento "
+"&#151; nesse caso, ele está interessado em <emphasis>todos</emphasis> os "
+"eventos de um determinado tipo. Se ele especificar o bindings de evento, ele "
+"estará apenas interessado em eventos que também têm esses bindings de evento."
 
 #. Tag: para
-#: events.xml:80
 #, fuzzy, no-c-format
-msgid "The observer method may have additional parameters, which are injection points:"
-msgstr "O método observador pode ter parâmetros adicionais que são injetados de acordo com a semântica usual de injeção de parâmetros em métodos de Web Beans"
+msgid ""
+"The observer method may have additional parameters, which are injection "
+"points:"
+msgstr ""
+"O método observador pode ter parâmetros adicionais que são injetados de "
+"acordo com a semântica usual de injeção de parâmetros em métodos de Web Beans"
 
-#. Tag: programlisting
-#: events.xml:84
-#, no-c-format
-msgid "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document document, User user) { ... }]]>"
-msgstr "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document document, User user) { ... }]]>"
-
 #. Tag: title
-#: events.xml:89
 #, no-c-format
 msgid "Event producers"
 msgstr "Produtores de Eventos"
 
 #. Tag: para
-#: events.xml:91
 #, no-c-format
-msgid "Event producers fire events using an instance of the parameterized <literal>Event</literal> interface. An instance of this interface is obtained by injection:"
+msgid ""
+"Event producers fire events using an instance of the parameterized "
+"<literal>Event</literal> interface. An instance of this interface is "
+"obtained by injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:96
-#, no-c-format
-msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
-msgstr "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
-
 #. Tag: para
-#: events.xml:98
 #, fuzzy, no-c-format
-msgid "A producer raises events by calling the <literal>fire()</literal> method of the <literal>Event</literal> interface, passing the event object:"
-msgstr "Um produtor lança eventos chamando o método <literal>fire()</literal> da interface <literal>Event</literal> e passando um objeto <emphasis>event object</emphasis>:"
+msgid ""
+"A producer raises events by calling the <literal>fire()</literal> method of "
+"the <literal>Event</literal> interface, passing the event object:"
+msgstr ""
+"Um produtor lança eventos chamando o método <literal>fire()</literal> da "
+"interface <literal>Event</literal> e passando um objeto <emphasis>event "
+"object</emphasis>:"
 
-#. Tag: programlisting
-#: events.xml:103
-#, no-c-format
-msgid "<![CDATA[documentEvent.fire(document);]]>"
-msgstr "<![CDATA[documentEvent.fire(document);]]>"
-
 #. Tag: para
-#: events.xml:105
 #, fuzzy, no-c-format
 msgid "This particular event will be delivered to every observer method that:"
 msgstr "O evento será entregue a todo método observador (observer method) que:"
 
 #. Tag: para
-#: events.xml:111
 #, fuzzy, no-c-format
-msgid "has an event parameter to which the event object (the <literal>Document</literal>) is assignable, and"
+msgid ""
+"has an event parameter to which the event object (the <literal>Document</"
+"literal>) is assignable, and"
 msgstr "tenha um parâmetro evento em que o  evento objeto é atribuído, e"
 
 #. Tag: para
-#: events.xml:115
 #, fuzzy, no-c-format
 msgid "specifies no qualifiers."
 msgstr "não especifique nenhum evento bindings."
 
 #. Tag: para
-#: events.xml:119
 #, fuzzy, no-c-format
-msgid "The container simply calls all the observer methods, passing the event object as the value of the event parameter. If any observer method throws an exception, the container stops calling observer methods, and the exception is rethrown by the <literal>fire()</literal> method."
-msgstr "O gerenciador do Web Bean simplesmente chama  todos os métodos de observação, passando o objeto do evento como o valor do parâmetro do evento. Se algum método observador  lança uma exceção, o gerenciador do Web Bean deixa de chamar os métodos do observador, e a exceção é relançada pelo método <literal>fire()</literal>."
+msgid ""
+"The container simply calls all the observer methods, passing the event "
+"object as the value of the event parameter. If any observer method throws an "
+"exception, the container stops calling observer methods, and the exception "
+"is rethrown by the <literal>fire()</literal> method."
+msgstr ""
+"O gerenciador do Web Bean simplesmente chama  todos os métodos de "
+"observação, passando o objeto do evento como o valor do parâmetro do evento. "
+"Se algum método observador  lança uma exceção, o gerenciador do Web Bean "
+"deixa de chamar os métodos do observador, e a exceção é relançada pelo "
+"método <literal>fire()</literal>."
 
 #. Tag: para
-#: events.xml:125
 #, no-c-format
 msgid "Qualifiers can be applied to an event in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: events.xml:131
 #, no-c-format
 msgid "by annotating the <literal>Event</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: events.xml:134
 #, no-c-format
-msgid "by passing qualifiers to the <literal>select()</literal> of <literal>Event</literal>."
+msgid ""
+"by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
+"literal>."
 msgstr ""
 
 #. Tag: para
-#: events.xml:138
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is far simpler:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:142
-#, no-c-format
-msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
-msgstr "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
-
 #. Tag: para
-#: events.xml:144
 #, fuzzy, no-c-format
-msgid "Then, every event fired via this instance of <literal>Event</literal> has the event qualifier <literal>@Updated</literal>. The event is delivered to every observer method that:"
-msgstr "Em seguida, todos os eventos disparados por essa instância de <literal>Event</literal> tem o binding de evento anotada. O evento será entregue a cada método observador que:"
+msgid ""
+"Then, every event fired via this instance of <literal>Event</literal> has "
+"the event qualifier <literal>@Updated</literal>. The event is delivered to "
+"every observer method that:"
+msgstr ""
+"Em seguida, todos os eventos disparados por essa instância de "
+"<literal>Event</literal> tem o binding de evento anotada. O evento será "
+"entregue a cada método observador que:"
 
 #. Tag: para
-#: events.xml:151
 #, no-c-format
 msgid "has an event parameter to which the event object is assignable, and"
 msgstr "tenha um parâmetro evento em que o  evento objeto é atribuído, e"
 
 #. Tag: para
-#: events.xml:154
 #, fuzzy, no-c-format
-msgid "does not have any event qualifier <emphasis>except</emphasis> for the event qualifiers that match those specified at the <literal>Event</literal> injection point."
-msgstr "não especifique nenhum binding de evento <emphasis>exceto</emphasis> para o binding de evento passado para o <literal>fire()</literal>."
+msgid ""
+"does not have any event qualifier <emphasis>except</emphasis> for the event "
+"qualifiers that match those specified at the <literal>Event</literal> "
+"injection point."
+msgstr ""
+"não especifique nenhum binding de evento <emphasis>exceto</emphasis> para o "
+"binding de evento passado para o <literal>fire()</literal>."
 
 #. Tag: para
-#: events.xml:161
 #, no-c-format
-msgid "The downside of annotating the injection point is that we can't specify the qualifier dynamically. CDI lets us obtain a qualifier instance by subclassing the helper class <literal>AnnotationLiteral</literal>. That way, we can pass the qualifier to the <literal>select()</literal> method of <literal>Event</literal>."
+msgid ""
+"The downside of annotating the injection point is that we can't specify the "
+"qualifier dynamically. CDI lets us obtain a qualifier instance by "
+"subclassing the helper class <literal>AnnotationLiteral</literal>. That way, "
+"we can pass the qualifier to the <literal>select()</literal> method of "
+"<literal>Event</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:167
-#, no-c-format
-msgid "<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire(document);]]>"
-msgstr "<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire(document);]]>"
-
 #. Tag: para
-#: events.xml:169
 #, no-c-format
-msgid "Events can have multiple event qualifiers, assembled using any combination of annotations at the <literal>Event</literal> injection point and qualifier instances passed to the <literal>select()</literal> method."
+msgid ""
+"Events can have multiple event qualifiers, assembled using any combination "
+"of annotations at the <literal>Event</literal> injection point and qualifier "
+"instances passed to the <literal>select()</literal> method."
 msgstr ""
 
 #. Tag: title
-#: events.xml:178
 #, fuzzy, no-c-format
 msgid "Conditional observer methods"
 msgstr "Observadores transacionais"
 
 #. Tag: para
-#: events.xml:180
 #, no-c-format
-msgid "By default, if there is no instance of an observer in the current context, the container will instantiate the observer in order to deliver an event to it. This behavior isn't always desirable. We may want to deliver events only to instances of the observer that already exist in the current contexts."
+msgid ""
+"By default, if there is no instance of an observer in the current context, "
+"the container will instantiate the observer in order to deliver an event to "
+"it. This behavior isn't always desirable. We may want to deliver events only "
+"to instances of the observer that already exist in the current contexts."
 msgstr ""
 
 #. Tag: para
-#: events.xml:186
 #, no-c-format
-msgid "A conditional observer is specified by adding <literal>receive = IF_EXISTS</literal> to the <literal>@Observes</literal> annotation."
+msgid ""
+"A conditional observer is specified by adding <literal>receive = IF_EXISTS</"
+"literal> to the <literal>@Observes</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:191
-#, no-c-format
-msgid "<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = IF_EXISTS) @Updated Document d) { ... }]]>"
-msgstr "<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = IF_EXISTS) @Updated Document d) { ... }]]>"
-
 #. Tag: para
-#: events.xml:193
 #, no-c-format
-msgid "A bean with scope <literal>@Dependent</literal> cannot be a conditional observer, since it would never be called!"
+msgid ""
+"A bean with scope <literal>@Dependent</literal> cannot be a conditional "
+"observer, since it would never be called!"
 msgstr ""
 
 #. Tag: title
-#: events.xml:200
 #, fuzzy, no-c-format
 msgid "Event qualifiers with members"
 msgstr "Bindings de eventos com os membros"
 
 #. Tag: para
-#: events.xml:202
 #, fuzzy, no-c-format
 msgid "An event qualifier type may have annotation members:"
 msgstr "Um tipo de binding de evento pode ter anotações membro:"
 
-#. Tag: programlisting
-#: events.xml:204
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"   RoleType value();\n"
-"}]]>"
+"The member value is used to narrow the messages delivered to the observer:"
 msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"   RoleType value();\n"
-"}]]>"
+"O valor do membro é utilizado para reduzir as mensagens entregues ao "
+"observador:"
 
 #. Tag: para
-#: events.xml:206
-#, no-c-format
-msgid "The member value is used to narrow the messages delivered to the observer:"
-msgstr "O valor do membro é utilizado para reduzir as mensagens entregues ao observador:"
-
-#. Tag: programlisting
-#: events.xml:208
-#, no-c-format
-msgid "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) { ... }]]>"
-msgstr "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) { ... }]]>"
-
-#. Tag: para
-#: events.xml:210
 #, fuzzy, no-c-format
-msgid "Event qualifier type members may be specified statically by the event producer, via annotations at the event notifier injection point:"
-msgstr "Membros de tipo de binding de evento podem ser especificados estaticamente pelo produtor do evento, por meio de anotações no ponto de notificação do evento:"
+msgid ""
+"Event qualifier type members may be specified statically by the event "
+"producer, via annotations at the event notifier injection point:"
+msgstr ""
+"Membros de tipo de binding de evento podem ser especificados estaticamente "
+"pelo produtor do evento, por meio de anotações no ponto de notificação do "
+"evento:"
 
-#. Tag: programlisting
-#: events.xml:215
-#, no-c-format
-msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
-msgstr "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
-
 #. Tag: para
-#: events.xml:217
 #, fuzzy, no-c-format
-msgid "Alternatively, the value of the event qualifier type member may be determined dynamically by the event producer. We start by writing an abstract subclass of <literal>AnnotationLiteral</literal>:"
-msgstr "Alternativamente, o valor do membro do tipo de binding de evento pode ser determinado dinamicamente pelo produtor do evento. Vamos começar escrevendo uma subclasse abstrata de <literal>AnnotationLiteral</literal>:"
-
-#. Tag: programlisting
-#: events.xml:222
-#, no-c-format
 msgid ""
-"<![CDATA[abstract class RoleBinding \n"
-"   extends AnnotationLiteral<Role> \n"
-"   implements Role {}]]>"
+"Alternatively, the value of the event qualifier type member may be "
+"determined dynamically by the event producer. We start by writing an "
+"abstract subclass of <literal>AnnotationLiteral</literal>:"
 msgstr ""
-"<![CDATA[abstract class RoleBinding \n"
-"   extends AnnotationLiteral<Role> \n"
-"   implements Role {}]]>"
+"Alternativamente, o valor do membro do tipo de binding de evento pode ser "
+"determinado dinamicamente pelo produtor do evento. Vamos começar escrevendo "
+"uma subclasse abstrata de <literal>AnnotationLiteral</literal>:"
 
 #. Tag: para
-#: events.xml:224
 #, fuzzy, no-c-format
-msgid "The event producer passes an instance of this class to <literal>select()</literal>:"
-msgstr "O produtor do evento (event producer) passa uma instância dessa classe para <literal>fire()</literal>:"
-
-#. Tag: programlisting
-#: events.xml:226
-#, no-c-format
 msgid ""
-"<![CDATA[documentEvent.select(new RoleBinding() {\n"
-"   public void value() { return user.getRole(); }\n"
-"}).fire(document);]]>"
+"The event producer passes an instance of this class to <literal>select()</"
+"literal>:"
 msgstr ""
-"<![CDATA[documentEvent.select(new RoleBinding() {\n"
-"   public void value() { return user.getRole(); }\n"
-"}).fire(document);]]>"
+"O produtor do evento (event producer) passa uma instância dessa classe para "
+"<literal>fire()</literal>:"
 
 #. Tag: title
-#: events.xml:231
 #, fuzzy, no-c-format
 msgid "Multiple event qualifiers"
 msgstr "Múltiplos  bindings de eventos"
 
 #. Tag: para
-#: events.xml:233
 #, fuzzy, no-c-format
 msgid "Event qualifier types may be combined, for example:"
 msgstr "Tipos de  binding de evento podem ser combinados, por exemplo:"
 
-#. Tag: programlisting
-#: events.xml:235
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>(){}).fire(document);]]>"
+"When this event occurs, all of the following observer methods will be "
+"notified:"
 msgstr ""
-"<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>(){}).fire(document);]]>"
+"Quando esse evento ocorre, todos os métodos observadores que seguem esse "
+"evento serão notificados:"
 
-#. Tag: para
-#: events.xml:237
-#, no-c-format
-msgid "When this event occurs, all of the following observer methods will be notified:"
-msgstr "Quando esse evento ocorre, todos os métodos observadores que seguem esse evento serão notificados:"
-
-#. Tag: programlisting
-#: events.xml:239
-#, no-c-format
-msgid "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document document) { ... }]]>"
-msgstr "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document document) { ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:241
-#, no-c-format
-msgid "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) { ... }]]>"
-msgstr "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) { ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:242
-#, no-c-format
-msgid "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) { ... }}}]]>"
-msgstr "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) { ... }}}]]>"
-
 #. Tag: title
-#: events.xml:247
 #, no-c-format
 msgid "Transactional observers"
 msgstr "Observadores transacionais"
 
 #. Tag: para
-#: events.xml:249
 #, no-c-format
-msgid "Transactional observers receive their event notifications during the before or after completion phase of the transaction in which the event was raised. For example, the following observer method needs to refresh a query result set that is cached in the application context, but only when transactions that update the <literal>Category</literal> tree succeed:"
-msgstr "Observadores transacionais recebem notificações de eventos durante, antes ou após a conclusão da transação em que o evento foi disparado. Por exemplo: o seguinte método observador necessita atualizar um conjunto de resultados de uma consulta que está armazenada no contexto da aplicação, mas apenas quando as transações que atualizam a àrvore de <literal>Category</literal>forem concluídas com sucesso:"
+msgid ""
+"Transactional observers receive their event notifications during the before "
+"or after completion phase of the transaction in which the event was raised. "
+"For example, the following observer method needs to refresh a query result "
+"set that is cached in the application context, but only when transactions "
+"that update the <literal>Category</literal> tree succeed:"
+msgstr ""
+"Observadores transacionais recebem notificações de eventos durante, antes ou "
+"após a conclusão da transação em que o evento foi disparado. Por exemplo: o "
+"seguinte método observador necessita atualizar um conjunto de resultados de "
+"uma consulta que está armazenada no contexto da aplicação, mas apenas quando "
+"as transações que atualizam a àrvore de <literal>Category</literal>forem "
+"concluídas com sucesso:"
 
-#. Tag: programlisting
-#: events.xml:256
-#, no-c-format
-msgid "<![CDATA[public void refreshCategoryTree(@Observes(during = AFTER_SUCCESS) CategoryUpdateEvent event) { ... }]]>"
-msgstr "<![CDATA[public void refreshCategoryTree(@Observes(during = AFTER_SUCCESS) CategoryUpdateEvent event) { ... }]]>"
-
 #. Tag: para
-#: events.xml:258
 #, fuzzy, no-c-format
 msgid "There are five kinds of transactional observers:"
 msgstr "Existem três tipos de observadores transacionais:"
 
 #. Tag: para
-#: events.xml:262
 #, no-c-format
-msgid "<literal>IN_PROGESS</literal> observers are called immediately (default)"
+msgid ""
+"<literal>IN_PROGESS</literal> observers are called immediately (default)"
 msgstr ""
 
 #. Tag: para
-#: events.xml:265
 #, fuzzy, no-c-format
-msgid "<literal>AFTER_SUCCESS</literal> observers are called during the after completion phase of the transaction, but only if the transaction completes successfully"
-msgstr "<literal>@AfterTransactionSuccess</literal> observadores são chamados durante a fase após a conclusão da transação, mas somente se a transação tiver sido concluída com sucesso"
+msgid ""
+"<literal>AFTER_SUCCESS</literal> observers are called during the after "
+"completion phase of the transaction, but only if the transaction completes "
+"successfully"
+msgstr ""
+"<literal>@AfterTransactionSuccess</literal> observadores são chamados "
+"durante a fase após a conclusão da transação, mas somente se a transação "
+"tiver sido concluída com sucesso"
 
 #. Tag: para
-#: events.xml:271
 #, fuzzy, no-c-format
-msgid "<literal>AFTER_FAILURE</literal> observers are called during the after completion phase of the transaction, but only if the transaction fails to complete successfully"
-msgstr "<literal>@AfterTransactionFailure</literal> observadores são chamados durante a fase após a conclusão da transação, mas somente se a transação não tiver sido concluída com sucesso"
+msgid ""
+"<literal>AFTER_FAILURE</literal> observers are called during the after "
+"completion phase of the transaction, but only if the transaction fails to "
+"complete successfully"
+msgstr ""
+"<literal>@AfterTransactionFailure</literal> observadores são chamados "
+"durante a fase após a conclusão da transação, mas somente se a transação não "
+"tiver sido concluída com sucesso"
 
 #. Tag: para
-#: events.xml:277
 #, fuzzy, no-c-format
-msgid "<literal>AFTER_COMPLETION</literal> observers are called during the after completion phase of the transaction"
-msgstr "<literal>@AfterTransactionCompletion</literal> observadores são chamados durante a fase  após a conclusão da transação"
+msgid ""
+"<literal>AFTER_COMPLETION</literal> observers are called during the after "
+"completion phase of the transaction"
+msgstr ""
+"<literal>@AfterTransactionCompletion</literal> observadores são chamados "
+"durante a fase  após a conclusão da transação"
 
 #. Tag: para
-#: events.xml:283
 #, fuzzy, no-c-format
-msgid "<literal>BEFORE_COMPLETION</literal> observers are called during the before completion phase of the transaction"
-msgstr "<literal>@BeforeTransactionCompletion</literal> observadores são chamados durante a fase antes da conclusão da transação"
+msgid ""
+"<literal>BEFORE_COMPLETION</literal> observers are called during the before "
+"completion phase of the transaction"
+msgstr ""
+"<literal>@BeforeTransactionCompletion</literal> observadores são chamados "
+"durante a fase antes da conclusão da transação"
 
 #. Tag: para
-#: events.xml:290
 #, fuzzy, no-c-format
-msgid "Transactional observers are very important in a stateful object model because state is often held for longer than a single atomic transaction."
-msgstr "Observadores transacionais  são muito importantes para um modelo de objetos stateful como o Web Beans, porque o estado é muitas vezes mantido por mais de uma única transação atômica."
+msgid ""
+"Transactional observers are very important in a stateful object model "
+"because state is often held for longer than a single atomic transaction."
+msgstr ""
+"Observadores transacionais  são muito importantes para um modelo de objetos "
+"stateful como o Web Beans, porque o estado é muitas vezes mantido por mais "
+"de uma única transação atômica."
 
 #. Tag: para
-#: events.xml:295
 #, no-c-format
-msgid "Imagine that we have cached a JPA query result set in the application scope:"
-msgstr "Imagine que fizemos cache do conjunto de resultados da consulta JPA no escopo de aplicação (application scope):"
-
-#. Tag: programlisting
-#: events.xml:297
-#, no-c-format
 msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   List<Product> products;\n"
-"\n"
-"   @Produces @Catalog \n"
-"   List<Product> getCatalog() {\n"
-"      if (products==null) {\n"
-"         products = em.createQuery(\"select p from Product p where p.deleted = false\")\n"
-"            .getResultList();\n"
-"      }\n"
-"      return products;\n"
-"   }\n"
-"    \n"
-"}]]>"
+"Imagine that we have cached a JPA query result set in the application scope:"
 msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   List<Product> products;\n"
-"\n"
-"   @Produces @Catalog \n"
-"   List<Product> getCatalog() {\n"
-"      if (products==null) {\n"
-"         products = em.createQuery(\"select p from Product p where p.deleted = false\")\n"
-"            .getResultList();\n"
-"      }\n"
-"      return products;\n"
-"   }\n"
-"    \n"
-"}]]>"
+"Imagine que fizemos cache do conjunto de resultados da consulta JPA no "
+"escopo de aplicação (application scope):"
 
 #. Tag: para
-#: events.xml:299
 #, no-c-format
-msgid "From time to time, a <literal>Product</literal> is created or deleted. When this occurs, we need to refresh the <literal>Product</literal> catalog. But we should wait until <emphasis>after</emphasis> the transaction completes successfully before performing this refresh!"
-msgstr "De tempos em tempos, um <literal>Product</literal> é criado ou excluído. Quando isso ocorre, é preciso atualizar o catálogo de <literal>Product</literal>. Mas devemos esperar até <emphasis>depois</emphasis> da transação ser concluída com sucesso antes de realizar essa atualização!"
+msgid ""
+"From time to time, a <literal>Product</literal> is created or deleted. When "
+"this occurs, we need to refresh the <literal>Product</literal> catalog. But "
+"we should wait until <emphasis>after</emphasis> the transaction completes "
+"successfully before performing this refresh!"
+msgstr ""
+"De tempos em tempos, um <literal>Product</literal> é criado ou excluído. "
+"Quando isso ocorre, é preciso atualizar o catálogo de <literal>Product</"
+"literal>. Mas devemos esperar até <emphasis>depois</emphasis> da transação "
+"ser concluída com sucesso antes de realizar essa atualização!"
 
 #. Tag: para
-#: events.xml:305
 #, fuzzy, no-c-format
-msgid "The bean that creates and deletes <literal>Product</literal>s could raise events, for example:"
-msgstr "O Web Bean que cria e remove <literal>Products</literal> pode lançar eventos, por exemplo:"
-
-#. Tag: programlisting
-#: events.xml:309
-#, no-c-format
 msgid ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"   @PersistenceContext EntityManager em;\n"
-"   @Inject @Any Event<Product> productEvent;\n"
-"\n"
-"   public void delete(Product product) {\n"
-"      em.delete(product);\n"
-"      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire(product);\n"
-"   }\n"
-"    \n"
-"   public void persist(Product product) {\n"
-"      em.persist(product);\n"
-"      productEvent.select(new AnnotationLiteral<Created>(){}).fire(product);\n"
-"   }\n"
-"   ...\n"
-"}]]>"
+"The bean that creates and deletes <literal>Product</literal>s could raise "
+"events, for example:"
 msgstr ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"   @PersistenceContext EntityManager em;\n"
-"   @Inject @Any Event<Product> productEvent;\n"
-"\n"
-"   public void delete(Product product) {\n"
-"      em.delete(product);\n"
-"      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire(product);\n"
-"   }\n"
-"    \n"
-"   public void persist(Product product) {\n"
-"      em.persist(product);\n"
-"      productEvent.select(new AnnotationLiteral<Created>(){}).fire(product);\n"
-"   }\n"
-"   ...\n"
-"}]]>"
+"O Web Bean que cria e remove <literal>Products</literal> pode lançar "
+"eventos, por exemplo:"
 
 #. Tag: para
-#: events.xml:311
 #, no-c-format
-msgid "And now <literal>Catalog</literal> can observe the events after successful completion of the transaction:"
-msgstr "E agora <literal>Catalog</literal> pode observar os eventos após o término da transação concluída com sucesso:"
-
-#. Tag: programlisting
-#: events.xml:315
-#, no-c-format
 msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"   ...\n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product product) {\n"
-"      products.add(product);\n"
-"   }\n"
-"    \n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product product) {\n"
-"      products.remove(product);\n"
-"   }\n"
-"}]]>"
+"And now <literal>Catalog</literal> can observe the events after successful "
+"completion of the transaction:"
 msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"   ...\n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product product) {\n"
-"      products.add(product);\n"
-"   }\n"
-"    \n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product product) {\n"
-"      products.remove(product);\n"
-"   }\n"
-"}]]>"
+"E agora <literal>Catalog</literal> pode observar os eventos após o término "
+"da transação concluída com sucesso:"
 
 #~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({FIELD, PARAMETER})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({FIELD, PARAMETER})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+
+#~ msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
+#~ msgstr "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
+
+#~ msgid "<![CDATA[documentEvent.fire(document);]]>"
+#~ msgstr "<![CDATA[documentEvent.fire(document);]]>"
+
+#~ msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
+#~ msgstr "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
+#~ "(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
+#~ "(document);]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = "
+#~ "IF_EXISTS) @Updated Document d) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = "
+#~ "IF_EXISTS) @Updated Document d) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "   RoleType value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "   RoleType value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+
+#~ msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
+#~ msgstr "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "   extends AnnotationLiteral<Role> \n"
+#~ "   implements Role {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "   extends AnnotationLiteral<Role> \n"
+#~ "   implements Role {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new RoleBinding() {\n"
+#~ "   public void value() { return user.getRole(); }\n"
+#~ "}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.select(new RoleBinding() {\n"
+#~ "   public void value() { return user.getRole(); }\n"
+#~ "}).fire(document);]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>()"
+#~ "{}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>()"
+#~ "{}).fire(document);]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void refreshCategoryTree(@Observes(during = "
+#~ "AFTER_SUCCESS) CategoryUpdateEvent event) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void refreshCategoryTree(@Observes(during = "
+#~ "AFTER_SUCCESS) CategoryUpdateEvent event) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   List<Product> products;\n"
+#~ "\n"
+#~ "   @Produces @Catalog \n"
+#~ "   List<Product> getCatalog() {\n"
+#~ "      if (products==null) {\n"
+#~ "         products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "            .getResultList();\n"
+#~ "      }\n"
+#~ "      return products;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   List<Product> products;\n"
+#~ "\n"
+#~ "   @Produces @Catalog \n"
+#~ "   List<Product> getCatalog() {\n"
+#~ "      if (products==null) {\n"
+#~ "         products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "            .getResultList();\n"
+#~ "      }\n"
+#~ "      return products;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "   @Inject @Any Event<Product> productEvent;\n"
+#~ "\n"
+#~ "   public void delete(Product product) {\n"
+#~ "      em.delete(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void persist(Product product) {\n"
+#~ "      em.persist(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "   @Inject @Any Event<Product> productEvent;\n"
+#~ "\n"
+#~ "   public void delete(Product product) {\n"
+#~ "      em.delete(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void persist(Product product) {\n"
+#~ "      em.persist(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "   ...\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "   ...\n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
+#~ "product) {\n"
+#~ "      products.add(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
+#~ "product) {\n"
+#~ "      products.remove(product);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "   ...\n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
+#~ "product) {\n"
+#~ "      products.add(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
+#~ "product) {\n"
+#~ "      products.remove(product);\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "The Web Beans event notification facility allows Web Beans to interact in "
 #~ "a totally decoupled manner. Event <emphasis>producers</emphasis> raise "
 #~ "events that are then delivered to event <emphasis>observers</emphasis> by "
@@ -627,18 +736,21 @@
 #~ "<emphasis>observadores</emphasis> de eventos pelo gerenciador do Web "
 #~ "Bean. Esse esquema básico pode soar como o familiar padrão observador/"
 #~ "observável padrão, mas há várias diferenças:"
+
 #~ msgid ""
 #~ "We specify the event bindings of the observer method by annotating the "
 #~ "event parameter:"
 #~ msgstr ""
 #~ "Especificamos os bindings de eventos do observador, anotando o parâmetro "
 #~ "do evento:"
+
 #~ msgid ""
 #~ "The event producer may obtain an <emphasis>event notifier</emphasis> "
 #~ "object by injection:"
 #~ msgstr ""
 #~ "O evento produtor pode obter um objeto <emphasis>notificador de evento "
 #~ "(event notifier)</emphasis> por injeção:"
+
 #~ msgid ""
 #~ "The <literal>@Observable</literal> annotation implicitly defines a Web "
 #~ "Bean with scope <literal>@Dependent</literal> and deployment type "
@@ -649,6 +761,7 @@
 #~ "Bean com o escopo <literal>@Dependent</literal> e tipo de implantação "
 #~ "<literal>@Standard</literal>, com uma implementação fornecida pelo "
 #~ "gerenciador do Web Bean."
+
 #~ msgid ""
 #~ "An event object may be an instance of any Java class that has no type "
 #~ "variables or wildcard type parameters. The event will be delivered to "
@@ -657,6 +770,7 @@
 #~ "Um objeto de evento pode ser uma instância de qualquer classe Java que "
 #~ "não tem nenhum tipo de variáveis ou parâmetros tipo curinga. O evento "
 #~ "será entregue a cada método observador  que:"
+
 #~ msgid ""
 #~ "To specify a \"selector\", the event producer may pass an instance of the "
 #~ "event binding type to the <literal>fire()</literal> method:"
@@ -664,6 +778,7 @@
 #~ "Para especificar um \"seletor\", o produtor do evento pode passar uma "
 #~ "instância do tipo de binding do evento para o método <literal>fire()</"
 #~ "literal>:"
+
 #~ msgid ""
 #~ "The helper class <literal>AnnotationLiteral</literal> makes it possible "
 #~ "to instantiate binding types inline, since this is otherwise difficult to "
@@ -671,12 +786,14 @@
 #~ msgstr ""
 #~ "O classe auxiliar <literal>AnnotationLiteral</literal> permite instanciar "
 #~ "tipo de binding inline, o que é  difícil de se fazer em Java."
+
 #~ msgid ""
 #~ "Alternatively, event bindings may be specified by annotating the event "
 #~ "notifier injection point:"
 #~ msgstr ""
 #~ "Alternativamente, bindings de eventos podem ser especificados anotando o "
 #~ "ponto de injeção do notificador do evento:"
+
 #~ msgid ""
 #~ "does not specify any event binding <emphasis>except</emphasis> for the "
 #~ "event bindings passed to <literal>fire()</literal> or the annotated event "
@@ -686,8 +803,10 @@
 #~ "para os bindings de evento passados para o <literal>fire()</literal> ou "
 #~ "os bindings de evento anotados do ponto de injeção do notificador de "
 #~ "evento."
+
 #~ msgid "Registering observers dynamically"
 #~ msgstr "Resgistrando observadores (observers) dinamicamente"
+
 #~ msgid ""
 #~ "It's often useful to register an event observer dynamically. The "
 #~ "application may implement the <literal>Observer</literal> interface and "
@@ -698,12 +817,14 @@
 #~ "aplicação pode implementar a interface <literal>Observer</literal> e "
 #~ "registrar a instância com um evento notificador chamando o método "
 #~ "<literal>observe()</literal>."
+
 #~ msgid ""
 #~ "<![CDATA[documentEvent.observe( new Observer<Document>() { public void "
 #~ "notify(Document doc) { ... } } );]]>"
 #~ msgstr ""
 #~ "<![CDATA[documentEvent.observe( new Observer<Document>() { public void "
 #~ "notify(Document doc) { ... } } );]]>"
+
 #~ msgid ""
 #~ "Event binding types may be specified by the event notifier injection "
 #~ "point or by passing event binding type instances to the <literal>observe()"
@@ -712,6 +833,7 @@
 #~ "Tipos de binding de eventos podem ser especificados pelo notificador do "
 #~ "evento no ponto de injeção, ou passando instâncias do tipo de binding de "
 #~ "evento para o método observador <literal>observe()</literal> method:"
+
 #~ msgid ""
 #~ "<![CDATA[documentEvent.observe( new Observer<Document>() { public void "
 #~ "notify(Document doc) { ... } }, \n"
@@ -722,4 +844,3 @@
 #~ "notify(Document doc) { ... } }, \n"
 #~ "                                                new "
 #~ "AnnotationLiteral<Updated>(){} );]]>"
-

Modified: doc/trunk/reference/pt-BR/example.po
===================================================================
--- doc/trunk/reference/pt-BR/example.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/example.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2010-01-15 10:27-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: example.xml:4
 #, no-c-format
 msgid "JSF web application example"
 msgstr "Exemplo de aplicação web JSF "
 
 #. Tag: para
-#: example.xml:6
 #, no-c-format
 msgid ""
 "Let's illustrate these ideas with a full example. We're going to implement "
@@ -35,110 +33,17 @@
 "(username) e a senha (password) fornecidos durante o login, com as "
 "restrições definidas utilizando anotações da especificação Beans Validation:"
 
-#. Tag: programlisting
-#: example.xml:12
-#, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    @NotNull @Length(min=3, max=25)\n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    @NotNull @Length(min=6, max=20)\n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    @NotNull @Length(min=3, max=25)\n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    @NotNull @Length(min=6, max=20)\n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:14
 #, no-c-format
 msgid "This bean is bound to the login prompt in the following JSF form:"
 msgstr "Esse bean é vinculado ao prompt de login no seguinte formulário JSF:"
 
-#. Tag: programlisting
-#: example.xml:16
-#, no-c-format
-msgid ""
-"<![CDATA[<h:form>\n"
-"   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"      <f:validateBean>\n"
-"         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"         <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"         <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"      </f:validateBean>\n"
-"   </h:panelGrid>\n"
-"   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-msgstr ""
-"<![CDATA[<h:form>\n"
-"   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"      <f:validateBean>\n"
-"         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"         <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"         <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"      </f:validateBean>\n"
-"   </h:panelGrid>\n"
-"   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-
 #. Tag: para
-#: example.xml:18
 #, no-c-format
 msgid "Users are represented by a JPA entity:"
 msgstr "Os usuários são representados por uma entidade JPA:"
 
-#. Tag: programlisting
-#: example.xml:22
-#, no-c-format
-msgid ""
-"<![CDATA[@Entity\n"
-"public class User {\n"
-"   private @NotNull @Length(min=3, max=25) @Id String username;\n"
-"   private @NotNull @Length(min=6, max=20) String password;\n"
-"   \n"
-"   public String getUsername() { return username; }\n"
-"   public void setUsername(String username) { this.username = username; }\n"
-"   public String setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Entity\n"
-"public class User {\n"
-"   private @NotNull @Length(min=3, max=25) @Id String username;\n"
-"   private @NotNull @Length(min=6, max=20) String password;\n"
-"   \n"
-"   public String getUsername() { return username; }\n"
-"   public void setUsername(String username) { this.username = username; }\n"
-"   public String setPassword(String password) { this.password = password; }\n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:24
 #, no-c-format
 msgid ""
 "(Note that we're also going to need a <literal>persistence.xml</literal> "
@@ -150,7 +55,6 @@
 "<literal>User</literal>.)"
 
 #. Tag: para
-#: example.xml:29
 #, no-c-format
 msgid ""
 "The actual work is done by a session-scoped bean that maintains information "
@@ -161,88 +65,7 @@
 "mantém informações sobre o atual usuário conectado e expõe a entidade "
 "<literal>User</literal> para outros beans:"
 
-#. Tag: programlisting
-#: example.xml:34
-#, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login implements Serializable {\n"
-"\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject @UserDatabase EntityManager userDatabase;\n"
-"\n"
-"   private User user;\n"
-"    \n"
-"   public void login() {\n"
-"      List<User> results = userDatabase.createQuery(\n"
-"         \"select u from User u where u.username = :username and u.password "
-"= :password\")\n"
-"         .setParameter(\"username\", credentials.getUsername())\n"
-"         .setParameter(\"password\", credentials.getPassword())\n"
-"         .getResultList();\n"
-"        \n"
-"      if (!results.isEmpty()) {\n"
-"         user = results.get(0);\n"
-"      }\n"
-"      else {\n"
-"         // perhaps add code here to report a failed login\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void logout() {\n"
-"      user = null;\n"
-"   }\n"
-"    \n"
-"   public boolean isLoggedIn() {\n"
-"      return user != null;\n"
-"   }\n"
-"    \n"
-"   @Produces @LoggedIn User getCurrentUser() {\n"
-"      return user;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login implements Serializable {\n"
-"\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject @UserDatabase EntityManager userDatabase;\n"
-"\n"
-"   private User user;\n"
-"    \n"
-"   public void login() {\n"
-"      List<User> results = userDatabase.createQuery(\n"
-"         \"select u from User u where u.username = :username and u.password "
-"= :password\")\n"
-"         .setParameter(\"username\", credentials.getUsername())\n"
-"         .setParameter(\"password\", credentials.getPassword())\n"
-"         .getResultList();\n"
-"        \n"
-"      if (!results.isEmpty()) {\n"
-"         user = results.get(0);\n"
-"      }\n"
-"      else {\n"
-"         // perhaps add code here to report a failed login\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void logout() {\n"
-"      user = null;\n"
-"   }\n"
-"    \n"
-"   public boolean isLoggedIn() {\n"
-"      return user != null;\n"
-"   }\n"
-"    \n"
-"   @Produces @LoggedIn User getCurrentUser() {\n"
-"      return user;\n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:36
 #, no-c-format
 msgid ""
 "<literal>@LoggedIn</literal> and <literal>@UserDatabase</literal> are custom "
@@ -251,36 +74,7 @@
 "<literal>@LoggedIn</literal> e <literal>@UserDatabase</literal> são "
 "anotações de qualificadores personalizados:"
 
-#. Tag: programlisting
-#: example.xml:38
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"public @interface LoggedIn {}]]>"
-msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"public @interface LoggedIn {}]]>"
-
-#. Tag: programlisting
-#: example.xml:40
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, PARAMETER, FIELD})\n"
-"public @interface UserDatabase {}]]>"
-msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, PARAMETER, FIELD})\n"
-"public @interface UserDatabase {}]]>"
-
 #. Tag: para
-#: example.xml:42
 #, no-c-format
 msgid ""
 "We need an adaptor bean to expose our typesafe <literal>EntityManager</"
@@ -289,22 +83,7 @@
 "Precisamos de um bean adaptador para expor nossa <literal>EntityManager</"
 "literal> typesafe:"
 
-#. Tag: programlisting
-#: example.xml:46
-#, no-c-format
-msgid ""
-"<![CDATA[class UserDatabaseProducer {\n"
-"   @Produces @UserDatabase @PersistenceContext \n"
-"   static EntityManager userDatabase;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[class UserDatabaseProducer {\n"
-"   @Produces @UserDatabase @PersistenceContext \n"
-"   static EntityManager userDatabase;\n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:48
 #, no-c-format
 msgid ""
 "Now <literal>DocumentEditor</literal>, or any other bean, can easily inject "
@@ -313,52 +92,12 @@
 "Agora, <literal>DocumentEditor</literal> ou qualquer outro bean, pode "
 "facilmente injetar o usuário atual:"
 
-#. Tag: programlisting
-#: example.xml:50
-#, no-c-format
-msgid ""
-"<![CDATA[public class DocumentEditor {\n"
-"   @Inject Document document;\n"
-"   @Inject @LoggedIn User currentUser;\n"
-"   @Inject @DocumentDatabase EntityManager docDatabase;\n"
-"    \n"
-"   public void save() {\n"
-"      document.setCreatedBy(currentUser);\n"
-"      docDatabase.persist(document);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class DocumentEditor {\n"
-"   @Inject Document document;\n"
-"   @Inject @LoggedIn User currentUser;\n"
-"   @Inject @DocumentDatabase EntityManager docDatabase;\n"
-"    \n"
-"   public void save() {\n"
-"      document.setCreatedBy(currentUser);\n"
-"      docDatabase.persist(document);\n"
-"   }\n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:52
 #, no-c-format
 msgid "Or we can reference the current user in a JSF view:"
 msgstr "Ou podemos referenciar o usuário atual em uma visão JSF:"
 
-#. Tag: programlisting
-#: example.xml:54
-#, no-c-format
-msgid ""
-"<![CDATA[<h:panelGroup rendered=\"#{login.loggedIn}\">\n"
-"   signed in as #{currentUser.username}\n"
-"</h:panelGroup>]]>"
-msgstr ""
-"<![CDATA[<h:panelGroup rendered=\"#{login.loggedIn}\">\n"
-"   signed in as #{currentUser.username}\n"
-"</h:panelGroup>]]>"
-
 #. Tag: para
-#: example.xml:56
 #, no-c-format
 msgid ""
 "Hopefully, this example gave you a taste of the CDI programming model. In "
@@ -367,3 +106,238 @@
 "Esperamos que este exemplo tenha dado um gostinho do modelo de programação "
 "em CDI. No capítulo seguinte, exploraremos a injeção de dependência com "
 "maior profundidade."
+
+#~ msgid ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=3, max=25)\n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=6, max=20)\n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=3, max=25)\n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=6, max=20)\n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<h:form>\n"
+#~ "   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "      <f:validateBean>\n"
+#~ "         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"username\" value=\"#{credentials.username}\"/"
+#~ ">\n"
+#~ "         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"password\" value=\"#{credentials.password}\"/"
+#~ ">\n"
+#~ "      </f:validateBean>\n"
+#~ "   </h:panelGrid>\n"
+#~ "   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#"
+#~ "{!login.loggedIn}\"/>\n"
+#~ "   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</h:form>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<h:form>\n"
+#~ "   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "      <f:validateBean>\n"
+#~ "         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"username\" value=\"#{credentials.username}\"/"
+#~ ">\n"
+#~ "         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"password\" value=\"#{credentials.password}\"/"
+#~ ">\n"
+#~ "      </f:validateBean>\n"
+#~ "   </h:panelGrid>\n"
+#~ "   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#"
+#~ "{!login.loggedIn}\"/>\n"
+#~ "   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</h:form>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Entity\n"
+#~ "public class User {\n"
+#~ "   private @NotNull @Length(min=3, max=25) @Id String username;\n"
+#~ "   private @NotNull @Length(min=6, max=20) String password;\n"
+#~ "   \n"
+#~ "   public String getUsername() { return username; }\n"
+#~ "   public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "   public String setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Entity\n"
+#~ "public class User {\n"
+#~ "   private @NotNull @Length(min=3, max=25) @Id String username;\n"
+#~ "   private @NotNull @Length(min=6, max=20) String password;\n"
+#~ "   \n"
+#~ "   public String getUsername() { return username; }\n"
+#~ "   public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "   public String setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login implements Serializable {\n"
+#~ "\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject @UserDatabase EntityManager userDatabase;\n"
+#~ "\n"
+#~ "   private User user;\n"
+#~ "    \n"
+#~ "   public void login() {\n"
+#~ "      List<User> results = userDatabase.createQuery(\n"
+#~ "         \"select u from User u where u.username = :username and u."
+#~ "password = :password\")\n"
+#~ "         .setParameter(\"username\", credentials.getUsername())\n"
+#~ "         .setParameter(\"password\", credentials.getPassword())\n"
+#~ "         .getResultList();\n"
+#~ "        \n"
+#~ "      if (!results.isEmpty()) {\n"
+#~ "         user = results.get(0);\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         // perhaps add code here to report a failed login\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void logout() {\n"
+#~ "      user = null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public boolean isLoggedIn() {\n"
+#~ "      return user != null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "      return user;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login implements Serializable {\n"
+#~ "\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject @UserDatabase EntityManager userDatabase;\n"
+#~ "\n"
+#~ "   private User user;\n"
+#~ "    \n"
+#~ "   public void login() {\n"
+#~ "      List<User> results = userDatabase.createQuery(\n"
+#~ "         \"select u from User u where u.username = :username and u."
+#~ "password = :password\")\n"
+#~ "         .setParameter(\"username\", credentials.getUsername())\n"
+#~ "         .setParameter(\"password\", credentials.getPassword())\n"
+#~ "         .getResultList();\n"
+#~ "        \n"
+#~ "      if (!results.isEmpty()) {\n"
+#~ "         user = results.get(0);\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         // perhaps add code here to report a failed login\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void logout() {\n"
+#~ "      user = null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public boolean isLoggedIn() {\n"
+#~ "      return user != null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "      return user;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface LoggedIn {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface LoggedIn {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface UserDatabase {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface UserDatabase {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[class UserDatabaseProducer {\n"
+#~ "   @Produces @UserDatabase @PersistenceContext \n"
+#~ "   static EntityManager userDatabase;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[class UserDatabaseProducer {\n"
+#~ "   @Produces @UserDatabase @PersistenceContext \n"
+#~ "   static EntityManager userDatabase;\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "   @Inject Document document;\n"
+#~ "   @Inject @LoggedIn User currentUser;\n"
+#~ "   @Inject @DocumentDatabase EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "   public void save() {\n"
+#~ "      document.setCreatedBy(currentUser);\n"
+#~ "      docDatabase.persist(document);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "   @Inject Document document;\n"
+#~ "   @Inject @LoggedIn User currentUser;\n"
+#~ "   @Inject @DocumentDatabase EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "   public void save() {\n"
+#~ "      document.setCreatedBy(currentUser);\n"
+#~ "      docDatabase.persist(document);\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<h:panelGroup rendered=\"#{login.loggedIn}\">\n"
+#~ "   signed in as #{currentUser.username}\n"
+#~ "</h:panelGroup>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<h:panelGroup rendered=\"#{login.loggedIn}\">\n"
+#~ "   signed in as #{currentUser.username}\n"
+#~ "</h:panelGroup>]]>"

Modified: doc/trunk/reference/pt-BR/extend.po
===================================================================
--- doc/trunk/reference/pt-BR/extend.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/extend.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-12-19 18:03-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: extend.xml:5
 #, no-c-format
 msgid "Portable extensions"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "CDI is intended to be a foundation for frameworks, extensions and "
@@ -35,7 +33,6 @@
 "pelos designers da Web Beans:"
 
 #. Tag: para
-#: extend.xml:15
 #, no-c-format
 msgid "integration with Business Process Management engines,"
 msgstr ""
@@ -43,7 +40,6 @@
 "Process Management)"
 
 #. Tag: para
-#: extend.xml:18
 #, no-c-format
 msgid ""
 "integration with third-party frameworks such as Spring, Seam, GWT or Wicket, "
@@ -53,31 +49,26 @@
 "Wicket, e"
 
 #. Tag: para
-#: extend.xml:23
 #, fuzzy, no-c-format
 msgid "new technology based upon the CDI programming model."
 msgstr "nova tecnologia baseada no modelo de programação da Web Beans."
 
 #. Tag: para
-#: extend.xml:27
 #, no-c-format
 msgid "More formally, according to the spec:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:32
 #, no-c-format
 msgid "A portable extension may integrate with the container by:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:35
 #, no-c-format
 msgid "Providing its own beans, interceptors and decorators to the container"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:40
 #, no-c-format
 msgid ""
 "Injecting dependencies into its own objects using the dependency injection "
@@ -85,13 +76,11 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:45
 #, no-c-format
 msgid "Providing a context implementation for a custom scope"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:50
 #, no-c-format
 msgid ""
 "Augmenting or overriding the annotation-based metadata with metadata from "
@@ -99,13 +88,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:58
 #, fuzzy, no-c-format
 msgid "Creating an <literal>Extension</literal>"
 msgstr "A classe <literal>Bean</literal> "
 
 #. Tag: para
-#: extend.xml:60
 #, no-c-format
 msgid ""
 "The first step in creating a portable extension is to write a class that "
@@ -114,14 +101,7 @@
 "service provider architecture."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:66
-#, no-c-format
-msgid "class MyExtension implements Extension { ... }"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:68
 #, no-c-format
 msgid ""
 "Next, we need to register our extension as a service provider by creating a "
@@ -129,14 +109,7 @@
 "literal>, which contains the name of our extension class:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:74
-#, no-c-format
-msgid "org.mydomain.extension.MyExtension"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:76
 #, no-c-format
 msgid ""
 "An extension is not a bean, exactly, since it is instantiated by the "
@@ -145,18 +118,7 @@
 "process is complete."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:82
-#, no-c-format
-msgid ""
-"@Inject \n"
-"MyBean(MyExtension myExtension) {\n"
-"   myExtension.doSomething();\n"
-"}"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:84
 #, no-c-format
 msgid ""
 "And, like beans, extensions can have observer methods. Usually, the observer "
@@ -164,33 +126,28 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:92
 #, no-c-format
 msgid "Container lifecycle events"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:94
 #, no-c-format
 msgid ""
 "During the initialization process, the container fires a series of events, "
 "including:"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:101
-#, no-c-format
-msgid "BeforeBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>BeforeBeanDiscovery</literal>"
+msgstr "O objeto <literal>Manager</literal>"
 
-#. Tag: literal
-#: extend.xml:106
-#, no-c-format
-msgid "ProcessAnnotatedType"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>ProcessAnnotatedType</literal>"
+msgstr "O objeto <literal>Manager</literal>"
 
 #. Tag: para
-#: extend.xml:110
 #, no-c-format
 msgid ""
 "<literal>ProcessInjectionTarget</literal> and <literal>ProcessProducer</"
@@ -198,54 +155,27 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:115
 #, no-c-format
 msgid ""
 "<literal>ProcessBean</literal> and <literal>ProcessObserverMethod</literal>"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:121
-#, no-c-format
-msgid "AfterBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>AfterBeanDiscovery</literal>"
+msgstr "O objeto <literal>Manager</literal>"
 
-#. Tag: literal
-#: extend.xml:126
+#. Tag: para
 #, no-c-format
-msgid "AfterDeploymentValidation"
+msgid "<literal>AfterDeploymentValidation</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:131
 #, no-c-format
 msgid "Extensions may observe these events:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:135
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"   \n"
-"   void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bbd) {\n"
-"      Logger.global.debug(\"beginning the scanning process\");\n"
-"   }\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      Logger.global.debug(\"scanning type: \" + pat.getAnnotatedType()."
-"getJavaClass().getName());\n"
-"   } \n"
-"\n"
-"   void afterBeanDiscovery(@Observes AfterBeanDiscovery abd) {\n"
-"      Logger.global.debug(\"finished the scanning process\");\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:137
 #, no-c-format
 msgid ""
 "In fact, the extension can do a lot more than just observe. The extension is "
@@ -253,45 +183,19 @@
 "example:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:142
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      //tell the container to ignore the type if it is annotated @Ignore\n"
-"      if ( pat.getAnnotatedType().isAnnotionPresent(Ignore.class) ) pat.veto"
-"();   \n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:144
 #, fuzzy, no-c-format
 msgid "The observer method may inject a <literal>BeanManager</literal>"
 msgstr ""
 "O nervo central para estender a Web Beans é o objeto <literal>Manager</"
 "literal>."
 
-#. Tag: programlisting
-#: extend.xml:148
-#, no-c-format
-msgid ""
-"<![CDATA[<T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> "
-"pat, BeanManager beanManager) { ... }]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:153
 #, fuzzy, no-c-format
 msgid "The <literal>BeanManager</literal> object"
 msgstr "O objeto <literal>Manager</literal>"
 
 #. Tag: para
-#: extend.xml:155
 #, fuzzy, no-c-format
 msgid ""
 "The nerve center for extending CDI is the <literal>BeanManager</literal> "
@@ -301,95 +205,7 @@
 "A interface <literal>Manager</literal> permite, programaticamente, registrar "
 "e obter Web Beans, interceptadores, decoradores,  observadores e contextos."
 
-#. Tag: programlisting
-#: extend.xml:161
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface BeanManager {\n"
-"   public Object getReference(Bean<?> bean, Type beanType, "
-"CreationalContext<?> ctx);\n"
-"   public Object getInjectableReference(InjectionPoint ij, "
-"CreationalContext<?> ctx);\n"
-"   public <T> CreationalContext<T> createCreationalContext(Contextual<T> "
-"contextual);\n"
-"   public Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers);\n"
-"   public Set<Bean<?>> getBeans(String name);\n"
-"   public Bean<?> getPassivationCapableBean(String id);\n"
-"   public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);\n"
-"   public void validate(InjectionPoint injectionPoint);\n"
-"   public void fireEvent(Object event, Annotation... qualifiers);\n"
-"   public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, "
-"Annotation... qualifiers);\n"
-"   public List<Decorator<?>> resolveDecorators(Set<Type> types, "
-"Annotation... qualifiers);\n"
-"   public List<Interceptor<?>> resolveInterceptors(InterceptionType type, "
-"Annotation... interceptorBindings);\n"
-"   public boolean isScope(Class<? extends Annotation> annotationType);\n"
-"   public boolean isNormalScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isPassivatingScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isQualifier(Class<? extends Annotation> annotationType);\n"
-"   public boolean isInterceptorBinding(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isStereotype(Class<? extends Annotation> annotationType);\n"
-"   public Set<Annotation> getInterceptorBindingDefinition(Class<? extends "
-"Annotation> bindingType);\n"
-"   public Set<Annotation> getStereotypeDefinition(Class<? extends "
-"Annotation> stereotype);\n"
-"   public Context getContext(Class<? extends Annotation> scopeType);\n"
-"   public ELResolver getELResolver();\n"
-"   public ExpressionFactory wrapExpressionFactory(ExpressionFactory "
-"expressionFactory);\n"
-"   public <T> AnnotatedType<T> createAnnotatedType(Class<T> type);\n"
-"   public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> "
-"type);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface Manager {\n"
-"   public Object getReference(Bean<?> bean, Type beanType, "
-"CreationalContext<?> ctx);\n"
-"   public Object getInjectableReference(InjectionPoint ij, "
-"CreationalContext<?> ctx);\n"
-"   public <T> CreationalContext<T> createCreationalContext(Contextual<T> "
-"contextual);\n"
-"   public Set<Bean<?>> getBeans(Type beanType, Annotation... bindings);\n"
-"   public Set<Bean<?>> getBeans(String name);\n"
-"   public <X> Bean<? extends X> getMostSpecializedBean(Bean<X> bean);\n"
-"   public Bean<?> getPassivationCapableBean(String id);\n"
-"   public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);\n"
-"   public void validate(InjectionPoint injectionPoint);\n"
-"   public void fireEvent(Object event, Annotation... bindings);\n"
-"   public <T> Set<ObserverMethod<?, T>> resolveObserverMethods(T event, "
-"Annotation... bindings);\n"
-"   public List<Decorator<?>> resolveDecorators(Set<Type> types, "
-"Annotation... bindings);\n"
-"   public List<Interceptor<?>> resolveInterceptors(InterceptionType type, "
-"Annotation... interceptorBindings);\n"
-"   public boolean isScope(Class<? extends Annotation> annotationType);\n"
-"   public boolean isNormalScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isPassivatingScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isQualifier(Class<? extends Annotation> annotationType);\n"
-"   public boolean isInterceptorBindingType(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isStereotype(Class<? extends Annotation> annotationType);\n"
-"   public Set<Annotation> getInterceptorBindingTypeDefinition(Class<? "
-"extends Annotation> bindingType);\n"
-"   public Set<Annotation> getStereotypeDefinition(Class<? extends "
-"Annotation> stereotype);\n"
-"   public Context getContext(Class<? extends Annotation> scopeType);\n"
-"   public ELResolver getELResolver();\n"
-"   public ExpressionFactory wrapExpressionFactory(ExpressionFactory "
-"expressionFactory);\n"
-"   public <T> AnnotatedType<T> createAnnotatedType(Class<T> type);\n"
-"   public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> "
-"type);\n"
-"}]]>"
-
 #. Tag: para
-#: extend.xml:163
 #, fuzzy, no-c-format
 msgid ""
 "Any bean or other Java EE component which supports injection can obtain an "
@@ -397,14 +213,7 @@
 msgstr ""
 "Nós podemos obter uma instância do <literal>Manager</literal> via injeção:"
 
-#. Tag: programlisting
-#: extend.xml:166
-#, fuzzy, no-c-format
-msgid "@Inject BeanManager beanManager;"
-msgstr "@Current Manager manager"
-
 #. Tag: para
-#: extend.xml:168
 #, no-c-format
 msgid ""
 "Java EE components may obtain an instance of <literal>BeanManager</literal> "
@@ -414,7 +223,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:174
 #, fuzzy, no-c-format
 msgid ""
 "Let's study some of the interfaces exposed by the <literal>BeanManager</"
@@ -424,13 +232,11 @@
 "literal>."
 
 #. Tag: title
-#: extend.xml:179
 #, fuzzy, no-c-format
 msgid "The <literal>InjectionTarget</literal> interface"
 msgstr "A interface <literal>Context</literal>"
 
 #. Tag: para
-#: extend.xml:181
 #, no-c-format
 msgid ""
 "The first thing that a framework developer is going to look for in the "
@@ -440,7 +246,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:188
 #, no-c-format
 msgid ""
 "We recommend that frameworks let CDI take over the job of actually "
@@ -451,50 +256,12 @@
 "field injection will be supported."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:196
-#, no-c-format
-msgid ""
-"<![CDATA[//get the BeanManager from JNDI\n"
-"BeanManager beanManager = (BeanManager) new InitialContext().lookup(\"java:"
-"comp/BeanManager\");\n"
-"\n"
-"//CDI uses an AnnotatedType object to read the annotations of a class\n"
-"AnnotatedType<SomeFrameworkComponent> type = beanManager.createAnnotatedType"
-"(SomeFrameworkComponent.class);\n"
-"\n"
-"//The extension uses an InjectionTarget to delegate instantiation, "
-"dependency injection \n"
-"//and lifecycle callbacks to the CDI container\n"
-"InjectionTarget<SomeFrameworkComponent> it = beanManager."
-"createInjectionTarget(type);\n"
-"\n"
-"//each instance needs its own CDI CreationalContext\n"
-"CreationalContext ctx = beanManager.createCreationalContext(null);\n"
-"\n"
-"//instantiate the framework component and inject its dependencies\n"
-"SomeFrameworkComponent instance = it.produce(ctx);  //call the constructor\n"
-"it.inject(instance, ctx);  //call initializer methods and perform field "
-"injection\n"
-"it.postConstruct(instance);  //call the @PostConstruct method\n"
-"\n"
-"...\n"
-"\n"
-"//destroy the framework component instance and clean up dependent objects\n"
-"it.preDestroy(instance);  //call the @PreDestroy method\n"
-"it.dispose(instance);  //it is now safe to discard the instance\n"
-"ctx.release();  //clean up dependent objects\n"
-"]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:201
 #, fuzzy, no-c-format
 msgid "The <literal>Bean</literal> interface"
 msgstr "A interface <literal>Context</literal>"
 
 #. Tag: para
-#: extend.xml:203
 #, fuzzy, no-c-format
 msgid ""
 "Instances of the interface <literal>Bean</literal> represent beans. There is "
@@ -508,57 +275,18 @@
 "<literal>Manager</literal> para todos os Web Beans da aplicação."
 
 #. Tag: para
-#: extend.xml:210
 #, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface exposes all the interesting things we "
-"dicussed in <xref linkend=\"bean-anatomy\"/>."
+"dicussed in <xref linkend=\"bean-anatomy\" />."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:215
-#, no-c-format
-msgid ""
-"<![CDATA[public interface Bean<T> extends Contextual<T> {\n"
-"   public Set<Type> getTypes();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public String getName();\n"
-"   public Set<Class<? extends Annotation>> getStereotypes();\n"
-"   public Class<?> getBeanClass();\n"
-"   public boolean isAlternative();\n"
-"   public boolean isNullable();\n"
-"   public Set<InjectionPoint> getInjectionPoints();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface Bean<T> extends Contextual<T> {\n"
-"   public Set<Type> getTypes();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public String getName();\n"
-"   public Set<Class<? extends Annotation>> getStereotypes();\n"
-"   public Class<?> getBeanClass();\n"
-"   public boolean isAlternative();\n"
-"   public boolean isNullable();\n"
-"   public Set<InjectionPoint> getInjectionPoints();\n"
-"}]]>"
-
 #. Tag: para
-#: extend.xml:217
 #, no-c-format
 msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:221
-#, no-c-format
-msgid ""
-"<![CDATA[Set<Bean<?>> allBeans = beanManager.getBeans(Obect.class, new "
-"AnnotationLiteral<Any>() {});]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:223
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface makes it possible for a portable "
@@ -576,13 +304,11 @@
 "injetados nos Web Beans."
 
 #. Tag: title
-#: extend.xml:233
 #, fuzzy, no-c-format
 msgid "Registering a <literal>Bean</literal>"
 msgstr "A classe <literal>Bean</literal> "
 
 #. Tag: para
-#: extend.xml:235
 #, no-c-format
 msgid ""
 "The most common kind of CDI portable extension registers a bean (or beans) "
@@ -590,7 +316,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:239
 #, no-c-format
 msgid ""
 "In this example, we make a framework class, <literal>SecurityManager</"
@@ -600,101 +325,7 @@
 "<literal>SecurityManager</literal> instance."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[public class SecurityManagerExtension implements Extension {\n"
-"    \n"
-"    void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager "
-"bm) {\n"
-"            \n"
-"        //use this to read annotations of the class\n"
-"        AnnotatedType<SecurityManager> at = bm.createAnnotatedType"
-"(SecurityManager.class); \n"
-"\n"
-"        //use this to instantiate the class and inject dependencies\n"
-"        final InjectionTarget<SecurityManager> it = bm.createInjectionTarget"
-"(at); \n"
-"\n"
-"        abd.addBean( new Bean<SecurityManager>() {\n"
-"\n"
-"            @Override\n"
-"            public Class<?> getBeanClass() {\n"
-"                return SecurityManager.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public String getName() {\n"
-"                return \"securityManager\";\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getQualifiers() {\n"
-"                Set<Annotation> qualifiers = new HashSet<Annotation>();\n"
-"                qualifiers.add( new AnnotationLiteral<Default>() {} );\n"
-"                qualifiers.add( new AnnotationLiteral<Any>() {} );\n"
-"                return qualifiers;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<? extends Annotation> getScope() {\n"
-"                return SessionScoped.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Class<? extends Annotation>> getStereotypes() {\n"
-"                return Collections.emptySet();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypes() {\n"
-"                Set<Type> types = new HashSet<Type>();\n"
-"                types.add(SecurityManager.class);\n"
-"                types.add(Object.class);\n"
-"                return types;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAlternative() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isNullable() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public SecurityManager create(CreationalContext<SecurityManager> "
-"ctx) {\n"
-"                SecurityManager instance = it.produce(ctx);\n"
-"                it.inject(instance, ctx);\n"
-"                it.postConstruct(instance);\n"
-"                return instance;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void destroy(SecurityManager instance, \n"
-"                                CreationalContext<SecurityManager> ctx) {\n"
-"                it.preDestroy(instance);\n"
-"                it.dispose(instance);\n"
-"                ctx.release();\n"
-"            }\n"
-"            \n"
-"        } );\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:248
 #, no-c-format
 msgid ""
 "But a portable extension can also mess with beans that are discovered "
@@ -702,13 +333,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:255
 #, no-c-format
 msgid "Wrapping an <literal>AnnotatedType</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:257
 #, no-c-format
 msgid ""
 "One of the most interesting things that an extension class can do is process "
@@ -717,7 +346,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:262
 #, no-c-format
 msgid ""
 "Let's start with an example of an extension that provides support for the "
@@ -728,101 +356,7 @@
 "<literal>value()</literal> of the <literal>@Named</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:270
-#, no-c-format
-msgid ""
-"<![CDATA[public class QualifiedNameExtension implements Extension {\n"
-"\n"
-"    <X> void processAnnotatedType(@Observes ProcessAnnotatedType<X> pat) {\n"
-"\n"
-"        //wrap this to override the annotations of the class\n"
-"        final AnnotatedType<X> at = pat.getAnnotatedType();\n"
-"        \n"
-"        AnnotatedType<X> wrapped = new AnnotatedType<X>() {\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedConstructor<X>> getConstructors() {\n"
-"                return at.getConstructors();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedField<? super X>> getFields() {\n"
-"                return at.getFields();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<X> getJavaClass() {\n"
-"                return at.getJavaClass();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedMethod<? super X>> getMethods() {\n"
-"                return at.getMethods();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public <T extends Annotation> T getAnnotation(final Class<T> "
-"annType) {\n"
-"                if ( Named.class.equals(annType) ) {\n"
-"                    class NamedLiteral \n"
-"                            extends AnnotationLiteral<Named> \n"
-"                            implements Named {\n"
-"                        @Override\n"
-"                        public String value() {\n"
-"                            Package pkg = at.getClass().getPackage();\n"
-"                            String unqualifiedName = at.getAnnotation(Named."
-"class).value();\n"
-"                            final String qualifiedName;\n"
-"                            if ( pkg.isAnnotationPresent(Named.class) ) {\n"
-"                                qualifiedName = pkg.getAnnotation(Named."
-"class).value() \n"
-"                                      + '.' + unqualifiedName;\n"
-"                            }\n"
-"                            else {\n"
-"                                qualifiedName = unqualifiedName;\n"
-"                            }\n"
-"                            return qualifiedName;\n"
-"                        }\n"
-"                    }\n"
-"                    return (T) new NamedLiteral();\n"
-"                }\n"
-"                else {\n"
-"                    return at.getAnnotation(annType);\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getAnnotations() {\n"
-"                return at.getAnnotations();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Type getBaseType() {\n"
-"                return at.getBaseType();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypeClosure() {\n"
-"                return at.getTypeClosure();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annType) {\n"
-"                return at.isAnnotationPresent(annType);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pat.setAnnotatedType(wrapped);\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:272
 #, no-c-format
 msgid ""
 "Here's a second example, which adds the <literal>@Alternative</literal> "
@@ -830,41 +364,7 @@
 "literal> interface."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:277
-#, no-c-format
-msgid ""
-"<![CDATA[class ServiceAlternativeExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"   \n"
-"      final AnnotatedType<T> type = pat.getAnnotatedType();\n"
-"      \n"
-"      if ( Service.class.isAssignableFrom( type.getJavaClass() ) ) {\n"
-"      \n"
-"         //if the class implements Service, make it an @Alternative\n"
-"         AnnotatedType<T> wrapped = new AnnotatedType<T>() {\n"
-"         \n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annotationType) {\n"
-"               return annotationType.equals(Alternative.class) ? \n"
-"                  true : type.isAnnotationPresent(annotationType);\n"
-"            }\n"
-"            \n"
-"            //remaining methods of AnnotatedType\n"
-"            ...\n"
-"         }\n"
-"         \n"
-"         pat.setAnnotatedType(wrapped);\n"
-"      }\n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:283
 #, no-c-format
 msgid ""
 "The <literal>AnnotatedType</literal> is not the only thing that can be "
@@ -872,13 +372,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:288
 #, no-c-format
 msgid "Wrapping an <literal>InjectionTarget</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:290
 #, no-c-format
 msgid ""
 "The <literal>InjectionTarget</literal> interface exposes operations for "
@@ -890,7 +388,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:297
 #, no-c-format
 msgid ""
 "Here's a CDI portable extension that reads values from properties files and "
@@ -902,16 +399,7 @@
 "<literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:305
-#, no-c-format
-msgid ""
-"firstName=Gavin\n"
-"lastName=King"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:307
 #, no-c-format
 msgid ""
 "The portable extension works by wrapping the containers "
@@ -919,121 +407,7 @@
 "<literal>inject()</literal> method."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:310
-#, no-c-format
-msgid ""
-"<![CDATA[public class ConfigExtension implements Extension {\n"
-"\n"
-"        <X> void processInjectionTarget(@Observes ProcessInjectionTarget<X> "
-"pit) {\n"
-"                \n"
-"                //wrap this to intercept the component lifecycle\n"
-"            final InjectionTarget<X> it = pit.getInjectionTarget();\n"
-"            \n"
-"        final Map<Field, Object> configuredValues = new HashMap<Field, "
-"Object>();\n"
-"        \n"
-"        //use this to read annotations of the class and its members\n"
-"        AnnotatedType<X> at = pit.getAnnotatedType();\n"
-"        \n"
-"        //read the properties file\n"
-"        String propsFileName = at.getClass().getSimpleName() + \".properties"
-"\";\n"
-"        InputStream stream = at.getJavaClass().getResourceAsStream"
-"(propsFileName);\n"
-"        if (stream!=null) {\n"
-"            \n"
-"            try {\n"
-"                Properties props = new Properties();\n"
-"                props.load(stream);\n"
-"                for (Map.Entry<Object, Object> property : props.entrySet()) "
-"{\n"
-"                    String fieldName = property.getKey().toString();\n"
-"                    Object value = property.getValue();\n"
-"                    try {\n"
-"                        Field field = at.getJavaClass().getField"
-"(fieldName);\n"
-"                        field.setAccessible(true);\n"
-"                        if ( field.getType().isAssignableFrom( value.getClass"
-"() ) ) {\n"
-"                            configuredValues.put(field, value);\n"
-"                        }\n"
-"                        else {\n"
-"                            //TODO: do type conversion automatically\n"
-"                            pit.addDefinitionError( new InjectionException(\n"
-"                                   \"field is not of type String: \" + "
-"field ) );\n"
-"                        }\n"
-"                    }\n"
-"                    catch (NoSuchFieldException nsfe) {\n"
-"                        pit.addDefinitionError(nsfe);\n"
-"                    }\n"
-"                    finally {\n"
-"                        stream.close();\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"            catch (IOException ioe) {\n"
-"                pit.addDefinitionError(ioe);\n"
-"            }\n"
-"        }\n"
-"        \n"
-"        InjectionTarget<X> wrapped = new InjectionTarget<X>() {\n"
-"\n"
-"            @Override\n"
-"            public void inject(X instance, CreationalContext<X> ctx) {\n"
-"                it.inject(instance, ctx);\n"
-"                \n"
-"                //set the values onto the new instance of the component\n"
-"                for (Map.Entry<Field, Object> configuredValue: "
-"configuredValues.entrySet()) {\n"
-"                    try {\n"
-"                        configuredValue.getKey().set(instance, "
-"configuredValue.getValue());\n"
-"                    }\n"
-"                    catch (Exception e) {\n"
-"                        throw new InjectionException(e);\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void postConstruct(X instance) {\n"
-"                it.postConstruct(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void preDestroy(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void dispose(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public X produce(CreationalContext<X> ctx) {\n"
-"                return it.produce(ctx);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pit.setInjectionTarget(wrapped);\n"
-"        \n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:312
 #, no-c-format
 msgid ""
 "There's a lot more to the portable extension SPI than what we've discussed "
@@ -1042,13 +416,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:320
 #, no-c-format
 msgid "The <literal>Context</literal> interface"
 msgstr "A interface <literal>Context</literal>"
 
 #. Tag: para
-#: extend.xml:322
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Context</literal> interface supports addition of new scopes to "
@@ -1057,28 +429,7 @@
 "A interface <literal>Context</literal> suporta a adição de novos escopos a "
 "Web Beans, ou extensões dos escopos existentes para novos ambientes."
 
-#. Tag: programlisting
-#: extend.xml:327
-#, no-c-format
-msgid ""
-"<![CDATA[public interface Context {\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
-"creationalContext);\n"
-"   public <T> T get(Contextual<T> contextual);\n"
-"   boolean isActive();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface Context {\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
-"creationalContext);\n"
-"   public <T> T get(Contextual<T> contextual);\n"
-"   boolean isActive();\n"
-"}]]>"
-
 #. Tag: para
-#: extend.xml:329
 #, fuzzy, no-c-format
 msgid ""
 "For example, we might implement <literal>Context</literal> to add a business "
@@ -1091,6 +442,142 @@
 
 #, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public interface BeanManager {\n"
+#~ "   public Object getReference(Bean<?> bean, Type beanType, "
+#~ "CreationalContext<?> ctx);\n"
+#~ "   public Object getInjectableReference(InjectionPoint ij, "
+#~ "CreationalContext<?> ctx);\n"
+#~ "   public <T> CreationalContext<T> createCreationalContext(Contextual<T> "
+#~ "contextual);\n"
+#~ "   public Set<Bean<?>> getBeans(Type beanType, Annotation... "
+#~ "qualifiers);\n"
+#~ "   public Set<Bean<?>> getBeans(String name);\n"
+#~ "   public Bean<?> getPassivationCapableBean(String id);\n"
+#~ "   public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);\n"
+#~ "   public void validate(InjectionPoint injectionPoint);\n"
+#~ "   public void fireEvent(Object event, Annotation... qualifiers);\n"
+#~ "   public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T "
+#~ "event, Annotation... qualifiers);\n"
+#~ "   public List<Decorator<?>> resolveDecorators(Set<Type> types, "
+#~ "Annotation... qualifiers);\n"
+#~ "   public List<Interceptor<?>> resolveInterceptors(InterceptionType type, "
+#~ "Annotation... interceptorBindings);\n"
+#~ "   public boolean isScope(Class<? extends Annotation> annotationType);\n"
+#~ "   public boolean isNormalScope(Class<? extends Annotation> "
+#~ "annotationType);\n"
+#~ "   public boolean isPassivatingScope(Class<? extends Annotation> "
+#~ "annotationType);\n"
+#~ "   public boolean isQualifier(Class<? extends Annotation> "
+#~ "annotationType);\n"
+#~ "   public boolean isInterceptorBinding(Class<? extends Annotation> "
+#~ "annotationType);\n"
+#~ "   public boolean isStereotype(Class<? extends Annotation> "
+#~ "annotationType);\n"
+#~ "   public Set<Annotation> getInterceptorBindingDefinition(Class<? extends "
+#~ "Annotation> bindingType);\n"
+#~ "   public Set<Annotation> getStereotypeDefinition(Class<? extends "
+#~ "Annotation> stereotype);\n"
+#~ "   public Context getContext(Class<? extends Annotation> scopeType);\n"
+#~ "   public ELResolver getELResolver();\n"
+#~ "   public ExpressionFactory wrapExpressionFactory(ExpressionFactory "
+#~ "expressionFactory);\n"
+#~ "   public <T> AnnotatedType<T> createAnnotatedType(Class<T> type);\n"
+#~ "   public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> "
+#~ "type);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface Manager {\n"
+#~ "   public Object getReference(Bean<?> bean, Type beanType, "
+#~ "CreationalContext<?> ctx);\n"
+#~ "   public Object getInjectableReference(InjectionPoint ij, "
+#~ "CreationalContext<?> ctx);\n"
+#~ "   public <T> CreationalContext<T> createCreationalContext(Contextual<T> "
+#~ "contextual);\n"
+#~ "   public Set<Bean<?>> getBeans(Type beanType, Annotation... bindings);\n"
+#~ "   public Set<Bean<?>> getBeans(String name);\n"
+#~ "   public <X> Bean<? extends X> getMostSpecializedBean(Bean<X> bean);\n"
+#~ "   public Bean<?> getPassivationCapableBean(String id);\n"
+#~ "   public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);\n"
+#~ "   public void validate(InjectionPoint injectionPoint);\n"
+#~ "   public void fireEvent(Object event, Annotation... bindings);\n"
+#~ "   public <T> Set<ObserverMethod<?, T>> resolveObserverMethods(T event, "
+#~ "Annotation... bindings);\n"
+#~ "   public List<Decorator<?>> resolveDecorators(Set<Type> types, "
+#~ "Annotation... bindings);\n"
+#~ "   public List<Interceptor<?>> resolveInterceptors(InterceptionType type, "
+#~ "Annotation... interceptorBindings);\n"
+#~ "   public boolean isScope(Class<? extends Annotation> annotationType);\n"
+#~ "   public boolean isNormalScope(Class<? extends Annotation> "
+#~ "annotationType);\n"
+#~ "   public boolean isPassivatingScope(Class<? extends Annotation> "
+#~ "annotationType);\n"
+#~ "   public boolean isQualifier(Class<? extends Annotation> "
+#~ "annotationType);\n"
+#~ "   public boolean isInterceptorBindingType(Class<? extends Annotation> "
+#~ "annotationType);\n"
+#~ "   public boolean isStereotype(Class<? extends Annotation> "
+#~ "annotationType);\n"
+#~ "   public Set<Annotation> getInterceptorBindingTypeDefinition(Class<? "
+#~ "extends Annotation> bindingType);\n"
+#~ "   public Set<Annotation> getStereotypeDefinition(Class<? extends "
+#~ "Annotation> stereotype);\n"
+#~ "   public Context getContext(Class<? extends Annotation> scopeType);\n"
+#~ "   public ELResolver getELResolver();\n"
+#~ "   public ExpressionFactory wrapExpressionFactory(ExpressionFactory "
+#~ "expressionFactory);\n"
+#~ "   public <T> AnnotatedType<T> createAnnotatedType(Class<T> type);\n"
+#~ "   public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> "
+#~ "type);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "@Inject BeanManager beanManager;"
+#~ msgstr "@Current Manager manager"
+
+#~ msgid ""
+#~ "<![CDATA[public interface Bean<T> extends Contextual<T> {\n"
+#~ "   public Set<Type> getTypes();\n"
+#~ "   public Set<Annotation> getQualifiers();\n"
+#~ "   public Class<? extends Annotation> getScope();\n"
+#~ "   public String getName();\n"
+#~ "   public Set<Class<? extends Annotation>> getStereotypes();\n"
+#~ "   public Class<?> getBeanClass();\n"
+#~ "   public boolean isAlternative();\n"
+#~ "   public boolean isNullable();\n"
+#~ "   public Set<InjectionPoint> getInjectionPoints();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface Bean<T> extends Contextual<T> {\n"
+#~ "   public Set<Type> getTypes();\n"
+#~ "   public Set<Annotation> getQualifiers();\n"
+#~ "   public Class<? extends Annotation> getScope();\n"
+#~ "   public String getName();\n"
+#~ "   public Set<Class<? extends Annotation>> getStereotypes();\n"
+#~ "   public Class<?> getBeanClass();\n"
+#~ "   public boolean isAlternative();\n"
+#~ "   public boolean isNullable();\n"
+#~ "   public Set<InjectionPoint> getInjectionPoints();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public interface Context {\n"
+#~ "   public Class<? extends Annotation> getScope();\n"
+#~ "   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
+#~ "creationalContext);\n"
+#~ "   public <T> T get(Contextual<T> contextual);\n"
+#~ "   boolean isActive();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface Context {\n"
+#~ "   public Class<? extends Annotation> getScope();\n"
+#~ "   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
+#~ "creationalContext);\n"
+#~ "   public <T> T get(Contextual<T> contextual);\n"
+#~ "   boolean isActive();\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
 #~ "There are two subinterfaces of <literal>Bean</literal> defined by the CDI "
 #~ "specification: <literal>Interceptor</literal> and <literal>Decorator</"
 #~ "literal>."

Modified: doc/trunk/reference/pt-BR/extensions.po
===================================================================
--- doc/trunk/reference/pt-BR/extensions.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/extensions.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2010-01-07 10:42-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -15,13 +15,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: extensions.xml:8
 #, no-c-format
 msgid "CDI extensions available as part of Weld"
 msgstr "Extensões do CDI disponíveis como parte do Weld"
 
 #. Tag: para
-#: extensions.xml:11
 #, no-c-format
 msgid "These modules are usable on any JSR-299 implementation, not just Weld!"
 msgstr ""
@@ -29,13 +27,11 @@
 "apenas no Weld!"
 
 #. Tag: title
-#: extensions.xml:17
 #, no-c-format
 msgid "Weld Logger"
 msgstr "Weld Logger"
 
 #. Tag: para
-#: extensions.xml:19
 #, no-c-format
 msgid ""
 "Adding logging to your application is now even easier with simple injection "
@@ -48,38 +44,7 @@
 "injeção do tipo <literal>org.slf4j.Logger</literal> e um objeto de logger "
 "apropriado será injetado em qualquer instância do bean."
 
-#. Tag: programlisting
-#: extensions.xml:25
-#, no-c-format
-msgid ""
-"<![CDATA[import org.slf4j.Logger;\n"
-"import javax.inject.Inject;\n"
-"\n"
-"public class Checkout {\n"
-"   private @Inject Logger log;\n"
-"\n"
-"   public void invoiceItems() {\n"
-"      ShoppingCart cart;\n"
-"      ...\n"
-"      log.debug(\"Items invoiced for {}\", cart);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[import org.slf4j.Logger;\n"
-"import javax.inject.Inject;\n"
-"\n"
-"public class Checkout {\n"
-"   private @Inject Logger log;\n"
-"\n"
-"   public void invoiceItems() {\n"
-"      ShoppingCart cart;\n"
-"      ...\n"
-"      log.debug(\"Items invoiced for {}\", cart);\n"
-"   }\n"
-"}]]>"
-
 #. Tag: para
-#: extensions.xml:27
 #, no-c-format
 msgid ""
 "The example shows how objects can be interpolated into a message. If you use "
@@ -93,7 +58,6 @@
 "concatenação da string."
 
 #. Tag: para
-#: extensions.xml:34
 #, no-c-format
 msgid ""
 "You can add Weld logging to your project by including weld-logger.jar, sl4j-"
@@ -107,7 +71,6 @@
 "jboss.weld:weld-logger</literal>."
 
 #. Tag: para
-#: extensions.xml:39
 #, no-c-format
 msgid ""
 "If you are using Weld as your JSR-299 implementation, there's no need to "
@@ -116,3 +79,30 @@
 "Se você estiver utilizando o Weld como sua implementação da JSR-299, não há "
 "necessidade de incluir o sl4j, pois ele já está incluído (e usado "
 "internamente)."
+
+#~ msgid ""
+#~ "<![CDATA[import org.slf4j.Logger;\n"
+#~ "import javax.inject.Inject;\n"
+#~ "\n"
+#~ "public class Checkout {\n"
+#~ "   private @Inject Logger log;\n"
+#~ "\n"
+#~ "   public void invoiceItems() {\n"
+#~ "      ShoppingCart cart;\n"
+#~ "      ...\n"
+#~ "      log.debug(\"Items invoiced for {}\", cart);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[import org.slf4j.Logger;\n"
+#~ "import javax.inject.Inject;\n"
+#~ "\n"
+#~ "public class Checkout {\n"
+#~ "   private @Inject Logger log;\n"
+#~ "\n"
+#~ "   public void invoiceItems() {\n"
+#~ "      ShoppingCart cart;\n"
+#~ "      ...\n"
+#~ "      log.debug(\"Items invoiced for {}\", cart);\n"
+#~ "   }\n"
+#~ "}]]>"

Modified: doc/trunk/reference/pt-BR/gettingstarted.po
===================================================================
--- doc/trunk/reference/pt-BR/gettingstarted.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/gettingstarted.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2010-02-21 17:47-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,23 +14,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: gettingstarted.xml:5
 #, no-c-format
 msgid "Getting started with Weld"
 msgstr "Iniciando com o Weld"
 
 #. Tag: para
-#: gettingstarted.xml:7
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Weld comes with two starter example applications, in addition to more "
 "specialized examples. The first, <literal>weld-numberguess</literal>, is a "
-"web (WAR) example containing only non-transactional managed beans. This "
+"web (war) example containing only non-transactional managed beans. This "
 "example can be run on a wide range of servers, including JBoss AS, "
 "GlassFish, Apache Tomcat, Jetty, Google App Engine, and any compliant Java "
 "EE 6 container. The second example, <literal>weld-translator</literal>, is "
-"an enterprise (EAR) example that contains session beans. This example must "
-"be run on JBoss AS 5.2, Glassfish 3.0 or any compliant Java EE 6 container."
+"an enterprise (ear) example that contains session beans. This example must "
+"be run on JBoss AS 6.0, Glassfish 3.0 or any compliant Java EE 6 container."
 msgstr ""
 "Weld vem com duas aplicações de exemplo para iniciantes, além de exemplos "
 "mais especializados. O primeiro, <literal>weld-numberguess</literal>, é um "
@@ -43,7 +41,6 @@
 "Java EE 6 compatível."
 
 #. Tag: para
-#: gettingstarted.xml:16
 #, no-c-format
 msgid ""
 "Both examples use JSF 2.0 as the web framework and, as such, can be found in "
@@ -53,13 +50,11 @@
 "diretório <literal>examples/jsf</literal> da distribuição do Weld."
 
 #. Tag: title
-#: gettingstarted.xml:22
 #, no-c-format
 msgid "Prerequisites"
 msgstr "Pré-requisitos"
 
 #. Tag: para
-#: gettingstarted.xml:24
 #, no-c-format
 msgid ""
 "To run the examples with the provided build scripts, you'll need the "
@@ -69,53 +64,41 @@
 "precisará dos seguintes itens:"
 
 #. Tag: para
-#: gettingstarted.xml:30
 #, no-c-format
 msgid "the latest release of Weld, which contains the examples"
 msgstr "a última versão do Weld, a qual contém os exemplos"
 
 #. Tag: para
-#: gettingstarted.xml:33
 #, no-c-format
 msgid "Ant 1.7.0, to build and deploy the examples"
 msgstr "Ant 1.7.0, para construir e implantar os exemplos"
 
 #. Tag: para
-#: gettingstarted.xml:36
 #, no-c-format
 msgid "a supported runtime environment (minimum versions shown)"
 msgstr "um ambiente de execução suportado (versões mínimas requeridas)"
 
 #. Tag: para
-#: gettingstarted.xml:39
-#, no-c-format
-msgid ""
-"JBoss AS 5.2.0 (currently only nightly builds of JBoss AS 5.2.0.Beta1 are "
-"available),"
-msgstr ""
-"JBoss AS 5.2.0 (atualmente somente construções noturnas do JBoss AS 5.2.0."
-"Beta1 estão disponíveis),"
+#, fuzzy, no-c-format
+msgid "JBoss AS 6.0.0,"
+msgstr "JBoss AS 5.0.1.GA, e"
 
 #. Tag: para
-#: gettingstarted.xml:42
 #, no-c-format
 msgid "GlassFish 3.0,"
 msgstr "GlassFish 3.0,"
 
 #. Tag: para
-#: gettingstarted.xml:45
-#, no-c-format
-msgid "Apache Tomcat 6.0.x (WAR example only), or"
+#, fuzzy, no-c-format
+msgid "Apache Tomcat 6.0.x (war example only), or"
 msgstr "Apache Tomcat 6.0.x (somente com o exemplo WAR), ou"
 
 #. Tag: para
-#: gettingstarted.xml:48
-#, no-c-format
-msgid "Jetty 6.1.x (WAR example only)"
+#, fuzzy, no-c-format
+msgid "Jetty 6.1.x (war example only)"
 msgstr "Jetty 6.1.x (somente com o exemplo WAR)"
 
 #. Tag: para
-#: gettingstarted.xml:53
 #, no-c-format
 msgid ""
 "(optionally) Maven 2.x, to run the examples in an embedded servlet container"
@@ -124,7 +107,6 @@
 "embutido"
 
 #. Tag: para
-#: gettingstarted.xml:58
 #, no-c-format
 msgid ""
 "You'll need a full install of Ant 1.7.0. Some linux distributions only "
@@ -137,13 +119,12 @@
 "jar está no classpath."
 
 #. Tag: para
-#: gettingstarted.xml:64
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "In the next few sections, you'll be using the Ant command (<literal>ant</"
 "literal>) to invoke the Ant build script in each example to compile, "
-"assemble and deploy the example to JBoss AS and, for the WAR example, Apache "
-"Tomcat. You can also deploy the generated artifact (WAR or EAR) to any other "
+"assemble and deploy the example to JBoss AS and, for the war example, Apache "
+"Tomcat. You can also deploy the generated artifact (war or ear) to any other "
 "container that supports Java EE 6, such as GlassFish 3."
 msgstr ""
 "Nas próximas seções, você usará o comando do Ant (<literal>ant</literal>) "
@@ -153,19 +134,17 @@
 "qualquer outro contêiner que suporte Java EE 6, como o GlassFish 3."
 
 #. Tag: para
-#: gettingstarted.xml:71
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If you have Maven installed, you can use the Maven command (<literal>mvn</"
-"literal>) to compile and assemble the standalone artifact (WAR or EAR) and, "
-"for the WAR example, run it in an embedded container."
+"literal>) to compile and assemble the standalone artifact (war or ear) and, "
+"for the war example, run it in an embedded container."
 msgstr ""
 "Se você tem o Maven instalado, você pode usar o comando do Maven "
 "(<literal>mvn</literal>) para compilar e montar o artefato autônomo (WAR ou "
 "EAR) e, para o exemplo WAR, executá-lo em um contêiner embutido."
 
 #. Tag: para
-#: gettingstarted.xml:76
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
@@ -175,28 +154,25 @@
 "detalhes. Vamos iniciar com o JBoss AS."
 
 #. Tag: title
-#: gettingstarted.xml:81
 #, no-c-format
 msgid "Deploying to JBoss AS"
 msgstr "Implantando no JBoss AS"
 
 #. Tag: para
-#: gettingstarted.xml:83
 #, no-c-format
 msgid ""
 "To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss."
-"org/jbossas/\">JBoss AS 5.2.0.Beta1</ulink> or above. If a release of the "
-"JBoss AS 5.2 line isn't yet available, you can download a <ulink url="
-"\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-5.x-sun16/"
-"\">nightly snapshot</ulink>. The reason JBoss AS 5.2.0.Beta1 or above is "
-"required is because it's the first release that has both CDI and Bean "
-"Validation support built-in, making it close enough to Java EE 6 to run the "
-"examples. The good news is that there are no additional modifications you "
-"have to make to the server. It's ready to go!"
+"org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS "
+"6.0 line isn't yet available, you can download a <ulink url=\"http://hudson."
+"jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</"
+"ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the "
+"first release that has both CDI and Bean Validation support built-in, making "
+"it close enough to Java EE 6 to run the examples. The good news is that "
+"there are no additional modifications you have to make to the server. It's "
+"ready to go!"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:92
 #, no-c-format
 msgid ""
 "After you have downloaded JBoss AS, extract it. (We recommended renaming the "
@@ -206,16 +182,7 @@
 "installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[$> unzip jboss-5.2.*.zip\n"
-"$> mv jboss-5.2.*/ jboss-as-5.2]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:101
 #, no-c-format
 msgid ""
 "In order for the build scripts to know where to deploy the example, you have "
@@ -226,79 +193,37 @@
 "<literal>jboss.home</literal>, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:108
-#, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
-msgstr "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
-
 #. Tag: para
-#: gettingstarted.xml:110
 #, fuzzy, no-c-format
 msgid "You're now ready to deploy your first example!"
 msgstr ""
 "Agora, você está pronto para fazer a publicação do seu primeiro exemplo!"
 
 #. Tag: para
-#: gettingstarted.xml:114
 #, no-c-format
 msgid ""
 "Switch to the <literal>examples/jsf/numberguess</literal> directory and "
 "execute the Ant <literal>deploy</literal> target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:119
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant deploy]]>"
-msgstr ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant deploy]]>"
-
 #. Tag: para
-#: gettingstarted.xml:121
 #, no-c-format
 msgid ""
 "If you haven't already, start JBoss AS. You can either start JBoss AS from a "
 "Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:125
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/jboss-as-5.2\n"
-"$> ./bin/run.sh]]>"
-msgstr ""
-"<![CDATA[$> cd /path/to/jboss-as-5.2\n"
-"$> ./bin/run.sh]]>"
-
 #. Tag: para
-#: gettingstarted.xml:127 gettingstarted.xml:369
 #, no-c-format
 msgid "a Windows command window:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:131
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\jboss-as-5.2\\bin\n"
-"$> run]]>"
-msgstr ""
-"<![CDATA[$> cd c:\\path\\to\\jboss-as-5.2\\bin\n"
-"$> run]]>"
-
 #. Tag: para
-#: gettingstarted.xml:133 gettingstarted.xml:375
 #, no-c-format
 msgid "or you can start the server using an IDE, like Eclipse."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:138
 #, no-c-format
 msgid ""
 "If you are using Eclipse, you should seriously consider installing the "
@@ -308,7 +233,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:145
 #, fuzzy, no-c-format
 msgid ""
 "Wait a few seconds for the application to deploy (or the application server "
@@ -322,7 +246,6 @@
 "localhost:8080/webbeans-translator</ulink>). ulink&gt;) ."
 
 #. Tag: para
-#: gettingstarted.xml:152
 #, no-c-format
 msgid ""
 "The Ant build script includes additional targets for JBoss AS to deploy and "
@@ -331,7 +254,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:158
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant restart</literal> - deploy the example in exploded format to "
@@ -340,7 +262,6 @@
 "<literal>ant restart</literal> - implanta o exemplo no formato explodido"
 
 #. Tag: para
-#: gettingstarted.xml:163
 #, no-c-format
 msgid ""
 "<literal>ant explode</literal> - update an exploded example, without "
@@ -349,7 +270,6 @@
 "<literal>ant explode</literal> - atualiza o exemplo explodido, sem reiniciar "
 
 #. Tag: para
-#: gettingstarted.xml:168
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant deploy</literal> - deploy the example in compressed jar format "
@@ -358,19 +278,16 @@
 "<literal>ant deploy</literal> - implanta o exemplo no formato jar compactado"
 
 #. Tag: para
-#: gettingstarted.xml:173
 #, fuzzy, no-c-format
 msgid "<literal>ant undeploy</literal> - remove the example from JBoss AS"
 msgstr "<literal>ant undeploy</literal> - remove o exemplo do servidor"
 
 #. Tag: para
-#: gettingstarted.xml:178
 #, no-c-format
 msgid "<literal>ant clean</literal> - clean the example"
 msgstr "<literal>ant clean</literal> - limpa o exemplo"
 
 #. Tag: para
-#: gettingstarted.xml:185
 #, no-c-format
 msgid ""
 "The second starter example, <literal>weld-translator</literal>, will "
@@ -379,27 +296,15 @@
 "translator example directory and execute the deploy target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:191
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/translator\n"
-"$> ant deploy]]>"
-msgstr ""
-"<![CDATA[$> cd examples/jsf/translator\n"
-"$> ant deploy]]>"
-
 #. Tag: para
-#: gettingstarted.xml:194
 #, no-c-format
 msgid ""
 "The translator uses session beans, which are packaged in an EJB module "
-"within an EAR. Java EE 6 will allow session beans to be deployed in WAR "
+"within an ear. Java EE 6 will allow session beans to be deployed in war "
 "modules, but that's a topic for a later chapter."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:200
 #, fuzzy, no-c-format
 msgid ""
 "Again, wait a few seconds for the application to deploy (if you're really "
@@ -411,57 +316,32 @@
 "(<ulink url=\"http://localhost:8080/webbeans-translator\">http://"
 "localhost:8080/webbeans-translator</ulink>). ulink&gt;) ."
 
-#. Tag: para
-#: gettingstarted.xml:206
-#, no-c-format
-msgid ""
-"TODO Insert note about upgrading the Weld deployer that directs reader to "
-"section on the JBoss AS environment"
-msgstr ""
-
 #. Tag: title
-#: gettingstarted.xml:213
 #, fuzzy, no-c-format
 msgid "Deploying to GlassFish"
 msgstr "Utilizando o GlassFish"
 
 #. Tag: para
-#: gettingstarted.xml:215
 #, no-c-format
 msgid ""
-"Deploying to GlassFish should be easy, right? After all, it's the Java EE 6 "
-"reference implementation. Since it's the Java EE 6 reference implementation, "
-"that means it also bundles the JSR-299 reference implementation, Weld! So "
-"yes, it's very easy."
+"Deploying to GlassFish should be easy and familiar, right? After all, it's "
+"the Java EE 6 reference implementation and Weld is the JSR-299 reference "
+"implementation, meaning Weld gets bundled with GlassFish. So yes, it's all "
+"quite easy and familiar."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:221
 #, no-c-format
 msgid ""
 "To deploy the examples to GlassFish, you'll need the final <ulink url="
-"\"https://glassfish.dev.java.net/\">GlassFish V3</ulink> release (the "
-"preview release won't do). If the final release isn't yet available, you can "
-"download a <ulink url=\"http://download.java.net/glassfish/v3/promoted/"
-"\">promoted build</ulink> in the meantime. Select the b69 preview release or "
-"above that ends in either <literal>-unix.sh</literal> or <literal>-windows."
-"exe</literal> depending on your platform. After the download is complete, "
-"execute the installer. On Linux/Unix, you'll need to first make the script "
-"executable."
+"\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</"
+"ulink> release. Select the release that ends in either <literal>-unix.sh</"
+"literal> or <literal>-windows.exe</literal> depending on your platform. "
+"After the download is complete, execute the installer. On Linux/Unix, you'll "
+"need to first make the script executable."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:231
-#, no-c-format
-msgid ""
-"<![CDATA[$> chmod 755 glassfish-v3-b69-unix.sh\n"
-"$> ./glassfish-v3-b69-unix.sh]]>"
-msgstr ""
-"<![CDATA[$> chmod 755 glassfish-v3-b69-unix.sh\n"
-"$> ./glassfish-v3-b69-unix.sh]]>"
-
 #. Tag: para
-#: gettingstarted.xml:233
 #, no-c-format
 msgid ""
 "On Windows you can just click on the executable. Follow the instructions in "
@@ -472,7 +352,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:240
 #, no-c-format
 msgid ""
 "If you've deployed either of the starter examples, <literal>weld-"
@@ -481,18 +360,7 @@
 "either of the two directories and build it."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess (or examples/jsf/translator)\n"
-"$> ant package]]>"
-msgstr ""
-"<![CDATA[$> cd examples/jsf/numberguess (or examples/jsf/translator)\n"
-"$> ant package]]>"
-
 #. Tag: para
-#: gettingstarted.xml:248
 #, no-c-format
 msgid ""
 "The deployable archive for the <literal>weld-numberguess</literal>, named "
@@ -504,24 +372,17 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:255
 #, no-c-format
 msgid ""
-"You deploy applications to GlassFish using the <ulink url=\"http://"
-"localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin Console "
-"running, you need to start a GlassFish domain, in our case <literal>domain1</"
-"literal>. Switch to the <literal>bin</literal> folder in the directory where "
-"you installed GlassFish and execute the following command:"
+"One way to deploy applications to GlassFish is by using the <ulink url="
+"\"http://localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin "
+"Console running, you need to start a GlassFish domain, in our case "
+"<literal>domain1</literal>. Switch to the <literal>bin</literal> folder in "
+"the directory where you installed GlassFish and execute the following "
+"command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:262
-#, no-c-format
-msgid "<![CDATA[$> asadmin start-domain domain1]]>"
-msgstr "<![CDATA[$> asadmin start-domain domain1]]>"
-
 #. Tag: para
-#: gettingstarted.xml:264
 #, no-c-format
 msgid ""
 "After a few seconds you can visit the Admin Console in the browser at the "
@@ -538,22 +399,26 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:276
 #, no-c-format
 msgid ""
+"Alternatively, you can deploy the application to GlassFish using the asadmin "
+"command:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The reason the same artifact can be deployed to both JBoss AS and GlassFish, "
 "without any modifications, is because all of the features being used are "
 "part of the standard platform. And what a capable platform it has become!"
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:285
 #, fuzzy, no-c-format
 msgid "Deploying to Apache Tomcat"
 msgstr "Utilizando o Apache Tomcat 6.0"
 
 #. Tag: para
-#: gettingstarted.xml:287
 #, no-c-format
 msgid ""
 "Servlet containers are not required to support Java EE services like CDI. "
@@ -562,7 +427,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:291
 #, no-c-format
 msgid ""
 "Weld comes with a servlet listener which bootstraps the CDI environment, "
@@ -573,7 +437,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:297
 #, fuzzy, no-c-format
 msgid ""
 "Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll "
@@ -584,14 +447,7 @@
 "tomcat.apache.org/download-60.cgi\">tomcat.apache.org</ulink>, e descompacte-"
 "o. Por exemplo"
 
-#. Tag: programlisting
-#: gettingstarted.xml:302
-#, no-c-format
-msgid "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
-msgstr "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
-
 #. Tag: para
-#: gettingstarted.xml:304
 #, no-c-format
 msgid ""
 "You have two choices for how you can deploy the application to Tomcat. You "
@@ -602,13 +458,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:312
 #, no-c-format
 msgid "Deploying with Ant"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:314
 #, no-c-format
 msgid ""
 "In order for Ant to push the artifact to the Tomcat hot deploy directory, it "
@@ -619,38 +473,19 @@
 "property key <literal>tomcat.home</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:321
-#, no-c-format
-msgid "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
-msgstr "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
-
 #. Tag: para
-#: gettingstarted.xml:323
 #, fuzzy, no-c-format
 msgid "Now you're ready to deploy the numberguess example to Tomcat!"
 msgstr "Para implantar o exemplo numberguess no tomcat:"
 
 #. Tag: para
-#: gettingstarted.xml:327
 #, no-c-format
 msgid ""
 "Change to the <literal>examples/jsf/numberguess</literal> directory again "
 "and run the Ant <literal>deploy</literal> target for Tomcat:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:332
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant tomcat.deploy]]>"
-msgstr ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant tomcat.deploy]]>"
-
 #. Tag: para
-#: gettingstarted.xml:335
 #, no-c-format
 msgid ""
 "The Ant build script includes additional targets for Tomcat to deploy and "
@@ -659,7 +494,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:341
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.restart</literal> - deploy the example in exploded "
@@ -669,7 +503,6 @@
 "explodido"
 
 #. Tag: para
-#: gettingstarted.xml:346
 #, no-c-format
 msgid ""
 "<literal>ant tomcat.explode</literal> - update an exploded example, without "
@@ -679,7 +512,6 @@
 "reiniciar "
 
 #. Tag: para
-#: gettingstarted.xml:351
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.deploy</literal> - deploy the example in compressed jar "
@@ -689,41 +521,18 @@
 "compactado"
 
 #. Tag: para
-#: gettingstarted.xml:356
 #, fuzzy, no-c-format
 msgid "<literal>ant tomcat.undeploy</literal> - remove the example from Tomcat"
 msgstr "<literal>ant undeploy</literal> - remove o exemplo do servidor"
 
 #. Tag: para
-#: gettingstarted.xml:363
 #, no-c-format
 msgid ""
 "If you haven't already, start Tomcat. You can either start Tomcat from a "
 "Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:367
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/apache-tomcat-6\n"
-"$> ./bin/start.sh]]>"
-msgstr ""
-"<![CDATA[$> cd /path/to/apache-tomcat-6\n"
-"$> ./bin/start.sh]]>"
-
-#. Tag: programlisting
-#: gettingstarted.xml:373
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
-"$> start]]>"
-msgstr ""
-"<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
-"$> start]]>"
-
 #. Tag: para
-#: gettingstarted.xml:379
 #, no-c-format
 msgid ""
 "Wait a few seconds for the application to deploy (or the application server "
@@ -734,13 +543,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:388
 #, no-c-format
 msgid "Deploying with Maven"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:390
 #, no-c-format
 msgid ""
 "You can also deploy the application to Tomcat using Maven. This section is a "
@@ -750,7 +557,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:396
 #, no-c-format
 msgid ""
 "The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
@@ -762,7 +568,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:403
 #, no-c-format
 msgid ""
 "To allow Maven to communicate with Tomcat over HTTP, edit the <literal>conf/"
@@ -770,41 +575,20 @@
 "following line:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:408
-#, no-c-format
-msgid "<![CDATA[<user username=\"admin\" password=\"\" roles=\"manager\"/>]]>"
-msgstr "<![CDATA[<user username=\"admin\" password=\"\" roles=\"manager\"/>]]>"
-
 #. Tag: para
-#: gettingstarted.xml:410
 #, no-c-format
 msgid ""
 "Restart Tomcat. You can now deploy the application to Tomcat with Maven "
 "using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:414
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:exploded tomcat:exploded -Ptomcat]]>"
-msgstr "<![CDATA[$> mvn compile war:exploded tomcat:exploded -Ptomcat]]>"
-
 #. Tag: para
-#: gettingstarted.xml:416
 #, no-c-format
 msgid ""
 "Once the application is deployed, you can redeploy it using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:420
-#, no-c-format
-msgid "<![CDATA[$> mvn tomcat:redeploy -Ptomcat]]>"
-msgstr "<![CDATA[$> mvn tomcat:redeploy -Ptomcat]]>"
-
 #. Tag: para
-#: gettingstarted.xml:422
 #, no-c-format
 msgid ""
 "The <literal>-Ptomcat</literal> argument activates the <literal>tomcat</"
@@ -813,21 +597,13 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:427
 #, no-c-format
 msgid ""
 "Rather than shipping the container off to a standalone Tomcat installation, "
 "you can also execute the application in an embedded Tomcat 6 container:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:432
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace tomcat:run -Ptomcat]]>"
-msgstr "<![CDATA[$> mvn war:inplace tomcat:run -Ptomcat]]>"
-
 #. Tag: para
-#: gettingstarted.xml:434
 #, no-c-format
 msgid ""
 "The advantage of using the embedded server is that changes to assets in "
@@ -837,14 +613,7 @@
 "classpath resource, you need to execute a build:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:441
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Ptomcat]]>"
-msgstr "<![CDATA[$> mvn compile war:inplace -Ptomcat]]>"
-
 #. Tag: para
-#: gettingstarted.xml:443
 #, no-c-format
 msgid ""
 "There are several other Maven goals that you can use if you are hacking on "
@@ -853,13 +622,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:453
 #, no-c-format
 msgid "Deploying to Jetty"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:457
 #, no-c-format
 msgid ""
 "Support for Jetty in the examples is a more recent addition. Since Jetty is "
@@ -870,7 +637,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:464
 #, no-c-format
 msgid ""
 "If you've read through the entire Tomcat section, then you're all ready to "
@@ -880,7 +646,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:470
 #, no-c-format
 msgid ""
 "The Maven POM (<literal>pom.xml</literal>) includes a profile named "
@@ -892,27 +657,15 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:479
 #, no-c-format
 msgid ""
 "To run the <literal>weld-numberguess</literal> example on Jetty, switch to "
 "the example directory and execute the <literal>inplace</literal> goal of the "
-"Maven WAR plugin followed by the <literal>run</literal> goal of the Maven "
+"Maven war plugin followed by the <literal>run</literal> goal of the Maven "
 "Jetty plugin with the <literal>jetty</literal> profile enabled, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:485
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> mvn war:inplace jetty:run -Pjetty]]>"
-msgstr ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> mvn war:inplace jetty:run -Pjetty]]>"
-
 #. Tag: para
-#: gettingstarted.xml:487
 #, no-c-format
 msgid ""
 "The log output of Jetty will be shown in the console. Once Jetty reports "
@@ -923,7 +676,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:494
 #, no-c-format
 msgid ""
 "Any changes to assets in <literal>src/main/webapp</literal> take effect "
@@ -931,30 +683,22 @@
 "application may automatically redeploy. The redeploy behavior can be fined-"
 "tuned in the plugin configuration. If you make a change to a classpath "
 "resource, you need to execute a build and the <literal>inplace</literal> "
-"goal of the Maven WAR plugin, again with the <literal>jetty</literal> "
+"goal of the Maven war plugin, again with the <literal>jetty</literal> "
 "profile enabled."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:501
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Pjetty]]>"
-msgstr "<![CDATA[$> mvn compile war:inplace -Pjetty]]>"
-
 #. Tag: para
-#: gettingstarted.xml:503
 #, no-c-format
 msgid ""
-"The <literal>war:inplace</literal> goal copies the compiled classes and JARs "
+"The <literal>war:inplace</literal> goal copies the compiled classes and jars "
 "inside <literal>src/main/webapp</literal>, under <literal>WEB-INF/classes</"
 "literal> and <literal>WEB-INF/lib</literal>, respectively, mixing source and "
 "compiled files. However, the build does work around these temporary files by "
-"excluding them from the packaged WAR and cleaning them during the Maven "
+"excluding them from the packaged war and cleaning them during the Maven "
 "clean phase."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:510
 #, no-c-format
 msgid ""
 "You have two options if you want to run the example on Jetty from the IDE. "
@@ -964,33 +708,18 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:516
 #, fuzzy, no-c-format
 msgid "First, initialize the Eclipse project:"
 msgstr "Criando o projeto Eclipse"
 
-#. Tag: programlisting
-#: gettingstarted.xml:520
-#, no-c-format
-msgid "<![CDATA[$> mvn clean eclipse:clean eclipse:eclipse -Pjetty-ide]]>"
-msgstr "<![CDATA[$> mvn clean eclipse:clean eclipse:eclipse -Pjetty-ide]]>"
-
 #. Tag: para
-#: gettingstarted.xml:522
 #, no-c-format
 msgid ""
 "Next, assemble all the necessary resources under <literal>src/main/webapp</"
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:526
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace -Pjetty-ide]]>"
-msgstr "<![CDATA[$> mvn war:inplace -Pjetty-ide]]>"
-
 #. Tag: para
-#: gettingstarted.xml:528
 #, no-c-format
 msgid ""
 "Now, you are ready to run the server in Eclipse. Import the project into "
@@ -1003,7 +732,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:536
 #, no-c-format
 msgid ""
 "Now that you have gotten the starter applications deployed on the server of "
@@ -1011,6 +739,121 @@
 "work."
 msgstr ""
 
+#~ msgid ""
+#~ "JBoss AS 5.2.0 (currently only nightly builds of JBoss AS 5.2.0.Beta1 are "
+#~ "available),"
+#~ msgstr ""
+#~ "JBoss AS 5.2.0 (atualmente somente construções noturnas do JBoss AS 5.2.0."
+#~ "Beta1 estão disponíveis),"
+
+#~ msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
+#~ msgstr "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
+
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> ant deploy]]>"
+#~ msgstr ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> ant deploy]]>"
+
+#~ msgid ""
+#~ "<![CDATA[$> cd /path/to/jboss-as-5.2\n"
+#~ "$> ./bin/run.sh]]>"
+#~ msgstr ""
+#~ "<![CDATA[$> cd /path/to/jboss-as-5.2\n"
+#~ "$> ./bin/run.sh]]>"
+
+#~ msgid ""
+#~ "<![CDATA[$> cd c:\\path\\to\\jboss-as-5.2\\bin\n"
+#~ "$> run]]>"
+#~ msgstr ""
+#~ "<![CDATA[$> cd c:\\path\\to\\jboss-as-5.2\\bin\n"
+#~ "$> run]]>"
+
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/translator\n"
+#~ "$> ant deploy]]>"
+#~ msgstr ""
+#~ "<![CDATA[$> cd examples/jsf/translator\n"
+#~ "$> ant deploy]]>"
+
+#~ msgid ""
+#~ "<![CDATA[$> chmod 755 glassfish-v3-b69-unix.sh\n"
+#~ "$> ./glassfish-v3-b69-unix.sh]]>"
+#~ msgstr ""
+#~ "<![CDATA[$> chmod 755 glassfish-v3-b69-unix.sh\n"
+#~ "$> ./glassfish-v3-b69-unix.sh]]>"
+
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess (or examples/jsf/translator)\n"
+#~ "$> ant package]]>"
+#~ msgstr ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess (or examples/jsf/translator)\n"
+#~ "$> ant package]]>"
+
+#~ msgid "<![CDATA[$> asadmin start-domain domain1]]>"
+#~ msgstr "<![CDATA[$> asadmin start-domain domain1]]>"
+
+#~ msgid "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
+#~ msgstr "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
+
+#~ msgid "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
+#~ msgstr "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
+
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> ant tomcat.deploy]]>"
+#~ msgstr ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> ant tomcat.deploy]]>"
+
+#~ msgid ""
+#~ "<![CDATA[$> cd /path/to/apache-tomcat-6\n"
+#~ "$> ./bin/start.sh]]>"
+#~ msgstr ""
+#~ "<![CDATA[$> cd /path/to/apache-tomcat-6\n"
+#~ "$> ./bin/start.sh]]>"
+
+#~ msgid ""
+#~ "<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
+#~ "$> start]]>"
+#~ msgstr ""
+#~ "<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
+#~ "$> start]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<user username=\"admin\" password=\"\" roles=\"manager\"/>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<user username=\"admin\" password=\"\" roles=\"manager\"/>]]>"
+
+#~ msgid "<![CDATA[$> mvn compile war:exploded tomcat:exploded -Ptomcat]]>"
+#~ msgstr "<![CDATA[$> mvn compile war:exploded tomcat:exploded -Ptomcat]]>"
+
+#~ msgid "<![CDATA[$> mvn tomcat:redeploy -Ptomcat]]>"
+#~ msgstr "<![CDATA[$> mvn tomcat:redeploy -Ptomcat]]>"
+
+#~ msgid "<![CDATA[$> mvn war:inplace tomcat:run -Ptomcat]]>"
+#~ msgstr "<![CDATA[$> mvn war:inplace tomcat:run -Ptomcat]]>"
+
+#~ msgid "<![CDATA[$> mvn compile war:inplace -Ptomcat]]>"
+#~ msgstr "<![CDATA[$> mvn compile war:inplace -Ptomcat]]>"
+
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> mvn war:inplace jetty:run -Pjetty]]>"
+#~ msgstr ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> mvn war:inplace jetty:run -Pjetty]]>"
+
+#~ msgid "<![CDATA[$> mvn compile war:inplace -Pjetty]]>"
+#~ msgstr "<![CDATA[$> mvn compile war:inplace -Pjetty]]>"
+
+#~ msgid "<![CDATA[$> mvn clean eclipse:clean eclipse:eclipse -Pjetty-ide]]>"
+#~ msgstr "<![CDATA[$> mvn clean eclipse:clean eclipse:eclipse -Pjetty-ide]]>"
+
+#~ msgid "<![CDATA[$> mvn war:inplace -Pjetty-ide]]>"
+#~ msgstr "<![CDATA[$> mvn war:inplace -Pjetty-ide]]>"
+
 #, fuzzy
 #~ msgid ""
 #~ "Getting started with Web Beans, the Reference Implementation of JSR-299"
@@ -1044,9 +887,6 @@
 #~ "Tomcat) e o exemplo jsf2, que você pode usar se estiver utilizando JSF2. "
 #~ "Para executar os exemplos, você precisará do seguinte:"
 
-#~ msgid "JBoss AS 5.0.1.GA, or"
-#~ msgstr "JBoss AS 5.0.1.GA, e"
-
 #~ msgid "Ant 1.7.0."
 #~ msgstr "Ant 1.7.0."
 

Modified: doc/trunk/reference/pt-BR/injection.po
===================================================================
--- doc/trunk/reference/pt-BR/injection.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/injection.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2010-01-18 17:51-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,31 +14,27 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: injection.xml:4
 #, no-c-format
 msgid "Dependency injection and programmatic lookup"
 msgstr "Injeção e pesquisa programática de dependências"
 
 #. Tag: para
-#: injection.xml:6
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"One of the most significant features of CDI&#8212;certainly the most "
-"recognized&#8212;is dependency injection; excuse me, <emphasis>typesafe</"
-"emphasis> dependency injection."
+"One of the most significant features of CDI—certainly the most recognized—is "
+"dependency injection; excuse me, <emphasis>typesafe</emphasis> dependency "
+"injection."
 msgstr ""
 "Uma das características mais significativas do CDI&#8212;certamente a mais "
 "reconhecida&#8212;é injeção de dependência; desculpe-me, injeção de "
 "dependência com <emphasis>typesafe</emphasis>."
 
 #. Tag: title
-#: injection.xml:12
 #, no-c-format
 msgid "Injection points"
 msgstr "Pontos de injeção"
 
 #. Tag: para
-#: injection.xml:14
 #, no-c-format
 msgid ""
 "The <literal>@Inject</literal> annotation lets us define an injection point "
@@ -50,77 +46,21 @@
 "ocorrer por meio de três diferentes mecanismos."
 
 #. Tag: para
-#: injection.xml:19
 #, no-c-format
 msgid "<emphasis>Bean constructor</emphasis> parameter injection:"
 msgstr "Injeção por parâmetro no <emphasis>construtor do bean</emphasis>:"
 
-#. Tag: programlisting
-#: injection.xml:23
-#, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private final ShoppingCart cart;\n"
-"    \n"
-"   @Inject\n"
-"   public Checkout(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private final ShoppingCart cart;\n"
-"    \n"
-"   @Inject\n"
-"   public Checkout(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:26
 #, no-c-format
 msgid "A bean can only have one injectable constructor."
 msgstr "Um bean pode possuir somente um construtor injetável."
 
 #. Tag: para
-#: injection.xml:31
 #, no-c-format
 msgid "<emphasis>Initializer method</emphasis> parameter injection:"
 msgstr "Injeção por parâmetro em <emphasis>método inicializador</emphasis>:"
 
-#. Tag: programlisting
-#: injection.xml:35
-#, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private ShoppingCart cart;\n"
-"\n"
-"   @Inject\n"
-"   void setShoppingCart(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private ShoppingCart cart;\n"
-"\n"
-"   @Inject\n"
-"   void setShoppingCart(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:38
 #, no-c-format
 msgid ""
 "A bean can have multiple initializer methods. If the bean is a session bean, "
@@ -132,29 +72,11 @@
 "negócio do session bean."
 
 #. Tag: para
-#: injection.xml:44
 #, no-c-format
 msgid "And direct field injection:"
 msgstr "E injeção direta de campos:"
 
-#. Tag: programlisting
-#: injection.xml:48
-#, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"   private @Inject ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"   private @Inject ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:51
 #, no-c-format
 msgid ""
 "Getter and setter methods are not required for field injection to work "
@@ -164,7 +86,6 @@
 "(exceto com managed beans do JSF)."
 
 #. Tag: para
-#: injection.xml:56
 #, no-c-format
 msgid ""
 "Dependency injection always occurs when the bean instance is first "
@@ -176,7 +97,6 @@
 "coisas acontecem nesta ordem:"
 
 #. Tag: para
-#: injection.xml:63
 #, no-c-format
 msgid ""
 "First, the container calls the bean constructor (the default constructor or "
@@ -188,7 +108,6 @@
 "instância do bean."
 
 #. Tag: para
-#: injection.xml:69
 #, no-c-format
 msgid ""
 "Next, the container initializes the values of all injected fields of the "
@@ -198,7 +117,6 @@
 "do bean."
 
 #. Tag: para
-#: injection.xml:74
 #, no-c-format
 msgid ""
 "Next, the container calls all initializer methods of bean (the call order is "
@@ -208,7 +126,6 @@
 "ordem de chamada não é portável, não confie nela)."
 
 #. Tag: para
-#: injection.xml:80
 #, no-c-format
 msgid ""
 "Finally, the <literal>@PostConstruct</literal> method, if any, is called."
@@ -217,7 +134,6 @@
 "chamado."
 
 #. Tag: para
-#: injection.xml:86
 #, no-c-format
 msgid ""
 "(The only complication is that the container might call initializer methods "
@@ -229,7 +145,6 @@
 "declarados por uma subclasse.)"
 
 #. Tag: para
-#: injection.xml:90
 #, no-c-format
 msgid ""
 "One major advantage of constructor injection is that it allows the bean to "
@@ -239,7 +154,6 @@
 "bean seja imutável."
 
 #. Tag: para
-#: injection.xml:95
 #, no-c-format
 msgid ""
 "CDI also supports parameter injection for some other methods that are "
@@ -250,25 +164,12 @@
 "invocados pelo contêiner. Por exemplo, a injeção de parâmetro é suportada em "
 "métodos produtores:"
 
-#. Tag: programlisting
-#: injection.xml:100
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:102
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "This is a case where the <literal>@Inject</literal> annotation <emphasis>is "
 "not</emphasis> required at the injection point. The same is true for "
-"observer methods (which we'll meet in <xref linkend=\"events\"/>) and "
+"observer methods (which we'll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 "Este é um caso onde a anotação <literal>@Inject</literal> <emphasis>não é</"
@@ -277,13 +178,11 @@
 "métodos destruidores."
 
 #. Tag: title
-#: injection.xml:110
 #, no-c-format
 msgid "What gets injected"
 msgstr "Como as injeções são obtidas"
 
 #. Tag: para
-#: injection.xml:112
 #, no-c-format
 msgid ""
 "The CDI specification defines a procedure, called <emphasis>typesafe "
@@ -303,7 +202,6 @@
 "alguma das dependências de um bean não puder ser satisfeita."
 
 #. Tag: para
-#: injection.xml:120
 #, no-c-format
 msgid ""
 "The purpose of this algorithm is to allow multiple beans to implement the "
@@ -313,7 +211,6 @@
 "mesmo tipo de bean e também:"
 
 #. Tag: para
-#: injection.xml:126
 #, no-c-format
 msgid ""
 "allow the client to select which implementation it requires using a "
@@ -323,7 +220,6 @@
 "um <emphasis>qualificador</emphasis> ou"
 
 #. Tag: para
-#: injection.xml:131
 #, no-c-format
 msgid ""
 "allow the application deployer to select which implementation is appropriate "
@@ -335,13 +231,11 @@
 "ativar ou desativar um <emphasis>alternativo</emphasis>, ou"
 
 #. Tag: para
-#: injection.xml:137
 #, no-c-format
 msgid "allow the beans to be isolated into separate modules."
 msgstr "permitir que os beans sejam isolados dentro de módulos separados."
 
 #. Tag: para
-#: injection.xml:143
 #, no-c-format
 msgid ""
 "Obviously, if you have exactly one bean of a given type, and an injection "
@@ -355,7 +249,6 @@
 "terá provavelmente vários desses."
 
 #. Tag: para
-#: injection.xml:149
 #, no-c-format
 msgid ""
 "But then, things start to get complicated. Let's explore how the container "
@@ -367,13 +260,11 @@
 "iniciaremos dando um olhar mais atento em qualificadores."
 
 #. Tag: title
-#: injection.xml:157
 #, no-c-format
 msgid "Qualifier annotations"
 msgstr "Anotações de qualificadores"
 
 #. Tag: para
-#: injection.xml:159
 #, no-c-format
 msgid ""
 "If we have more than one bean that implements a particular bean type, the "
@@ -386,36 +277,7 @@
 "usando uma anotação de qualificador. Por exemplo, pode haver duas "
 "implementações de <literal>PaymentProcessor</literal>:"
 
-#. Tag: programlisting
-#: injection.xml:165
-#, no-c-format
-msgid ""
-"<![CDATA[@Synchronous\n"
-"public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Synchronous\n"
-"public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: injection.xml:167
-#, no-c-format
-msgid ""
-"<![CDATA[@Asynchronous\n"
-"public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Asynchronous\n"
-"public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:169
 #, no-c-format
 msgid ""
 "Where <literal>@Synchronous</literal> and <literal>@Asynchronous</literal> "
@@ -424,36 +286,7 @@
 "Onde <literal>@Synchronous</literal> e <literal>@Asynchronous</literal> são "
 "anotações de qualificadores:"
 
-#. Tag: programlisting
-#: injection.xml:173
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Synchronous {}]]>"
-msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Synchronous {}]]>"
-
-#. Tag: programlisting
-#: injection.xml:175
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Asynchronous {}]]>"
-msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Asynchronous {}]]>"
-
 #. Tag: para
-#: injection.xml:177
 #, no-c-format
 msgid ""
 "A client bean developer uses the qualifier annotation to specify exactly "
@@ -463,75 +296,21 @@
 "especificar exatamente qual bean deve ser injetado."
 
 #. Tag: para
-#: injection.xml:181
 #, no-c-format
 msgid "Using field injection:"
 msgstr "Utilizando injeção por campos (field injection):"
 
-#. Tag: programlisting
-#: injection.xml:183
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
-"@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
-"@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
-
 #. Tag: para
-#: injection.xml:185
 #, no-c-format
 msgid "Using initializer method injection:"
 msgstr "Utilizando injeção de método de inicialização:"
 
-#. Tag: programlisting
-#: injection.xml:187
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public void setPaymentProcessors(@Synchronous PaymentProcessor "
-"syncPaymentProcessor, \n"
-"                                 @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Inject\n"
-"public void setPaymentProcessors(@Synchronous PaymentProcessor "
-"syncPaymentProcessor, \n"
-"                                 @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:189
 #, no-c-format
 msgid "Using constructor injection:"
 msgstr "Usando injeção no construtor:"
 
-#. Tag: programlisting
-#: injection.xml:191
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
-"                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Inject\n"
-"public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
-"                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:193
 #, no-c-format
 msgid ""
 "Qualifier annotations can also qualify method arguments of producer, "
@@ -544,28 +323,7 @@
 "com métodos produtores é uma boa forma para ter uma implementação de um tipo "
 "de bean selecionado em tempo de execução com base no estado do sistema:"
 
-#. Tag: programlisting
-#: injection.xml:199
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces\n"
-"PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
-"syncPaymentProcessor,\n"
-"                                     @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   return isSynchronous() ? syncPaymentProcessor : asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces\n"
-"PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
-"syncPaymentProcessor,\n"
-"                                     @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   return isSynchronous() ? syncPaymentProcessor : asyncPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:201
 #, no-c-format
 msgid ""
 "If an injected field or a parameter of a bean constructor or initializer "
@@ -577,7 +335,6 @@
 "qualificador padrão, <literal>@Default</literal>, é assumido."
 
 #. Tag: para
-#: injection.xml:206
 #, no-c-format
 msgid ""
 "Now, you may be thinking, <emphasis>\"What's the different between using a "
@@ -595,7 +352,6 @@
 "alternativas de <literal>@Asynchronous PaymentProcessor</literal>!"
 
 #. Tag: title
-#: injection.xml:216
 #, no-c-format
 msgid ""
 "The built-in qualifiers <literal>@Default</literal> and <literal>@Any</"
@@ -605,7 +361,6 @@
 "literal>"
 
 #. Tag: para
-#: injection.xml:218
 #, no-c-format
 msgid ""
 "Whenever a bean or injection point does not explicitly declare a qualifier, "
@@ -626,7 +381,6 @@
 "elegíveis para injeção."
 
 #. Tag: para
-#: injection.xml:225
 #, no-c-format
 msgid ""
 "This is especially useful if you want to iterate over all beans with a "
@@ -635,32 +389,12 @@
 "Isto é especialmente útil se você quiser iterar sobre todos os beans com um "
 "certo tipo de bean. Por exemplo:"
 
-#. Tag: programlisting
-#: injection.xml:226
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject \n"
-"void initServices(@Any Instance<Service> services) { \n"
-"   for (Service service: services) {\n"
-"      service.init();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Inject \n"
-"void initServices(@Any Instance<Service> services) { \n"
-"   for (Service service: services) {\n"
-"      service.init();\n"
-"   }\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:232
 #, no-c-format
 msgid "Qualifiers with members"
 msgstr "Qualificadores com membros"
 
 #. Tag: para
-#: injection.xml:234
 #, no-c-format
 msgid ""
 "Java annotations can have members. We can use annotation members to further "
@@ -675,26 +409,7 @@
 "representando diferentes métodos de pagamento, podemos agregá-los em uma "
 "única anotação com um membro:"
 
-#. Tag: programlisting
-#: injection.xml:240
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:242
 #, no-c-format
 msgid ""
 "Then we select one of the possible member values when appling the qualifier:"
@@ -702,16 +417,7 @@
 "Então selecionamos um dos possíveis valores do membro ao aplicar o "
 "qualificador:"
 
-#. Tag: programlisting
-#: injection.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
-msgstr ""
-"<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
-
 #. Tag: para
-#: injection.xml:248
 #, no-c-format
 msgid ""
 "We can force the container to ignore a member of a qualifier type by "
@@ -720,50 +426,17 @@
 "Podemos forçar o contêiner a ignorar um membro de um tipo de qualificador ao "
 "anotar o membro com <literal>@Nonbinding</literal>."
 
-#. Tag: programlisting
-#: injection.xml:253
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"   @Nonbinding String comment() default \"\";\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"   @Nonbinding String comment() default \"\";\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:258
 #, no-c-format
 msgid "Multiple qualifiers"
 msgstr "Múltiplos qualificadores"
 
 #. Tag: para
-#: injection.xml:260
 #, no-c-format
 msgid "An injection point may specify multiple qualifiers:"
 msgstr "Um ponto de injeção pode especificar múltiplos qualificadores:"
 
-#. Tag: programlisting
-#: injection.xml:264
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
-"syncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
-"syncPaymentProcessor;]]>"
-
 #. Tag: para
-#: injection.xml:266
 #, no-c-format
 msgid ""
 "Then only a bean which has <emphasis>both</emphasis> qualifier annotations "
@@ -772,30 +445,12 @@
 "Neste caso, somente um bean que possua <emphasis>ambas</emphasis> anotações "
 "de qualificador seriam elegíveis para injeção."
 
-#. Tag: programlisting
-#: injection.xml:271
-#, no-c-format
-msgid ""
-"<![CDATA[@Synchronous @Reliable\n"
-"public class SynchronousReliablePaymentProcessor implements PaymentProcessor "
-"{\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Synchronous @Reliable\n"
-"public class SynchronousReliablePaymentProcessor implements PaymentProcessor "
-"{\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:276
 #, no-c-format
 msgid "Alternatives"
 msgstr "Alternativos"
 
 #. Tag: para
-#: injection.xml:278
 #, no-c-format
 msgid ""
 "Alternatives are beans whose implementation is specific to a particular "
@@ -808,22 +463,7 @@
 "implementação simulada de <literal>@Synchronous PaymentProcessor</literal> e "
 "<literal>@Asynchronous PaymentProcessor</literal>, tudo em um:"
 
-#. Tag: programlisting
-#: injection.xml:282
-#, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Synchronous @Asynchronous\n"
-"public class MockPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Alternative @Synchronous @Asynchronous\n"
-"public class MockPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:284
 #, no-c-format
 msgid ""
 "By default, <literal>@Alternative</literal> beans are disabled. We need to "
@@ -837,34 +477,7 @@
 "disponível para instanciação e injeção. Esta ativação somente se aplica aos "
 "beans neste arquivo."
 
-#. Tag: programlisting
-#: injection.xml:290
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <class>org.mycompany.mock.MockPaymentProcessor</class>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <class>org.mycompany.mock.MockPaymentProcessor</class>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-
 #. Tag: para
-#: injection.xml:292
 #, no-c-format
 msgid ""
 "When an ambiguous dependency exists at an injection point, the container "
@@ -878,13 +491,11 @@
 "habilitado, este é o bean que será injetado."
 
 #. Tag: title
-#: injection.xml:301
 #, no-c-format
 msgid "Fixing unsatisfied and ambiguous dependencies"
 msgstr "Corrigindo dependências não satisfeitas e ambíguas"
 
 #. Tag: para
-#: injection.xml:303
 #, no-c-format
 msgid ""
 "The typesafe resolution algorithm fails when, after considering the "
@@ -903,7 +514,6 @@
 "satisfeitas ou ambíguas."
 
 #. Tag: para
-#: injection.xml:310
 #, no-c-format
 msgid ""
 "During the course of your development, you're going to encounter this "
@@ -913,13 +523,11 @@
 "situação. Vamos aprender como resolvê-la."
 
 #. Tag: para
-#: injection.xml:314
 #, no-c-format
 msgid "To fix an <emphasis>unsatisfied dependency</emphasis>, either:"
 msgstr "Para corrigir uma <emphasis>dependência não satisfeita</emphasis>:"
 
 #. Tag: para
-#: injection.xml:320
 #, no-c-format
 msgid ""
 "create a bean which implements the bean type and has all the qualifier types "
@@ -929,7 +537,6 @@
 "qualificador do ponto de injeção,"
 
 #. Tag: para
-#: injection.xml:325
 #, no-c-format
 msgid ""
 "make sure that the bean you already have is in the classpath of the module "
@@ -939,7 +546,6 @@
 "com o ponto de injeção, ou"
 
 #. Tag: para
-#: injection.xml:330
 #, no-c-format
 msgid ""
 "explicitly enable an <literal>@Alternative</literal> bean that implements "
@@ -951,13 +557,11 @@
 "usando <literal>beans.xml</literal>."
 
 #. Tag: para
-#: injection.xml:337
 #, no-c-format
 msgid "To fix an <emphasis>ambiguous dependency</emphasis>, either:"
 msgstr "Para corrigir uma <emphasis>dependência ambígua</emphasis>:"
 
 #. Tag: para
-#: injection.xml:343
 #, no-c-format
 msgid ""
 "introduce a qualifier to distinguish between the two implementations of the "
@@ -967,7 +571,6 @@
 "tipo de bean,"
 
 #. Tag: para
-#: injection.xml:348
 #, no-c-format
 msgid ""
 "disable one of the beans by annotating it <literal>@Alternative</literal>,"
@@ -975,7 +578,6 @@
 "desabilite um dos beans anotando-o com <literal>@Alternative</literal>,"
 
 #. Tag: para
-#: injection.xml:353
 #, no-c-format
 msgid ""
 "move one of the implementations to a module that is not in the classpath of "
@@ -985,7 +587,6 @@
 "módulo com o ponto de injeção, ou"
 
 #. Tag: para
-#: injection.xml:359
 #, no-c-format
 msgid ""
 "disable one of two <literal>@Alternative</literal> beans that are trying to "
@@ -995,7 +596,6 @@
 "ocupar o mesmo espaço, usando <literal>beans.xml</literal>."
 
 #. Tag: para
-#: injection.xml:366
 #, no-c-format
 msgid ""
 "See <ulink url=\"http://sfwk.org/Documentation/"
@@ -1011,25 +611,22 @@
 "retorna o mesmo tipo de bean."
 
 #. Tag: para
-#: injection.xml:374
 #, no-c-format
 msgid "Just remember: \"There can be only one.\""
 msgstr "Apenas lembre-se: \"Só pode haver um.\""
 
 #. Tag: para
-#: injection.xml:377
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "On the other hand, if you really do have an optional or multivalued "
 "injection point, you should change the type of your injection point to "
-"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\"/>."
+"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 "Por outro lado, se você realmente tem um ponto de injeção opcional ou "
 "multivalorado, você deveria mudar o tipo de seu ponto de injeção para "
 "<literal>Instance</literal>, como veremos na <xref linkend=\"lookup\"/>."
 
 #. Tag: para
-#: injection.xml:382
 #, no-c-format
 msgid ""
 "Now there's one more issue you need to be aware of when using the dependency "
@@ -1039,13 +636,11 @@
 "serviço de injeção de dependência."
 
 #. Tag: title
-#: injection.xml:389
 #, no-c-format
 msgid "Client proxies"
 msgstr "Proxies clientes"
 
 #. Tag: para
-#: injection.xml:391
 #, no-c-format
 msgid ""
 "Clients of an injected bean do not usually hold a direct reference to a bean "
@@ -1057,13 +652,12 @@
 "(com escopo <literal>@Dependent</literal>)."
 
 #. Tag: para
-#: injection.xml:396
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Imagine that a bean bound to the application scope held a direct reference "
 "to a bean bound to the request scope. The application-scoped bean is shared "
 "between many different requests. However, each request should see a "
-"different instance of the request scoped bean&#8212;the current one!"
+"different instance of the request scoped bean—the current one!"
 msgstr ""
 "Imagine que um bean vinculado ao escopo da aplicação mantenha uma referência "
 "direta para um bean vinculado ao escopo da solicitação. O bean com escopo de "
@@ -1072,7 +666,6 @@
 "solicitação&#8212;a atual!"
 
 #. Tag: para
-#: injection.xml:402
 #, no-c-format
 msgid ""
 "Now imagine that a bean bound to the session scope holds a direct reference "
@@ -1091,7 +684,6 @@
 "armazená-lo!"
 
 #. Tag: para
-#: injection.xml:409
 #, no-c-format
 msgid ""
 "Therefore, unless a bean has the default scope <literal>@Dependent</"
@@ -1113,7 +705,6 @@
 "beans injetados."
 
 #. Tag: para
-#: injection.xml:417
 #, no-c-format
 msgid ""
 "Unfortunately, due to limitations of the Java language, some Java types "
@@ -1129,20 +720,17 @@
 "informando sobre o problema."
 
 #. Tag: para
-#: injection.xml:423
 #, no-c-format
 msgid "The following Java types cannot be proxied by the container:"
 msgstr "Os seguintes tipos Java não podem ser \"proxied\" pelo contêiner:"
 
 #. Tag: para
-#: injection.xml:427
 #, no-c-format
 msgid ""
 "classes which don't have a non-private constructor with no parameters, and"
 msgstr "classes que não possuem um construtor não privado sem parâmetros, e"
 
 #. Tag: para
-#: injection.xml:430
 #, no-c-format
 msgid ""
 "classes which are declared <literal>final</literal> or have a "
@@ -1152,13 +740,11 @@
 "<literal>final</literal>,"
 
 #. Tag: para
-#: injection.xml:435
 #, no-c-format
 msgid "arrays and primitive types."
 msgstr "arrays e tipos primitivos."
 
 #. Tag: para
-#: injection.xml:439
 #, no-c-format
 msgid ""
 "It's usually very easy to fix an unproxyable dependency problem. If an "
@@ -1170,13 +756,11 @@
 "dependência que não pode ser feito um proxy, simplesmente:"
 
 #. Tag: para
-#: injection.xml:446
 #, no-c-format
 msgid "add a constructor with no parameters to <literal>X</literal>,"
 msgstr "adicione um construtor sem parâmetros em <literal>X</literal>,"
 
 #. Tag: para
-#: injection.xml:451
 #, no-c-format
 msgid ""
 "change the type of the injection point to <literal>Instance&lt;X&gt;</"
@@ -1186,7 +770,6 @@
 "literal>,"
 
 #. Tag: para
-#: injection.xml:456
 #, no-c-format
 msgid ""
 "introduce an interface <literal>Y</literal>, implemented by the injected "
@@ -1196,7 +779,6 @@
 "injetado, e mude o tipo do ponto de injeção para <literal>Y</literal>, ou"
 
 #. Tag: para
-#: injection.xml:462
 #, no-c-format
 msgid ""
 "if all else fails, change the scope of the injected bean to "
@@ -1206,7 +788,6 @@
 "<literal>@Dependent</literal>."
 
 #. Tag: para
-#: injection.xml:469
 #, no-c-format
 msgid ""
 "A future release of Weld will likely support a non-standard workaround for "
@@ -1216,7 +797,6 @@
 "para esta limitação, usando APIs não portáveis da JVM:"
 
 #. Tag: para
-#: injection.xml:476
 #, no-c-format
 msgid ""
 "Sun, IcedTea, Mac: <literal>Unsafe.allocateInstance()</literal> (The most "
@@ -1226,7 +806,6 @@
 "eficiente)"
 
 #. Tag: para
-#: injection.xml:481
 #, no-c-format
 msgid ""
 "IBM, JRockit: <literal>ReflectionFactory.newConstructorForSerialization()</"
@@ -1236,19 +815,16 @@
 "literal>"
 
 #. Tag: para
-#: injection.xml:487
 #, no-c-format
 msgid "But we didn't get around to implementing this yet."
 msgstr "Mas não somos obrigados a implementar isto ainda."
 
 #. Tag: title
-#: injection.xml:496
 #, no-c-format
 msgid "Obtaining a contextual instance by programmatic lookup"
 msgstr "Obtendo uma instância contextual através de pesquisa programática"
 
 #. Tag: para
-#: injection.xml:498
 #, no-c-format
 msgid ""
 "In certain situations, injection is not the most convenient way to obtain a "
@@ -1258,7 +834,6 @@
 "referência contextual. Por exemplo, não pode ser usada quando:"
 
 #. Tag: para
-#: injection.xml:505
 #, no-c-format
 msgid "the bean type or qualifiers vary dynamically at runtime, or"
 msgstr ""
@@ -1266,7 +841,6 @@
 "ou"
 
 #. Tag: para
-#: injection.xml:510
 #, no-c-format
 msgid ""
 "depending upon the deployment, there may be no bean which satisfies the type "
@@ -1276,14 +850,12 @@
 "qualificadores, ou"
 
 #. Tag: para
-#: injection.xml:515
 #, no-c-format
 msgid "we would like to iterate over all beans of a certain type."
 msgstr ""
 "gostaríamos de realizar uma iteração sobre todos os beans de um certo tipo."
 
 #. Tag: para
-#: injection.xml:521
 #, no-c-format
 msgid ""
 "In these situations, the application may obtain an instance of the interface "
@@ -1292,14 +864,7 @@
 "Nestas situações, a aplicação pode obter uma instância da interface "
 "<literal>Instance</literal>, parametrizada para o tipo do bean, por injeção:"
 
-#. Tag: programlisting
-#: injection.xml:526
-#, no-c-format
-msgid "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
-
 #. Tag: para
-#: injection.xml:528
 #, no-c-format
 msgid ""
 "The <literal>get()</literal> method of <literal>Instance</literal> produces "
@@ -1308,26 +873,17 @@
 "O método <literal>get()</literal> de <literal>Instance</literal> produz uma "
 "instância contextual do bean."
 
-#. Tag: programlisting
-#: injection.xml:532
-#, no-c-format
-msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
-msgstr "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
-
 #. Tag: para
-#: injection.xml:534
 #, no-c-format
 msgid "Qualifiers can be specified in one of two ways:"
 msgstr "Qualificadores podem ser especificados em uma de duas maneiras:"
 
 #. Tag: para
-#: injection.xml:540
 #, no-c-format
 msgid "by annotating the <literal>Instance</literal> injection point, or"
 msgstr "anotando o ponto de injeção <literal>Instance</literal>, ou"
 
 #. Tag: para
-#: injection.xml:543
 #, no-c-format
 msgid ""
 "by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
@@ -1337,24 +893,12 @@
 "<literal>Event</literal>."
 
 #. Tag: para
-#: injection.xml:547
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is much, much easier:"
 msgstr ""
 "Especificar os qualificadores no ponto de injeção é muito, muito mais fácil:"
 
-#. Tag: programlisting
-#: injection.xml:551
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
-"paymentProcessorSource;]]>"
-msgstr ""
-"<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
-"paymentProcessorSource;]]>"
-
 #. Tag: para
-#: injection.xml:553
 #, no-c-format
 msgid ""
 "Now, the <literal>PaymentProcessor</literal> returned by <literal>get()</"
@@ -1364,7 +908,6 @@
 "literal> terá o qualificador <literal>@Asynchronous</literal>."
 
 #. Tag: para
-#: injection.xml:558
 #, no-c-format
 msgid ""
 "Alternatively, we can specify the qualifier dynamically. First, we add the "
@@ -1376,16 +919,7 @@
 "injeção, para suprimir o qualificador padrão. (Todos os beans possuem o "
 "qualificador <literal>@Any</literal>.)"
 
-#. Tag: programlisting
-#: injection.xml:563
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr ""
-"<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]>"
-
 #. Tag: para
-#: injection.xml:565
 #, no-c-format
 msgid ""
 "Next, we need to obtain an instance of our qualifier type. Since annotatons "
@@ -1401,34 +935,12 @@
 "disso, o CDI nos permite obter uma instância do qualificador criando uma "
 "subclasse da classe auxiliar <literal>AnnotationLiteral</literal>."
 
-#. Tag: programlisting
-#: injection.xml:572
-#, no-c-format
-msgid ""
-"<![CDATA[abstract class AsynchronousQualifier\n"
-"extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
-msgstr ""
-"<![CDATA[abstract class AsynchronousQualifier\n"
-"extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
-
 #. Tag: para
-#: injection.xml:574
 #, no-c-format
 msgid "In some cases, we can use an anonymous class:"
 msgstr "E alguns casos, podemos utilizar uma classe anônima:"
 
-#. Tag: programlisting
-#: injection.xml:578
-#, no-c-format
-msgid ""
-"<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
-"   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
-msgstr ""
-"<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
-"   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
-
 #. Tag: para
-#: injection.xml:581
 #, no-c-format
 msgid ""
 "We can't use an anonymous class to implement a qualifier type with members."
@@ -1437,7 +949,6 @@
 "qualificador com membros."
 
 #. Tag: para
-#: injection.xml:586
 #, no-c-format
 msgid ""
 "Now, finally, we can pass the qualifier to the <literal>select()</literal> "
@@ -1446,28 +957,12 @@
 "Agora, finalmente, podemos passar o qualificador para o método "
 "<literal>select()</literal> de <literal>Instance</literal>."
 
-#. Tag: programlisting
-#: injection.xml:590
-#, no-c-format
-msgid ""
-"<![CDATA[Annotation qualifier = synchronously ?\n"
-"      new SynchronousQualifier() : new AsynchronousQualifier();\n"
-"PaymentProcessor p = anyPaymentProcessor.select(qualifier).get().process"
-"(payment);]]>"
-msgstr ""
-"<![CDATA[Annotation qualifier = synchronously ?\n"
-"      new SynchronousQualifier() : new AsynchronousQualifier();\n"
-"PaymentProcessor p = anyPaymentProcessor.select(qualifier).get().process"
-"(payment);]]>"
-
 #. Tag: title
-#: injection.xml:595
 #, no-c-format
 msgid "The <literal>InjectionPoint</literal> object"
 msgstr "O objeto <literal>InjectionPoint</literal>"
 
 #. Tag: para
-#: injection.xml:597
 #, no-c-format
 msgid ""
 "There are certain kinds of dependent objects (beans with scope "
@@ -1481,7 +976,6 @@
 "fazer o que fazem. Por exemplo:"
 
 #. Tag: para
-#: injection.xml:603
 #, no-c-format
 msgid ""
 "The log category for a <literal>Logger</literal> depends upon the class of "
@@ -1491,7 +985,6 @@
 "objeto que a possui."
 
 #. Tag: para
-#: injection.xml:607
 #, no-c-format
 msgid ""
 "Injection of a HTTP parameter or header value depends upon what parameter or "
@@ -1501,7 +994,6 @@
 "parâmetro ou cabeçalho foi especificado no ponto de injeção."
 
 #. Tag: para
-#: injection.xml:611
 #, no-c-format
 msgid ""
 "Injection of the result of an EL expression evaluation depends upon the "
@@ -1511,7 +1003,6 @@
 "que foi especificada no ponto de injeção."
 
 #. Tag: para
-#: injection.xml:616
 #, no-c-format
 msgid ""
 "A bean with scope <literal>@Dependent</literal> may inject an instance of "
@@ -1523,7 +1014,6 @@
 "ponto de injeção ao qual ele pertence."
 
 #. Tag: para
-#: injection.xml:620
 #, no-c-format
 msgid ""
 "Let's look at an example. The following code is verbose, and vulnerable to "
@@ -1532,14 +1022,7 @@
 "Vejamos um exemplo. O seguinte código é prolixo e vulnerável a problemas de "
 "refatoração:"
 
-#. Tag: programlisting
-#: injection.xml:623
-#, no-c-format
-msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-msgstr "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-
 #. Tag: para
-#: injection.xml:625
 #, no-c-format
 msgid ""
 "This clever little producer method lets you inject a JDK <literal>Logger</"
@@ -1549,42 +1032,12 @@
 "<literal>Logger</literal> da JDK sem especificar explicitamente a categoria "
 "de log:"
 
-#. Tag: programlisting
-#: injection.xml:628
-#, no-c-format
-msgid ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:630
 #, no-c-format
 msgid "We can now write:"
 msgstr "Podemos agora escrever:"
 
-#. Tag: programlisting
-#: injection.xml:632
-#, no-c-format
-msgid "<![CDATA[@Inject Logger log;]]>"
-msgstr "<![CDATA[@Inject Logger log;]]>"
-
 #. Tag: para
-#: injection.xml:634
 #, no-c-format
 msgid ""
 "Not convinced? Then here's a second example. To inject HTTP parameters, we "
@@ -1593,74 +1046,19 @@
 "Não está convencido? Então aqui está um segundo exemplo. Para injetar "
 "parâmetros HTTP, precisamos definir um tipo de qualificador:"
 
-#. Tag: programlisting
-#: injection.xml:637
-#, no-c-format
-msgid ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @Nonbinding public String value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @Nonbinding public String value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:639
 #, no-c-format
 msgid "We would use this qualifier type at injection points as follows:"
 msgstr ""
 "Gostaríamos de usar este tipo de qualificador em pontos de injeção do "
 "seguinte modo:"
 
-#. Tag: programlisting
-#: injection.xml:641
-#, no-c-format
-msgid ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-msgstr ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-
 #. Tag: para
-#: injection.xml:643
 #, no-c-format
 msgid "The following producer method does the work:"
 msgstr "O seguinte método produtor faz o trabalho:"
 
-#. Tag: programlisting
-#: injection.xml:645
-#, no-c-format
-msgid ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotated().getAnnotation(HttpParam."
-"class).value());\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotated().getAnnotation(HttpParam."
-"class).value());\n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:647
 #, no-c-format
 msgid ""
 "(Note that the <literal>value()</literal> member of the <literal>HttpParam</"
@@ -1672,7 +1070,6 @@
 "anotado com <literal>@Nonbinding.</literal>)"
 
 #. Tag: para
-#: injection.xml:650
 #, no-c-format
 msgid ""
 "The container provides a built-in bean that implements the "
@@ -1681,26 +1078,416 @@
 "O contêiner fornece um bean embutido que implementa a interface "
 "<literal>InjectionPoint</literal>:"
 
-#. Tag: programlisting
-#: injection.xml:653
-#, no-c-format
-msgid ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Type getType();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Bean<?> getBean();\n"
-"   public Member getMember();\n"
-"   public Annotated getAnnotated();\n"
-"   public boolean isDelegate();\n"
-"   public boolean isTransient();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Type getType();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Bean<?> getBean();\n"
-"   public Member getMember();\n"
-"   public Annotated getAnnotated();\n"
-"   public boolean isDelegate();\n"
-"   public boolean isTransient();\n"
-"}]]>"
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   public Checkout(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   public Checkout(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private ShoppingCart cart;\n"
+#~ "\n"
+#~ "   @Inject\n"
+#~ "   void setShoppingCart(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private ShoppingCart cart;\n"
+#~ "\n"
+#~ "   @Inject\n"
+#~ "   void setShoppingCart(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "   private @Inject ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "   private @Inject ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Synchronous\n"
+#~ "public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Synchronous\n"
+#~ "public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Asynchronous\n"
+#~ "public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous\n"
+#~ "public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Synchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Synchronous {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Asynchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Asynchronous {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
+#~ "@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
+#~ "@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public void setPaymentProcessors(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor, \n"
+#~ "                                 @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Inject\n"
+#~ "public void setPaymentProcessors(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor, \n"
+#~ "                                 @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
+#~ "                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Inject\n"
+#~ "public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
+#~ "                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces\n"
+#~ "PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor,\n"
+#~ "                                     @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   return isSynchronous() ? syncPaymentProcessor : "
+#~ "asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces\n"
+#~ "PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor,\n"
+#~ "                                     @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   return isSynchronous() ? syncPaymentProcessor : "
+#~ "asyncPaymentProcessor;\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Inject \n"
+#~ "void initServices(@Any Instance<Service> services) { \n"
+#~ "   for (Service service: services) {\n"
+#~ "      service.init();\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Inject \n"
+#~ "void initServices(@Any Instance<Service> services) { \n"
+#~ "   for (Service service: services) {\n"
+#~ "      service.init();\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
+#~ msgstr ""
+#~ "<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "   @Nonbinding String comment() default \"\";\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "   @Nonbinding String comment() default \"\";\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
+#~ "syncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
+#~ "syncPaymentProcessor;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Synchronous @Reliable\n"
+#~ "public class SynchronousReliablePaymentProcessor implements "
+#~ "PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Synchronous @Reliable\n"
+#~ "public class SynchronousReliablePaymentProcessor implements "
+#~ "PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Alternative @Synchronous @Asynchronous\n"
+#~ "public class MockPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Alternative @Synchronous @Asynchronous\n"
+#~ "public class MockPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<beans\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
+#~ "   <alternatives>\n"
+#~ "         <class>org.mycompany.mock.MockPaymentProcessor</class>\n"
+#~ "   </alternatives>\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<beans\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
+#~ "   <alternatives>\n"
+#~ "         <class>org.mycompany.mock.MockPaymentProcessor</class>\n"
+#~ "   </alternatives>\n"
+#~ "</beans>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
+
+#~ msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
+#~ msgstr "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
+#~ "paymentProcessorSource;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
+#~ "paymentProcessorSource;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]"
+#~ ">"
+#~ msgstr ""
+#~ "<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]"
+#~ ">"
+
+#~ msgid ""
+#~ "<![CDATA[abstract class AsynchronousQualifier\n"
+#~ "extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[abstract class AsynchronousQualifier\n"
+#~ "extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
+#~ "   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
+#~ msgstr ""
+#~ "<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
+#~ "   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
+
+#~ msgid ""
+#~ "<![CDATA[Annotation qualifier = synchronously ?\n"
+#~ "      new SynchronousQualifier() : new AsynchronousQualifier();\n"
+#~ "PaymentProcessor p = anyPaymentProcessor.select(qualifier).get().process"
+#~ "(payment);]]>"
+#~ msgstr ""
+#~ "<![CDATA[Annotation qualifier = synchronously ?\n"
+#~ "      new SynchronousQualifier() : new AsynchronousQualifier();\n"
+#~ "PaymentProcessor p = anyPaymentProcessor.select(qualifier).get().process"
+#~ "(payment);]]>"
+
+#~ msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
+#~ msgstr "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
+
+#~ msgid ""
+#~ "<![CDATA[class LogFactory {\n"
+#~ "\n"
+#~ "   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
+#~ "      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass"
+#~ "().getName()); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[class LogFactory {\n"
+#~ "\n"
+#~ "   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
+#~ "      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass"
+#~ "().getName()); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid "<![CDATA[@Inject Logger log;]]>"
+#~ msgstr "<![CDATA[@Inject Logger log;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @Nonbinding public String value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @Nonbinding public String value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@HttpParam(\"username\") String username;\n"
+#~ "@HttpParam(\"password\") String password;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@HttpParam(\"username\") String username;\n"
+#~ "@HttpParam(\"password\") String password;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[class HttpParams\n"
+#~ "\n"
+#~ "   @Produces @HttpParam(\"\")\n"
+#~ "   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
+#~ "      return request.getParameter(ip.getAnnotated().getAnnotation"
+#~ "(HttpParam.class).value());\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[class HttpParams\n"
+#~ "\n"
+#~ "   @Produces @HttpParam(\"\")\n"
+#~ "   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
+#~ "      return request.getParameter(ip.getAnnotated().getAnnotation"
+#~ "(HttpParam.class).value());\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public interface InjectionPoint { \n"
+#~ "   public Type getType();\n"
+#~ "   public Set<Annotation> getQualifiers();\n"
+#~ "   public Bean<?> getBean();\n"
+#~ "   public Member getMember();\n"
+#~ "   public Annotated getAnnotated();\n"
+#~ "   public boolean isDelegate();\n"
+#~ "   public boolean isTransient();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface InjectionPoint { \n"
+#~ "   public Type getType();\n"
+#~ "   public Set<Annotation> getQualifiers();\n"
+#~ "   public Bean<?> getBean();\n"
+#~ "   public Member getMember();\n"
+#~ "   public Annotated getAnnotated();\n"
+#~ "   public boolean isDelegate();\n"
+#~ "   public boolean isTransient();\n"
+#~ "}]]>"

Modified: doc/trunk/reference/pt-BR/interceptors.po
===================================================================
--- doc/trunk/reference/pt-BR/interceptors.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/interceptors.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-12-19 18:05-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: interceptors.xml:5
 #, no-c-format
 msgid "Interceptors"
 msgstr "Interceptadores"
 
 #. Tag: para
-#: interceptors.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Interceptor functionality is defined in the Java Interceptors specification. "
@@ -31,78 +29,41 @@
 "associar interceptores aos Web Beans."
 
 #. Tag: para
-#: interceptors.xml:12
 #, fuzzy, no-c-format
 msgid ""
 "The Interceptors specification defines two kinds of interception points:"
 msgstr "A especificação de EJB define dois tipos de pontos de interceptação:"
 
 #. Tag: para
-#: interceptors.xml:18
 #, no-c-format
 msgid "business method interception, and"
 msgstr "interceptação de métodos de negócios, e"
 
 #. Tag: para
-#: interceptors.xml:21
 #, no-c-format
 msgid "lifecycle callback interception."
 msgstr "interceptadores de chamadas de ciclo de vida"
 
 #. Tag: para
-#: interceptors.xml:25
 #, fuzzy, no-c-format
 msgid "In addition, the EJB specification defines timeout method interception."
 msgstr "A especificação de EJB define dois tipos de pontos de interceptação:"
 
 #. Tag: para
-#: interceptors.xml:29
 #, no-c-format
 msgid ""
 "A <emphasis>business method interceptor</emphasis> applies to invocations of "
 "methods of the bean by clients of the bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:34
-#, no-c-format
-msgid ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:36
 #, no-c-format
 msgid ""
 "A <emphasis>lifecycle callback interceptor</emphasis> applies to invocations "
 "of lifecycle callbacks by the container:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:41
-#, no-c-format
-msgid ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"   @PostConstruct \n"
-"   public void injectDependencies(InvocationContext ctx) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"   @PostConstruct \n"
-"   public void injectDependencies(InvocationContext ctx) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:43
 #, no-c-format
 msgid ""
 "An interceptor class may intercept both lifecycle callbacks and business "
@@ -110,37 +71,18 @@
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:47
 #, no-c-format
 msgid ""
 "A <emphasis>timeout method interceptor</emphasis> applies to invocations of "
 "EJB timeout methods by the container:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:52
-#, no-c-format
-msgid ""
-"<![CDATA[public class TimeoutInterceptor {\n"
-"   @AroundTimeout \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TimeoutInterceptor {\n"
-"   @AroundTimeout \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:55
 #, no-c-format
 msgid "Interceptor bindings"
 msgstr "Bindings de interceptadores"
 
 #. Tag: para
-#: interceptors.xml:57
 #, no-c-format
 msgid ""
 "Suppose we want to declare that some of our beans are transactional. The "
@@ -148,64 +90,24 @@
 "specify exactly which beans we're interested in:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:62
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-
 #. Tag: para
-#: interceptors.xml:64
 #, no-c-format
 msgid ""
 "Now we can easily specify that our <literal>ShoppingCart</literal> is a "
 "transactional object:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:68
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:70
 #, no-c-format
 msgid "Or, if we prefer, we can specify that just one method is transactional:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:74
-#, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:79
 #, no-c-format
 msgid "Implementing interceptors"
 msgstr "Implementando interceptadores (interceptors)"
 
 #. Tag: para
-#: interceptors.xml:81
 #, no-c-format
 msgid ""
 "That's great, but somewhere along the line we're going to have to actually "
@@ -214,70 +116,22 @@
 "<literal>@Interceptor</literal> and <literal>@Transactional</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:87
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:89
 #, no-c-format
 msgid "Interceptors can take advantage of dependency injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:93
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource UserTransaction transaction;\n"
-"\n"
-"    @AroundInvoke \n"
-"    public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource UserTransaction transaction;\n"
-"\n"
-"    @AroundInvoke \n"
-"    public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:95
 #, no-c-format
 msgid "Multiple interceptors may use the same interceptor binding type."
 msgstr ""
 
 #. Tag: title
-#: interceptors.xml:102
 #, no-c-format
 msgid "Enabling interceptors"
 msgstr "Habiliatando interceptadores (interceptors)"
 
 #. Tag: para
-#: interceptors.xml:104
 #, no-c-format
 msgid ""
 "By default, all interceptors are disabled. We need to <emphasis>enable</"
@@ -285,40 +139,12 @@
 "a bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:110
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-
 #. Tag: para
-#: interceptors.xml:112
 #, no-c-format
 msgid "Whoah! Why the angle bracket stew?"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:114
 #, fuzzy, no-c-format
 msgid ""
 "Well, having the XML declaration is actually a <emphasis>good thing</"
@@ -326,7 +152,6 @@
 msgstr "Bem, a declaração XML resolve dois problemas:"
 
 #. Tag: para
-#: interceptors.xml:120
 #, no-c-format
 msgid ""
 "it enables us to specify a total ordering for all the interceptors in our "
@@ -336,49 +161,18 @@
 "em nosso sistema, garantindo um comportamento determinístico, e"
 
 #. Tag: para
-#: interceptors.xml:126
 #, no-c-format
 msgid "it lets us enable or disable interceptor classes at deployment time."
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:130
 #, no-c-format
 msgid ""
 "For example, we could specify that our security interceptor runs before our "
 "transaction interceptor."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.SecurityInterceptor</class>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.SecurityInterceptor</class>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-
 #. Tag: para
-#: interceptors.xml:136
 #, no-c-format
 msgid ""
 "Or we could turn them both off in our test environment by simply not "
@@ -386,13 +180,11 @@
 msgstr ""
 
 #. Tag: title
-#: interceptors.xml:142
 #, no-c-format
 msgid "Interceptor bindings with members"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:144
 #, no-c-format
 msgid ""
 "Suppose we want to add some extra information to our "
@@ -401,26 +193,7 @@
 "Suponhamos que queremos acrescentar algumas informações adicionais para o "
 "nossa anotação <literal>@Transactional</literal>: "
 
-#. Tag: programlisting
-#: interceptors.xml:148
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"   boolean requiresNew() default false;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"   boolean requiresNew() default false;\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:150
 #, no-c-format
 msgid ""
 "CDI will use the value of <literal>requiresNew</literal> to choose between "
@@ -428,44 +201,14 @@
 "<literal>RequiresNewTransactionInterceptor</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:155
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:157
 #, no-c-format
 msgid ""
 "Now we can use <literal>RequiresNewTransactionInterceptor</literal> like "
 "this:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:161
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true)\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional(requiresNew = true)\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:163
 #, no-c-format
 msgid ""
 "But what if we only have one interceptor and we want the container to ignore "
@@ -474,32 +217,12 @@
 "We can use the <literal>@Nonbinding</literal> annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:169
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"   @Nonbinding String[] rolesAllowed() default {};\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"   @NonBinding String[] rolesAllowed() default {};\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:174
 #, no-c-format
 msgid "Multiple interceptor binding annotations"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:176
 #, no-c-format
 msgid ""
 "Usually we use combinations of interceptor bindings types to bind multiple "
@@ -508,104 +231,26 @@
 "<literal>SecurityInterceptor</literal> to the same bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:182
-#, no-c-format
-msgid ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:184
 #, no-c-format
 msgid ""
 "However, in very complex cases, an interceptor itself may specify some "
 "combination of interceptor binding types:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:189
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:191
 #, no-c-format
 msgid ""
 "Then this interceptor could be bound to the <literal>checkout()</literal> "
 "method using any one of the following combinations:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:196
-#, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:198
-#, no-c-format
-msgid ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:200
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart {\n"
-"   @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart {\n"
-"   @Secure public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:202
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:207
 #, no-c-format
 msgid "Interceptor binding type inheritance"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:209
 #, no-c-format
 msgid ""
 "One limitation of the Java language support for annotations is the lack of "
@@ -613,43 +258,17 @@
 "allow this kind of thing to work:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:214
-#, no-c-format
-msgid ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-msgstr ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:216
 #, no-c-format
 msgid ""
 "Well, fortunately, CDI works around this missing feature of Java. We may "
 "annotate one interceptor binding type with other interceptor binding types "
 "(termed a <emphasis>meta-annotation</emphasis>). The interceptor bindings "
-"are transitive &#8212; any bean with the first interceptor binding inherits "
-"the interceptor bindings declared as meta-annotations."
+"are transitive — any bean with the first interceptor binding inherits the "
+"interceptor bindings declared as meta-annotations."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:223
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBinding\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBinding\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:225
 #, no-c-format
 msgid ""
 "Now, any bean annotated <literal>@Action</literal> will be bound to both "
@@ -659,13 +278,11 @@
 msgstr ""
 
 #. Tag: title
-#: interceptors.xml:234
 #, no-c-format
 msgid "Use of <literal>@Interceptors</literal>"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:236
 #, no-c-format
 msgid ""
 "The <literal>@Interceptors</literal> annotation defined by the interceptor "
@@ -673,55 +290,324 @@
 "supported in CDI."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:239
-#, no-c-format
-msgid ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:241
 #, no-c-format
 msgid "However, this approach suffers the following drawbacks:"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:245
 #, no-c-format
 msgid "the interceptor implementation is hardcoded in business code,"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:250
 #, no-c-format
 msgid "interceptors may not be easily disabled at deployment time, and"
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:255
 #, no-c-format
 msgid ""
-"the interceptor ordering is non-global &#8212; it is determined by the order "
-"in which interceptors are listed at the class level."
+"the interceptor ordering is non-global — it is determined by the order in "
+"which interceptors are listed at the class level."
 msgstr ""
 
 #. Tag: para
-#: interceptors.xml:262
 #, no-c-format
 msgid "Therefore, we recommend the use of CDI-style interceptor bindings."
 msgstr ""
 
 #~ msgid ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class DependencyInjectionInterceptor {\n"
+#~ "   @PostConstruct \n"
+#~ "   public void injectDependencies(InvocationContext ctx) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DependencyInjectionInterceptor {\n"
+#~ "   @PostConstruct \n"
+#~ "   public void injectDependencies(InvocationContext ctx) { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class TimeoutInterceptor {\n"
+#~ "   @AroundTimeout \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TimeoutInterceptor {\n"
+#~ "   @AroundTimeout \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke \n"
+#~ "    public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke \n"
+#~ "    public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<beans\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
+#~ "   <interceptors>\n"
+#~ "      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
+#~ "   </interceptors>\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<beans\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
+#~ "   <interceptors>\n"
+#~ "      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
+#~ "   </interceptors>\n"
+#~ "</beans>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<beans\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
+#~ "   <interceptors>\n"
+#~ "      <class>org.mycompany.myapp.SecurityInterceptor</class>\n"
+#~ "      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
+#~ "   </interceptors>\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<beans\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
+#~ "   <interceptors>\n"
+#~ "      <class>org.mycompany.myapp.SecurityInterceptor</class>\n"
+#~ "      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
+#~ "   </interceptors>\n"
+#~ "</beans>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {\n"
+#~ "   boolean requiresNew() default false;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {\n"
+#~ "   boolean requiresNew() default false;\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
+#~ "public class RequiresNewTransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
+#~ "public class RequiresNewTransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional(requiresNew = true)\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional(requiresNew = true)\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Secure {\n"
+#~ "   @Nonbinding String[] rolesAllowed() default {};\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Secure {\n"
+#~ "   @NonBinding String[] rolesAllowed() default {};\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure @Interceptor\n"
+#~ "public class TransactionalSecureInterceptor { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure @Interceptor\n"
+#~ "public class TransactionalSecureInterceptor { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "@InterceptorBinding\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Action { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "@InterceptorBinding\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Action { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
+#~ "class})\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
+#~ "class})\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "Web Beans re-uses the basic interceptor architecture of EJB 3.0, "
 #~ "extending the functionality in two directions:"
 #~ msgstr ""

Modified: doc/trunk/reference/pt-BR/intro.po
===================================================================
--- doc/trunk/reference/pt-BR/intro.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/intro.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-12-23 11:57-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: intro.xml:4
 #, no-c-format
 msgid "Introduction"
 msgstr "Introdução"
 
 #. Tag: para
-#: intro.xml:6
 #, no-c-format
 msgid ""
 "So you're keen to get started writing your first bean? Or perhaps you're "
@@ -36,13 +34,11 @@
 "a realmente utilizá-los para construir uma aplicação!"
 
 #. Tag: title
-#: intro.xml:13
 #, no-c-format
 msgid "What is a bean?"
 msgstr "O que é um bean?"
 
 #. Tag: para
-#: intro.xml:15
 #, no-c-format
 msgid ""
 "A bean is exactly what you think it is. Only now, it has a true identity in "
@@ -52,7 +48,6 @@
 "verdadeira identidade no ambiente do contêiner."
 
 #. Tag: para
-#: intro.xml:19
 #, no-c-format
 msgid ""
 "Prior to Java EE 6, there was no clear definition of the term \"bean\" in "
@@ -73,7 +68,6 @@
 "comum."
 
 #. Tag: para
-#: intro.xml:27
 #, no-c-format
 msgid ""
 "Java EE 6 finally lays down that common definition in the Managed Beans "
@@ -96,14 +90,13 @@
 "enxuto que está alinhado através da plataforma Java EE."
 
 #. Tag: para
-#: intro.xml:36
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "With very few exceptions, almost every concrete Java class that has a "
 "constructor with no parameters (or a constructor designated with the "
 "annotation <literal>@Inject</literal>) is a bean. This includes every "
 "JavaBean and every EJB session bean. If you've already got some JavaBeans or "
-"session beans lying around, they're already beans&#8212;you won't need any "
+"session beans lying around, they're already beans—you won't need any "
 "additional special metadata. There's just little one thing you need to do "
 "before you can start injecting them into stuff: you need to put them in an "
 "archive (a jar, or a Java EE module such as a war or EJB jar) that contains "
@@ -120,17 +113,16 @@
 "um arquivo indicador especial: <literal>META-INF/beans.xml</literal>."
 
 #. Tag: para
-#: intro.xml:45
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The JavaBeans and EJBs you've been writing every day, up until now, have not "
 "been able to take advantage of the new services defined by the CDI "
-"specification. But you'll be able to use every one of them with CDI&#8212;"
-"allowing the container to create and destroy instances of your beans and "
-"associate them with a designated context, injecting them into other beans, "
-"using them in EL expressions, specializing them with qualifier annotations, "
-"even adding interceptors and decorators to them&#8212;without modifying your "
-"existing code. At most, you'll need to add some annotations."
+"specification. But you'll be able to use every one of them with CDI—allowing "
+"the container to create and destroy instances of your beans and associate "
+"them with a designated context, injecting them into other beans, using them "
+"in EL expressions, specializing them with qualifier annotations, even adding "
+"interceptors and decorators to them—without modifying your existing code. At "
+"most, you'll need to add some annotations."
 msgstr ""
 "Os JavaBeans e EJBs que você tem escrito todo dia, até agora, não foram "
 "capazes de tirar proveito dos novos serviços definidos pela especificação "
@@ -142,20 +134,17 @@
 "código existente. No máximo, você precisará adicionar algumas anotações."
 
 #. Tag: para
-#: intro.xml:54
 #, no-c-format
 msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 "Agora vamos ver como criar seu primeiro bean que realmente utiliza CDI."
 
 #. Tag: title
-#: intro.xml:61
 #, no-c-format
 msgid "Getting our feet wet"
 msgstr "Arregaçando as mangas"
 
 #. Tag: para
-#: intro.xml:63
 #, no-c-format
 msgid ""
 "Suppose that we have two existing Java classes that we've been using for "
@@ -166,20 +155,7 @@
 "durante anos em várias aplicações. A primeira classe divide uma string em "
 "uma lista de sentenças:"
 
-#. Tag: programlisting
-#: intro.xml:68
-#, no-c-format
-msgid ""
-"<![CDATA[public class SentenceParser {\n"
-"   public List<String> parse(String text) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class SentenceParser {\n"
-"   public List<String> parse(String text) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:70
 #, no-c-format
 msgid ""
 "The second existing class is a stateless session bean front-end for an "
@@ -190,42 +166,12 @@
 "end) para um sistema externo que é capaz de traduzir frases de uma língua "
 "para outra:"
 
-#. Tag: programlisting
-#: intro.xml:75
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"   public String translate(String sentence) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"   public String translate(String sentence) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:77
 #, no-c-format
 msgid "Where <literal>Translator</literal> is the EJB local interface:"
 msgstr "Onde <literal>Translator</literal> é a interface local do EJB:"
 
-#. Tag: programlisting
-#: intro.xml:79
-#, no-c-format
-msgid ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"   public String translate(String sentence);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"   public String translate(String sentence);\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:81
 #, no-c-format
 msgid ""
 "Unfortunately, we don't have a class that translates whole text documents. "
@@ -234,52 +180,7 @@
 "Infelizmente, não temos uma classe pré-existente que traduz todo o texto de "
 "documentos. Então vamos escrever um bean que faz este trabalho:"
 
-#. Tag: programlisting
-#: intro.xml:85
-#, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator {\n"
-"   private SentenceParser sentenceParser;\n"
-"   private Translator sentenceTranslator;\n"
-"    \n"
-"   @Inject\n"
-"   TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"      this.sentenceParser = sentenceParser;\n"
-"      this.sentenceTranslator = sentenceTranslator;\n"
-"   }\n"
-"    \n"
-"   public String translate(String text) {\n"
-"      StringBuilder sb = new StringBuilder();\n"
-"      for (String sentence: sentenceParser.parse(text)) {\n"
-"          sb.append(sentenceTranslator.translate(sentence));\n"
-"      }\n"
-"      return sb.toString();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TextTranslator {\n"
-"   private SentenceParser sentenceParser;\n"
-"   private Translator sentenceTranslator;\n"
-"    \n"
-"   @Inject\n"
-"   TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"      this.sentenceParser = sentenceParser;\n"
-"      this.sentenceTranslator = sentenceTranslator;\n"
-"   }\n"
-"    \n"
-"   public String translate(String text) {\n"
-"      StringBuilder sb = new StringBuilder();\n"
-"      for (String sentence: sentenceParser.parse(text)) {\n"
-"          sb.append(sentenceTranslator.translate(sentence));\n"
-"      }\n"
-"      return sb.toString();\n"
-"   }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:87
 #, no-c-format
 msgid ""
 "But wait! <literal>TextTranslator</literal> does not have a constructor with "
@@ -293,7 +194,6 @@
 "anotado com <literal>@Inject</literal>."
 
 #. Tag: para
-#: intro.xml:93
 #, no-c-format
 msgid ""
 "As you've guessed, the <literal>@Inject</literal> annotation has something "
@@ -309,7 +209,6 @@
 "beans nos parâmetros do construtor ou do método."
 
 #. Tag: para
-#: intro.xml:100
 #, no-c-format
 msgid ""
 "We may obtain an instance of <literal>TextTranslator</literal> by injecting "
@@ -325,7 +224,6 @@
 "método ou parâmetro."
 
 #. Tag: para
-#: intro.xml:107
 #, no-c-format
 msgid ""
 "Let's create a UI controller bean that uses field injection to obtain an "
@@ -336,69 +234,13 @@
 "obter uma instância de <literal>TextTranslator</literal>, traduzindo o texto "
 "digitado por um usuário:"
 
-#. Tag: programlisting
-#: intro.xml:116
-#, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class TranslateController {\n"
-"   @Inject TextTranslator textTranslator;\n"
-"\n"
-"   private String inputText;\n"
-"   private String translation;\n"
-"\n"
-"   // JSF action method, perhaps\n"
-"   public void translate() {\n"
-"      translation = textTranslator.translate(inputText); \n"
-"   }\n"
-"\n"
-"   public String getInputText() {\n"
-"      return inputText;\n"
-"   }\n"
-"\n"
-"   public void setInputText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"\n"
-"   public String getTranslation() {\n"
-"      return translation;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class TranslateController {\n"
-"   @Inject TextTranslator textTranslator;\n"
-"\n"
-"   private String inputText;\n"
-"   private String translation;\n"
-"\n"
-"   // Metodo de acao JSF bem provavel\n"
-"   public void translate() {\n"
-"      translation = textTranslator.translate(inputText); \n"
-"   }\n"
-"\n"
-"   public String getInputText() {\n"
-"      return inputText;\n"
-"   }\n"
-"\n"
-"   public void setInputText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"\n"
-"   public String getTranslation() {\n"
-"      return translation;\n"
-"   }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:119
 #, no-c-format
 msgid "Field injection of <literal>TextTranslator</literal> instance"
 msgstr ""
 "Injeção de uma instância de <literal>TextTranslator</literal> em um campo"
 
 #. Tag: para
-#: intro.xml:127
 #, no-c-format
 msgid ""
 "Notice the controller bean is request-scoped and named. Since this "
@@ -414,7 +256,6 @@
 "classe, cria-se um bean com escopo de solicitação e nomeado."
 
 #. Tag: para
-#: intro.xml:135
 #, no-c-format
 msgid ""
 "Alternatively, we may obtain an instance of <literal>TextTranslator</"
@@ -425,24 +266,7 @@
 "<literal>TextTranslator</literal> programaticamente a partir de uma "
 "instância de <literal>Instance</literal>, parametrizada com o tipo do bean:"
 
-#. Tag: programlisting
-#: intro.xml:140
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
-"...\n"
-"public void translate() {\n"
-"   textTranslatorInstance.get().translate(inputText);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
-"...\n"
-"public void translate() {\n"
-"   textTranslatorInstance.get().translate(inputText);\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:142
 #, no-c-format
 msgid ""
 "Notice that it isn't necessary to create a getter or setter method to inject "
@@ -458,17 +282,15 @@
 "que é injetado."
 
 #. Tag: para
-#: intro.xml:148
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "At system initialization time, the container must validate that exactly one "
 "bean exists which satisfies each injection point. In our example, if no "
-"implementation of <literal>Translator</literal> is available&#8212;if the "
-"<literal>SentenceTranslator</literal> EJB was not deployed&#8212;the "
-"container would inform us of an <emphasis>unsatisfied dependency</emphasis>. "
-"If more than one implementation of <literal>Translator</literal> were "
-"available, the container would inform us of the <emphasis>ambiguous "
-"dependency</emphasis>."
+"implementation of <literal>Translator</literal> is available—if the "
+"<literal>SentenceTranslator</literal> EJB was not deployed—the container "
+"would inform us of an <emphasis>unsatisfied dependency</emphasis>. If more "
+"than one implementation of <literal>Translator</literal> were available, the "
+"container would inform us of the <emphasis>ambiguous dependency</emphasis>."
 msgstr ""
 "Durante a inicialização do sistema, o contêiner deve validar que existe "
 "exatamente um bean que satisfaça cada ponto de injeção. Em nosso exemplo, se "
@@ -480,7 +302,6 @@
 "<emphasis>dependência ambígua</emphasis>."
 
 #. Tag: para
-#: intro.xml:156
 #, no-c-format
 msgid ""
 "Before we get too deep in the details, let's pause and examine a bean's "
@@ -492,3 +313,139 @@
 "anatomia de um bean. Que aspectos do bean são significantes e o que lhe "
 "confere sua identidade? Em vez de apenas dar exemplos de beans, vamos "
 "definir o que <emphasis>torna</emphasis> algo um bean."
+
+#~ msgid ""
+#~ "<![CDATA[public class SentenceParser {\n"
+#~ "   public List<String> parse(String text) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class SentenceParser {\n"
+#~ "   public List<String> parse(String text) { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator {\n"
+#~ "   public String translate(String sentence) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator {\n"
+#~ "   public String translate(String sentence) { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Local\n"
+#~ "public interface Translator {\n"
+#~ "   public String translate(String sentence);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Local\n"
+#~ "public interface Translator {\n"
+#~ "   public String translate(String sentence);\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class TextTranslator {\n"
+#~ "   private SentenceParser sentenceParser;\n"
+#~ "   private Translator sentenceTranslator;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) {\n"
+#~ "      this.sentenceParser = sentenceParser;\n"
+#~ "      this.sentenceTranslator = sentenceTranslator;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public String translate(String text) {\n"
+#~ "      StringBuilder sb = new StringBuilder();\n"
+#~ "      for (String sentence: sentenceParser.parse(text)) {\n"
+#~ "          sb.append(sentenceTranslator.translate(sentence));\n"
+#~ "      }\n"
+#~ "      return sb.toString();\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TextTranslator {\n"
+#~ "   private SentenceParser sentenceParser;\n"
+#~ "   private Translator sentenceTranslator;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) {\n"
+#~ "      this.sentenceParser = sentenceParser;\n"
+#~ "      this.sentenceTranslator = sentenceTranslator;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public String translate(String text) {\n"
+#~ "      StringBuilder sb = new StringBuilder();\n"
+#~ "      for (String sentence: sentenceParser.parse(text)) {\n"
+#~ "          sb.append(sentenceTranslator.translate(sentence));\n"
+#~ "      }\n"
+#~ "      return sb.toString();\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class TranslateController {\n"
+#~ "   @Inject TextTranslator textTranslator;\n"
+#~ "\n"
+#~ "   private String inputText;\n"
+#~ "   private String translation;\n"
+#~ "\n"
+#~ "   // JSF action method, perhaps\n"
+#~ "   public void translate() {\n"
+#~ "      translation = textTranslator.translate(inputText); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public String getInputText() {\n"
+#~ "      return inputText;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public void setInputText(String text) {\n"
+#~ "      this.inputText = text;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public String getTranslation() {\n"
+#~ "      return translation;\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class TranslateController {\n"
+#~ "   @Inject TextTranslator textTranslator;\n"
+#~ "\n"
+#~ "   private String inputText;\n"
+#~ "   private String translation;\n"
+#~ "\n"
+#~ "   // Metodo de acao JSF bem provavel\n"
+#~ "   public void translate() {\n"
+#~ "      translation = textTranslator.translate(inputText); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public String getInputText() {\n"
+#~ "      return inputText;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public void setInputText(String text) {\n"
+#~ "      this.inputText = text;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public String getTranslation() {\n"
+#~ "      return translation;\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
+#~ "...\n"
+#~ "public void translate() {\n"
+#~ "   textTranslatorInstance.get().translate(inputText);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
+#~ "...\n"
+#~ "public void translate() {\n"
+#~ "   textTranslatorInstance.get().translate(inputText);\n"
+#~ "}]]>"

Modified: doc/trunk/reference/pt-BR/master.po
===================================================================
--- doc/trunk/reference/pt-BR/master.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/master.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-12-22 10:51-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: master.xml:9
 #, no-c-format
 msgid "A note about naming and nomenclature"
 msgstr "Uma nota sobre nomeação e nomenclatura"
 
 #. Tag: para
-#: master.xml:10
 #, no-c-format
 msgid ""
 "Shortly before the final draft of JSR-299 was submitted, the specification "
@@ -44,7 +42,6 @@
 "atualize as referências que você puder. O jogo de dar nomes acabou."
 
 #. Tag: para
-#: master.xml:19
 #, no-c-format
 msgid ""
 "You'll also find that some of the functionality that once existed in the "
@@ -58,15 +55,14 @@
 "projeto Weld, e talvez em outras implementações."
 
 #. Tag: para
-#: master.xml:25
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Note that this reference guide was started while changes were still being "
 "made to the specification. We've done our best to update it for accuracy. If "
 "you discover a conflict between what is written in this guide and the "
-"specification, the specification is the authority&#8212;assume it is "
-"correct. If you believe you have found an error in the specification, please "
-"report it to the JSR-299 EG."
+"specification, the specification is the authority—assume it is correct. If "
+"you believe you have found an error in the specification, please report it "
+"to the JSR-299 EG."
 msgstr ""
 "Note que este guia de referência foi iniciado enquanto mudanças ainda eram "
 "realizadas na especificação. Nós fizemos o nosso melhor para atualizá-lo "
@@ -76,31 +72,26 @@
 "favor reporte-o para o JSR-299 EG."
 
 #. Tag: title
-#: master.xml:36
 #, no-c-format
 msgid "Beans"
 msgstr "Beans"
 
 #. Tag: title
-#: master.xml:49
 #, no-c-format
 msgid "Weld, the CDI Reference Implementation"
 msgstr "Weld, a Implementação de Referência de CDI"
 
 #. Tag: title
-#: master.xml:59
 #, no-c-format
 msgid "Loose coupling with strong typing"
 msgstr "Baixo aclopamento com tipificação forte"
 
 #. Tag: title
-#: master.xml:75
 #, no-c-format
 msgid "CDI and the Java EE ecosystem"
 msgstr "CDI e o ecossistema Java EE"
 
 #. Tag: title
-#: master.xml:87
 #, no-c-format
 msgid "Weld reference"
 msgstr "Referência a Weld"

Modified: doc/trunk/reference/pt-BR/next.po
===================================================================
--- doc/trunk/reference/pt-BR/next.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/next.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-12-19 17:59-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: next.xml:4
 #, no-c-format
 msgid "Next steps"
 msgstr "Próximos passos"
 
 #. Tag: para
-#: next.xml:6
 #, no-c-format
 msgid ""
 "Because CDI is so new, there's not yet a lot of information available "
@@ -33,7 +31,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:14
 #, fuzzy, no-c-format
 msgid ""
 "The CDI reference implementation, Weld, is being developed at the <ulink url="
@@ -53,7 +50,6 @@
 "melhor fonte de informação sobre o futuro da CDI, Weld e Seam."
 
 #. Tag: para
-#: next.xml:22
 #, no-c-format
 msgid ""
 "We encourage you to follow the <ulink url=\"https://lists.jboss.org/mailman/"
@@ -63,7 +59,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:28
 #, no-c-format
 msgid ""
 "We are eager to find volunteers to help revise, proofread or translate this "
@@ -72,7 +67,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:35
 #, no-c-format
 msgid ""
 "Checkout source from <ulink url=\"http://anonsvn.jboss.org/repos/weld/doc/"
@@ -80,18 +74,7 @@
 "ulink> using SVN"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:40
-#, no-c-format
-msgid ""
-"<![CDATA[$> svn co http://anonsvn.jboss.org/repos/weld/doc/trunk/reference "
-"weld-reference]]>"
-msgstr ""
-"<![CDATA[$> svn co http://anonsvn.jboss.org/repos/weld/doc/trunk/reference "
-"weld-reference]]>"
-
 #. Tag: para
-#: next.xml:43
 #, no-c-format
 msgid ""
 "Edit the <literal>pom.xml</literal> file in the root of the checkout and "
@@ -100,19 +83,11 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:49
 #, no-c-format
 msgid "Build using Maven 2"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:52
-#, no-c-format
-msgid "<![CDATA[$> mvn]]>"
-msgstr "<![CDATA[$> mvn]]>"
-
 #. Tag: para
-#: next.xml:54
 #, no-c-format
 msgid ""
 "If you experience an out of memory error, try setting this environment "
@@ -120,7 +95,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:61
 #, no-c-format
 msgid ""
 "The PDF version of the reference guide will appear the current directory. "
@@ -129,12 +103,21 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:66
 #, no-c-format
 msgid "We look forward to your participation!"
 msgstr ""
 
 #~ msgid ""
+#~ "<![CDATA[$> svn co http://anonsvn.jboss.org/repos/weld/doc/trunk/"
+#~ "reference weld-reference]]>"
+#~ msgstr ""
+#~ "<![CDATA[$> svn co http://anonsvn.jboss.org/repos/weld/doc/trunk/"
+#~ "reference weld-reference]]>"
+
+#~ msgid "<![CDATA[$> mvn]]>"
+#~ msgstr "<![CDATA[$> mvn]]>"
+
+#~ msgid ""
 #~ "Because Web Beans is so new, there's not yet a lot of information "
 #~ "available online."
 #~ msgstr ""

Modified: doc/trunk/reference/pt-BR/part1.po
===================================================================
--- doc/trunk/reference/pt-BR/part1.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/part1.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2010-01-06 10:57-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part1.xml:14
 #, no-c-format
 msgid ""
 "The <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-299</ulink> "
@@ -31,7 +30,6 @@
 "Beans. Os serviços da CDI fornece:"
 
 #. Tag: para
-#: part1.xml:23
 #, no-c-format
 msgid ""
 "an improved lifecycle for stateful objects, bound to well-defined "
@@ -41,14 +39,12 @@
 "<emphasis>contextos</emphasis> bem definidos,"
 
 #. Tag: para
-#: part1.xml:28
 #, no-c-format
 msgid "a typesafe approach to <emphasis>dependency injection</emphasis>,"
 msgstr ""
 "uma abordagem typesafe para <emphasis>injeção de dependência</emphasis>,"
 
 #. Tag: para
-#: part1.xml:33
 #, no-c-format
 msgid ""
 "object interaction via an <emphasis>event notification facility</emphasis>,"
@@ -57,7 +53,6 @@
 "eventos</emphasis>,"
 
 #. Tag: para
-#: part1.xml:38
 #, no-c-format
 msgid ""
 "a better approach to binding <emphasis>interceptors</emphasis> to objects, "
@@ -70,7 +65,6 @@
 "problemas de negócio, e"
 
 #. Tag: para
-#: part1.xml:45
 #, no-c-format
 msgid ""
 "an <emphasis>SPI</emphasis> for developing portable extensions to the "
@@ -80,18 +74,18 @@
 "o contêiner."
 
 #. Tag: para
-#: part1.xml:51
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The CDI services are a core aspect of the Java EE platform and include full "
 "support for Java EE modularity and the Java EE component architecture. But "
 "the specification does not limit the use of CDI to the Java EE environment. "
 "In the Java SE environment, the services might be provided by a standalone "
-"CDI implementation like Weld (see <xref linkend=\"weld-se\"/>), or even by a "
-"container that also implements the subset of EJB defined for embedded usage "
-"by the EJB 3.1 specification. CDI is especially useful in the context of web "
-"application development, but the problems it solves are general development "
-"concerns and it is therefore applicable to a wide variety of application."
+"CDI implementation like Weld (see <xref linkend=\"weld-se\" />), or even by "
+"a container that also implements the subset of EJB defined for embedded "
+"usage by the EJB 3.1 specification. CDI is especially useful in the context "
+"of web application development, but the problems it solves are general "
+"development concerns and it is therefore applicable to a wide variety of "
+"application."
 msgstr ""
 "Os serviços CDI são um aspecto central da plataforma Java EE e incluem "
 "suporte completo para modularidade em Java EE e a arquitetura de componentes "
@@ -105,7 +99,6 @@
 "uma ampla variedade de aplicações."
 
 #. Tag: para
-#: part1.xml:61
 #, no-c-format
 msgid ""
 "An object bound to a lifecycle context is called a bean. CDI includes built-"
@@ -117,19 +110,16 @@
 "seguintes tipos de componente do Java EE:"
 
 #. Tag: para
-#: part1.xml:68
 #, no-c-format
 msgid "managed beans, and"
 msgstr "managed beans, e"
 
 #. Tag: para
-#: part1.xml:71
 #, no-c-format
 msgid "EJB session beans."
 msgstr "EJB session beans."
 
 #. Tag: para
-#: part1.xml:75
 #, no-c-format
 msgid ""
 "Both managed beans and EJB session beans may inject other beans. But some "
@@ -143,37 +133,31 @@
 "os seguintes tipos de componente podem ter beans injetados:"
 
 #. Tag: para
-#: part1.xml:83
 #, no-c-format
 msgid "message-driven beans,"
 msgstr "message-driven beans,"
 
 #. Tag: para
-#: part1.xml:86
 #, no-c-format
 msgid "interceptors,"
 msgstr "interceptadores,"
 
 #. Tag: para
-#: part1.xml:89
 #, no-c-format
 msgid "servlets, servlet filters and servlet event listeners,"
 msgstr "servlets, filtros de servlet e escutadores de eventos servlet,"
 
 #. Tag: para
-#: part1.xml:92
 #, no-c-format
 msgid "JAX-WS service endpoints and handlers, and"
 msgstr "pontos de acesso e manipuladores de serviço JAX-WS, e"
 
 #. Tag: para
-#: part1.xml:95
 #, no-c-format
 msgid "JSP tag handlers and tag library event listeners."
 msgstr "manipuladores de tag JSP e escutadores de evento em biblioteca de tag."
 
 #. Tag: para
-#: part1.xml:99
 #, no-c-format
 msgid ""
 "CDI relieves the user of an unfamiliar API of the need to answer the "
@@ -183,37 +167,31 @@
 "seguintes questões:"
 
 #. Tag: para
-#: part1.xml:105
 #, no-c-format
 msgid "What is the lifecycle of this object?"
 msgstr "Qual é o ciclo de vida deste objeto?"
 
 #. Tag: para
-#: part1.xml:108
 #, no-c-format
 msgid "How many simultaneous clients can it have?"
 msgstr "Quantos clientes simultâneos eu posso ter?"
 
 #. Tag: para
-#: part1.xml:111
 #, no-c-format
 msgid "Is it multithreaded?"
 msgstr "É multithread?"
 
 #. Tag: para
-#: part1.xml:114
 #, no-c-format
 msgid "How do I get access to it from a client?"
 msgstr "Como faço para obter acesso a ele a partir de um cliente?"
 
 #. Tag: para
-#: part1.xml:117
 #, no-c-format
 msgid "Do I need to explicitly destroy it?"
 msgstr "Eu preciso explicitamente destruí-lo?"
 
 #. Tag: para
-#: part1.xml:120
 #, no-c-format
 msgid ""
 "Where should I keep the reference to it when I'm not currently using it?"
@@ -221,7 +199,6 @@
 "Onde devo manter referência a ele quando não estiver usando-o diretamente?"
 
 #. Tag: para
-#: part1.xml:125
 #, no-c-format
 msgid ""
 "How can I define an alternative implementation, so that the implementation "
@@ -231,14 +208,12 @@
 "implementação possa variar em tempo de implantação?"
 
 #. Tag: para
-#: part1.xml:131
 #, no-c-format
 msgid "How should I go about sharing this object between other objects?"
 msgstr ""
 "Como devo proceder no compartilhamento deste objeto com outros objetos?"
 
 #. Tag: para
-#: part1.xml:137
 #, no-c-format
 msgid ""
 "CDI is more than a framework. It's a whole, rich programming model. The "
@@ -250,7 +225,6 @@
 "forte</emphasis>. Vamos estudar o que esta frase significa."
 
 #. Tag: para
-#: part1.xml:142
 #, no-c-format
 msgid ""
 "A bean specifies only the type and semantics of other beans it depends upon. "
@@ -269,7 +243,6 @@
 "acoplamento torna seu código mais fácil de manter."
 
 #. Tag: para
-#: part1.xml:149
 #, no-c-format
 msgid ""
 "Events, interceptors and decorators enhance the loose-coupling inherent in "
@@ -279,7 +252,6 @@
 "acoplamento</emphasis> inerente a este modelo:"
 
 #. Tag: para
-#: part1.xml:155
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -289,7 +261,6 @@
 "eventos dos consumidores dos eventos,"
 
 #. Tag: para
-#: part1.xml:159
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -299,7 +270,6 @@
 "de negócios, e"
 
 #. Tag: para
-#: part1.xml:163
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> allow business concerns to be "
@@ -309,7 +279,6 @@
 "compartimentadas."
 
 #. Tag: para
-#: part1.xml:168
 #, no-c-format
 msgid ""
 "What's even more powerful (and comforting) is that CDI provides all these "
@@ -333,7 +302,6 @@
 "simplesmente informação específica de implantação."
 
 #. Tag: para
-#: part1.xml:177
 #, no-c-format
 msgid ""
 "But CDI isn't a restrictive programming model. It doesn't tell you how you "
@@ -347,7 +315,6 @@
 "esses tipos de coisas por conta própria."
 
 #. Tag: para
-#: part1.xml:183
 #, no-c-format
 msgid ""
 "CDI even provides a comprehensive SPI, allowing other kinds of object "
@@ -361,7 +328,6 @@
 "serviços de CDI e interagindo com qualquer outro tipo de bean."
 
 #. Tag: para
-#: part1.xml:189
 #, no-c-format
 msgid ""
 "CDI was influenced by a number of existing Java frameworks, including Seam, "
@@ -381,7 +347,6 @@
 "trabalho duro do JSR-299 Expert Group (EG)."
 
 #. Tag: para
-#: part1.xml:197
 #, no-c-format
 msgid ""
 "Finally, CDI is a <ulink url=\"http://jcp.org\">Java Community Process</"

Modified: doc/trunk/reference/pt-BR/part2.po
===================================================================
--- doc/trunk/reference/pt-BR/part2.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/part2.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-12-25 16:09-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part2.xml:5
 #, no-c-format
 msgid ""
 "Weld, the JSR-299 Reference Implementation (RI), is being developed as part "
@@ -32,7 +31,6 @@
 "como obter e compilar o código podem ser encontradas na mesmo página."
 
 #. Tag: para
-#: part2.xml:12
 #, no-c-format
 msgid ""
 "Weld provides a complete SPI allowing Java EE containers such as JBoss AS "
@@ -46,7 +44,6 @@
 "SE."
 
 #. Tag: para
-#: part2.xml:18
 #, no-c-format
 msgid ""
 "Weld comes with an extensive library of examples, which are a great starting "
@@ -54,4 +51,3 @@
 msgstr ""
 "Weld vem com uma extensiva biblioteca de exemplos, os quais são um grande "
 "ponto de partida para aprender CDI."
-

Modified: doc/trunk/reference/pt-BR/part3.po
===================================================================
--- doc/trunk/reference/pt-BR/part3.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/part3.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-04-10 13:21-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part3.xml:5
 #, no-c-format
 msgid ""
 "The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've "
@@ -22,19 +21,16 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:12
 #, no-c-format
 msgid "<emphasis>alternatives</emphasis> enable deployment time polymorphism,"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:17
 #, no-c-format
 msgid "<emphasis>producer methods</emphasis> enable runtime polymorphism, and"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:21
 #, no-c-format
 msgid ""
 "<emphasis>contextual lifecycle management</emphasis> decouples bean "
@@ -42,7 +38,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:27
 #, no-c-format
 msgid ""
 "These techniques serve to enable loose coupling of client and server. The "
@@ -52,7 +47,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:33
 #, no-c-format
 msgid ""
 "Loose coupling makes a system more <emphasis>dynamic</emphasis>. The system "
@@ -64,7 +58,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:40
 #, no-c-format
 msgid ""
 "CDI provides three extra important facilities that further the goal of loose "
@@ -72,7 +65,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:46
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -80,7 +72,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:51
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> may be used to decouple some business "
@@ -88,7 +79,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:56
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -96,7 +86,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:62
 #, fuzzy, no-c-format
 msgid ""
 "The second major theme of CDI is <emphasis>strong typing</emphasis>. The "
@@ -111,13 +100,12 @@
 "ser validados pelo compilador."
 
 #. Tag: para
-#: part3.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "You don't see string-based identifiers in CDI code, not because the "
-"framework is hiding them from you using clever defaulting rules&#8212;so-"
-"called \"configuration by convention\"&#8212;but because there are simply no "
-"strings there to begin with!"
+"framework is hiding them from you using clever defaulting rules—so-called "
+"\"configuration by convention\"—but because there are simply no strings "
+"there to begin with!"
 msgstr ""
 "Você não vê identificadores baseados em strings no código Web Beans - não "
 "porque o framework está escondendo-os de você utilizando padrões de regras "
@@ -125,7 +113,6 @@
 "simplesmente não existem strings ali!"
 
 #. Tag: para
-#: part3.xml:74
 #, no-c-format
 msgid ""
 "The obvious benefit of this approach is that <emphasis>any</emphasis> IDE "
@@ -143,7 +130,6 @@
 "-, você tem uma oportunidade para aumentar o nível semântico do seu código."
 
 #. Tag: para
-#: part3.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "CDI encourages you develop annotations that model concepts, for example,"
@@ -152,61 +138,51 @@
 "exemplo:"
 
 #. Tag: para
-#: part3.xml:87
 #, no-c-format
 msgid "<literal>@Asynchronous</literal>,"
 msgstr "<literal>@Asynchronous</literal>,"
 
 #. Tag: para
-#: part3.xml:90
 #, no-c-format
 msgid "<literal>@Mock</literal>,"
 msgstr "<literal>@Mock</literal>,"
 
 #. Tag: para
-#: part3.xml:93
 #, no-c-format
 msgid "<literal>@Secure</literal> or"
 msgstr "<literal>@Secure</literal> ou"
 
 #. Tag: para
-#: part3.xml:96
 #, no-c-format
 msgid "<literal>@Updated</literal>,"
 msgstr "<literal>@Updated</literal>,"
 
 #. Tag: para
-#: part3.xml:100
 #, no-c-format
 msgid "instead of using compound names like"
 msgstr "em vez de utilizar nomes compostos, como"
 
 #. Tag: para
-#: part3.xml:104
 #, no-c-format
 msgid "<literal>asyncPaymentProcessor</literal>,"
 msgstr "<literal>asyncPaymentProcessor</literal>,"
 
 #. Tag: para
-#: part3.xml:107
 #, no-c-format
 msgid "<literal>mockPaymentProcessor</literal>,"
 msgstr "<literal>mockPaymentProcessor</literal>,"
 
 #. Tag: para
-#: part3.xml:110
 #, no-c-format
 msgid "<literal>SecurityInterceptor</literal> or"
 msgstr "<literal>SecurityInterceptor</literal> ou"
 
 #. Tag: para
-#: part3.xml:113
 #, no-c-format
 msgid "<literal>DocumentUpdatedEvent</literal>."
 msgstr "<literal>DocumentUpdatedEvent</literal>."
 
 #. Tag: para
-#: part3.xml:117
 #, no-c-format
 msgid ""
 "The annotations are reusable. They help describe common qualities of "
@@ -220,7 +196,6 @@
 "comum. Elas tornam o nosso código mais legível e mais compreensível."
 
 #. Tag: para
-#: part3.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "CDI <emphasis>stereotypes</emphasis> take this idea a step further. A "
@@ -237,7 +212,6 @@
 "em um único pacote reutilizável."
 
 #. Tag: para
-#: part3.xml:138
 #, fuzzy, no-c-format
 msgid ""
 "We're now ready to meet some more advanced features of CDI. Bear in mind "

Modified: doc/trunk/reference/pt-BR/part4.po
===================================================================
--- doc/trunk/reference/pt-BR/part4.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/part4.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-04-10 20:34-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part4.xml:5
 #, no-c-format
 msgid ""
 "The third theme of CDI is <emphasis>integration</emphasis>. We've already "
@@ -26,7 +25,6 @@
 msgstr ""
 
 #. Tag: para
-#: part4.xml:12
 #, fuzzy, no-c-format
 msgid ""
 "CDI is also designed to work in concert with technologies outside of the "
@@ -53,7 +51,6 @@
 "ambiente Java EE. "
 
 #. Tag: para
-#: part4.xml:23
 #, fuzzy, no-c-format
 msgid ""
 "We're about to see how to take full advantage of the Java EE platform in an "

Modified: doc/trunk/reference/pt-BR/part5.po
===================================================================
--- doc/trunk/reference/pt-BR/part5.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/part5.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-04-10 15:56-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -15,7 +15,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part5.xml:5
 #, fuzzy, no-c-format
 msgid ""
 "Weld is the reference implementation of JSR-299, and is used by JBoss AS and "
@@ -34,7 +33,6 @@
 "implantação XML da JSR-299)."
 
 #. Tag: para
-#: part5.xml:12
 #, no-c-format
 msgid ""
 "Some of the extensions in Weld are portable across JSR-299 implementations "
@@ -44,12 +42,11 @@
 msgstr ""
 
 #. Tag: para
-#: part5.xml:18
 #, fuzzy, no-c-format
 msgid ""
 "If you want to get started quickly using Weld (and, in turn, CDI) with JBoss "
 "AS, GlassFish or Tomcat and experiment with one of the examples, take a look "
-"at <xref linkend=\"gettingstarted\"/>. Otherwise read on for a exhaustive "
+"at <xref linkend=\"gettingstarted\" />. Otherwise read on for a exhaustive "
 "discussion of using Weld in all the environments and application servers it "
 "supports and the Weld extensions."
 msgstr ""

Modified: doc/trunk/reference/pt-BR/producermethods.po
===================================================================
--- doc/trunk/reference/pt-BR/producermethods.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/producermethods.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-12-19 18:07-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: producermethods.xml:5
 #, no-c-format
 msgid "Producer methods"
 msgstr "Métodos produtores"
 
 #. Tag: para
-#: producermethods.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Producer methods let us overcome certain limitations that arise when a "
@@ -35,13 +33,11 @@
 "linkend=\"xml\"/>.)"
 
 #. Tag: para
-#: producermethods.xml:14
 #, no-c-format
 msgid "According to the spec:"
 msgstr "De acordo com a especificação:"
 
 #. Tag: para
-#: producermethods.xml:18
 #, fuzzy, no-c-format
 msgid "A producer method acts as a source of objects to be injected, where:"
 msgstr ""
@@ -49,7 +45,6 @@
 "injetado, quando:"
 
 #. Tag: para
-#: producermethods.xml:22
 #, fuzzy, no-c-format
 msgid "the objects to be injected are not required to be instances of beans,"
 msgstr ""
@@ -57,7 +52,6 @@
 "Beans,"
 
 #. Tag: para
-#: producermethods.xml:25
 #, no-c-format
 msgid "the concrete type of the objects to be injected may vary at runtime or"
 msgstr ""
@@ -65,7 +59,6 @@
 "execução ou"
 
 #. Tag: para
-#: producermethods.xml:28
 #, fuzzy, no-c-format
 msgid ""
 "the objects require some custom initialization that is not performed by the "
@@ -75,25 +68,21 @@
 "pelo construtor do Web Bean"
 
 #. Tag: para
-#: producermethods.xml:36
 #, no-c-format
 msgid "For example, producer methods let us:"
 msgstr "Por exemplo, métodos produtores permitem:"
 
 #. Tag: para
-#: producermethods.xml:40
 #, fuzzy, no-c-format
 msgid "expose a JPA entity as a bean,"
 msgstr "expor uma entidade JPA como um Web Bean,"
 
 #. Tag: para
-#: producermethods.xml:43
 #, fuzzy, no-c-format
 msgid "expose any JDK class as a bean,"
 msgstr "expor qualquer classe do JDK como um Web Bean,"
 
 #. Tag: para
-#: producermethods.xml:46
 #, fuzzy, no-c-format
 msgid ""
 "define multiple beans, with different scopes or initialization, for the same "
@@ -103,13 +92,11 @@
 "mesma implementação da classe, ou"
 
 #. Tag: para
-#: producermethods.xml:51
 #, fuzzy, no-c-format
 msgid "vary the implementation of a bean type at runtime."
 msgstr "variar a implementação de um tipo da API em tempo de execução."
 
 #. Tag: para
-#: producermethods.xml:55
 #, fuzzy, no-c-format
 msgid ""
 "In particular, producer methods let us use runtime polymorphism with CDI. As "
@@ -123,54 +110,12 @@
 "Mas, uma vez que o sistema está implantado, a implementação do Web Bean é "
 "fixada. Um método produtor não tem essa limitação:"
 
-#. Tag: programlisting
-#: producermethods.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Preferences implements Serializable {\n"
-"   private PaymentStrategyType paymentStrategy;\n"
-"   ...\n"
-"   @Produces @Preferred \n"
-"   public PaymentStrategy getPaymentStrategy() {\n"
-"       switch (paymentStrategy) {\n"
-"           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
-"           case CHECK: return new CheckPaymentStrategy();\n"
-"           case PAYPAL: return new PayPalPaymentStrategy();\n"
-"           default: return null;\n"
-"       } \n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped\n"
-"public class Preferences implements Serializable {\n"
-"   private PaymentStrategyType paymentStrategy;\n"
-"   ...\n"
-"   @Produces @Preferred \n"
-"   public PaymentStrategy getPaymentStrategy() {\n"
-"       switch (paymentStrategy) {\n"
-"           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
-"           case CHECK: return new CheckPaymentStrategy();\n"
-"           case PAYPAL: return new PayPalPaymentStrategy();\n"
-"           default: return null;\n"
-"       } \n"
-"   }\n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:63
 #, no-c-format
 msgid "Consider an injection point:"
 msgstr "Considere o ponto de injeção:"
 
-#. Tag: programlisting
-#: producermethods.xml:65
-#, no-c-format
-msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
-msgstr "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
-
 #. Tag: para
-#: producermethods.xml:67
 #, fuzzy, no-c-format
 msgid ""
 "This injection point has the same type and qualifier annotations as the "
@@ -184,13 +129,11 @@
 "Bean Web para obter uma instância para servir esse ponto de injeção."
 
 #. Tag: title
-#: producermethods.xml:74
 #, no-c-format
 msgid "Scope of a producer method"
 msgstr "Escopo de um método produtor"
 
 #. Tag: para
-#: producermethods.xml:76
 #, fuzzy, no-c-format
 msgid ""
 "The scope of the producer method defaults to <literal>@Dependent</literal>, "
@@ -206,7 +149,6 @@
 "<literal>PaymentStrategy</literal> para cada sessão do usuário."
 
 #. Tag: para
-#: producermethods.xml:83
 #, no-c-format
 msgid ""
 "To change this behavior, we can add a <literal>@SessionScoped</literal> "
@@ -215,22 +157,7 @@
 "Para mudar esse comportamento, nós podemos adicionar a anotação "
 "<literal>@SessionScoped</literal> ao método."
 
-#. Tag: programlisting
-#: producermethods.xml:87
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"   ...\n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:89
 #, no-c-format
 msgid ""
 "Now, when the producer method is called, the returned "
@@ -242,7 +169,6 @@
 "será invocado novamente na mesma sessão."
 
 #. Tag: para
-#: producermethods.xml:95
 #, no-c-format
 msgid ""
 "A producer method does <emphasis>not</emphasis> inherit the scope of the "
@@ -255,13 +181,11 @@
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:107
 #, no-c-format
 msgid "Injection into producer methods"
 msgstr "Injeção em métodos produtores"
 
 #. Tag: para
-#: producermethods.xml:109
 #, no-c-format
 msgid ""
 "There's one potential problem with the code above. The implementations of "
@@ -277,7 +201,6 @@
 "interceptadores."
 
 #. Tag: para
-#: producermethods.xml:116
 #, fuzzy, no-c-format
 msgid ""
 "If this isn't what we want, we can use dependency injection into the "
@@ -286,36 +209,7 @@
 "Se  não é isso  o que queremos, podemos utilizar a injeção de dependência no "
 "método produtor para obter instâncias do Web Bean:"
 
-#. Tag: programlisting
-#: producermethods.xml:121
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          CheckPaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          CheckPaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-"
@@ -337,7 +231,6 @@
 "cuidado quando retornar instâncias de Web Bean em métodos produtores!"
 
 #. Tag: para
-#: producermethods.xml:132
 #, fuzzy, no-c-format
 msgid ""
 "There's at least three ways we could go about fixing this bug. We could "
@@ -353,7 +246,6 @@
 "<literal>@RequestScoped</literal>."
 
 #. Tag: para
-#: producermethods.xml:139
 #, fuzzy, no-c-format
 msgid ""
 "But a more common solution is to use the special <literal>@New</literal> "
@@ -363,51 +255,16 @@
 "<literal>@New</literal>"
 
 #. Tag: title
-#: producermethods.xml:144
 #, no-c-format
 msgid "Use of <literal>@New</literal> with producer methods"
 msgstr "Uso do <literal>@New</literal> em métodos produtores"
 
 #. Tag: para
-#: producermethods.xml:146
 #, no-c-format
 msgid "Consider the following producer method:"
 msgstr "Considere o seguinte método produtor:"
 
-#. Tag: programlisting
-#: producermethods.xml:148
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New CheckPaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New CheckPaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:150
 #, no-c-format
 msgid ""
 "Then a new <emphasis>dependent</emphasis> instance of "
@@ -424,53 +281,25 @@
 "<literal>Preferences</literal> seja destruído, no término da sessão."
 
 #. Tag: title
-#: producermethods.xml:160
 #, fuzzy, no-c-format
 msgid "Disposer methods"
 msgstr "Métodos produtores"
 
 #. Tag: para
-#: producermethods.xml:162
 #, no-c-format
 msgid ""
 "Some producer methods return objects that require explicit destruction. For "
 "example, somebody needs to close this JDBC connection:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:167
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @RequestScoped Connection connect(User user) {\n"
-"   return createConnection(user.getId(), user.getPassword());\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @RequestScoped Connection connect(User user) {\n"
-"   return createConnection(user.getId(), user.getPassword());\n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:169
 #, no-c-format
 msgid ""
 "Destruction can be performed by a matching <emphasis>disposer method</"
 "emphasis>, defined by the same class as the producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:172
-#, no-c-format
-msgid ""
-"<![CDATA[void close(@Disposes Connection connection) {\n"
-"   connection.close();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[void close(@Disposes Connection connection) {\n"
-"   connection.close();\n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:174
 #, no-c-format
 msgid ""
 "The disposer method must have at least one parameter, annotated "
@@ -483,5 +312,124 @@
 "method automatically."
 msgstr ""
 
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Preferences implements Serializable {\n"
+#~ "   private PaymentStrategyType paymentStrategy;\n"
+#~ "   ...\n"
+#~ "   @Produces @Preferred \n"
+#~ "   public PaymentStrategy getPaymentStrategy() {\n"
+#~ "       switch (paymentStrategy) {\n"
+#~ "           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
+#~ "           case CHECK: return new CheckPaymentStrategy();\n"
+#~ "           case PAYPAL: return new PayPalPaymentStrategy();\n"
+#~ "           default: return null;\n"
+#~ "       } \n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Preferences implements Serializable {\n"
+#~ "   private PaymentStrategyType paymentStrategy;\n"
+#~ "   ...\n"
+#~ "   @Produces @Preferred \n"
+#~ "   public PaymentStrategy getPaymentStrategy() {\n"
+#~ "       switch (paymentStrategy) {\n"
+#~ "           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
+#~ "           case CHECK: return new CheckPaymentStrategy();\n"
+#~ "           case PAYPAL: return new PayPalPaymentStrategy();\n"
+#~ "           default: return null;\n"
+#~ "       } \n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
+#~ msgstr "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "   ...\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          CheckPaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          CheckPaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          @New CheckPaymentStrategy cps,\n"
+#~ "                                          @New PayPalPaymentStrategy "
+#~ "ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          @New CheckPaymentStrategy cps,\n"
+#~ "                                          @New PayPalPaymentStrategy "
+#~ "ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces @RequestScoped Connection connect(User user) {\n"
+#~ "   return createConnection(user.getId(), user.getPassword());\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @RequestScoped Connection connect(User user) {\n"
+#~ "   return createConnection(user.getId(), user.getPassword());\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[void close(@Disposes Connection connection) {\n"
+#~ "   connection.close();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[void close(@Disposes Connection connection) {\n"
+#~ "   connection.close();\n"
+#~ "}]]>"
+
 #~ msgid "<chapter>.</chapter>"
 #~ msgstr "<chapter>.</chapter>"

Modified: doc/trunk/reference/pt-BR/resources.po
===================================================================
--- doc/trunk/reference/pt-BR/resources.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/resources.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-12-19 18:06-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: resources.xml:5
 #, no-c-format
 msgid "Java EE component environment resources"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:7
 #, no-c-format
 msgid ""
 "Java EE 5 already introduced some limited support for dependency injection, "
@@ -30,7 +28,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:13
 #, no-c-format
 msgid ""
 "Naturally, there is now a slight mismatch with the new style of dependency "
@@ -44,7 +41,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:22
 #, no-c-format
 msgid ""
 "Fields have a duality in that they can both be the target of Java EE "
@@ -57,13 +53,11 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:31
 #, no-c-format
 msgid "Defining a resource"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:33
 #, no-c-format
 msgid ""
 "The CDI specification uses the term <emphasis>resource</emphasis> to refer, "
@@ -72,7 +66,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:38
 #, no-c-format
 msgid ""
 "JDBC <literal>Datasource</literal>s, JMS <literal>Queue</literal>s, "
@@ -82,7 +75,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:43
 #, no-c-format
 msgid ""
 "JPA <literal>EntityManager</literal>s and <literal>EntityManagerFactory</"
@@ -90,19 +82,16 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:46
 #, no-c-format
 msgid "remote EJBs, and"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:49
 #, no-c-format
 msgid "web services"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:53
 #, no-c-format
 msgid ""
 "We declare a resource by annotating a producer field with a component "
@@ -111,72 +100,17 @@
 "<literal>@PersistenceUnit</literal> or <literal>@WebServiceRef</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:57
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @WebServiceRef(lookup=\"java:app/service/Catalog\")\n"
-"Catalog catalog;]]>"
-msgstr ""
-"<![CDATA[@Produces @WebServiceRef(lookup=\"java:app/service/Catalog\")\n"
-"Catalog catalog;]]>"
-
-#. Tag: programlisting
-#: resources.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Resource(lookup=\"java:global/env/jdbc/CustomerDatasource"
-"\") \n"
-"@CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-"<![CDATA[@Produces @Resource(lookup=\"java:global/env/jdbc/CustomerDatasource"
-"\") \n"
-"@CustomerDatabase Datasource customerDatabase;]]>"
-
-#. Tag: programlisting
-#: resources.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceContext(unitName=\"CustomerDatabase\")\n"
-"@CustomerDatabase EntityManager customerDatabasePersistenceContext;]]>"
-msgstr ""
-"<![CDATA[@Produces @PersistenceContext(unitName=\"CustomerDatabase\")\n"
-"@CustomerDatabase EntityManager customerDatabasePersistenceContext;]]>"
-
-#. Tag: programlisting
-#: resources.xml:63
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceUnit(unitName=\"CustomerDatabase\") \n"
-"@CustomerDatabase EntityManagerFactory customerDatabasePersistenceUnit;]]>"
-msgstr ""
-"<![CDATA[@Produces @PersistenceUnit(unitName=\"CustomerDatabase\") \n"
-"@CustomerDatabase EntityManagerFactory customerDatabasePersistenceUnit;]]>"
-
-#. Tag: programlisting
-#: resources.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @EJB(ejbLink=\"../their.jar#PaymentService\") \n"
-"PaymentService paymentService;]]>"
-msgstr ""
-"<![CDATA[@Produces @EJB(ejbLink=\"../their.jar#PaymentService\") \n"
-"PaymentService paymentService;]]>"
-
 #. Tag: para
-#: resources.xml:67
 #, no-c-format
 msgid "The field may be static (but not final)."
 msgstr ""
 
 #. Tag: para
-#: resources.xml:69
 #, no-c-format
 msgid "A resource declaration really contains two pieces of information:"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:73
 #, no-c-format
 msgid ""
 "the JNDI name, EJB link, persistence unit name, or other metadata needed to "
@@ -184,7 +118,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:77
 #, no-c-format
 msgid ""
 "the type and qualifiers that we will use to inject the reference into our "
@@ -192,7 +125,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:82
 #, no-c-format
 msgid ""
 "It might feel strange to be declaring resources in Java code. Isn't this "
@@ -202,57 +134,16 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:90
 #, no-c-format
 msgid "Typesafe resource injection"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:92
 #, no-c-format
 msgid "These resources can now be injected in the usual way."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:96
-#, no-c-format
-msgid "<![CDATA[@Inject Catalog catalog;]]>"
-msgstr "<![CDATA[@Inject Catalog catalog;]]>"
-
-#. Tag: programlisting
-#: resources.xml:97
-#, no-c-format
-msgid "<![CDATA[@Inject @CustomerDatabase Datasource customerDatabase;]]>"
-msgstr "<![CDATA[@Inject @CustomerDatabase Datasource customerDatabase;]]>"
-
-#. Tag: programlisting
-#: resources.xml:98
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManager "
-"customerDatabaseEntityManager;]]>"
-msgstr ""
-"<![CDATA[@Inject @CustomerDatabase EntityManager "
-"customerDatabaseEntityManager;]]>"
-
-#. Tag: programlisting
-#: resources.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManagerFactory "
-"customerDatabaseEntityManagerFactory;]]>"
-msgstr ""
-"<![CDATA[@Inject @CustomerDatabase EntityManagerFactory "
-"customerDatabaseEntityManagerFactory;]]>"
-
-#. Tag: programlisting
-#: resources.xml:100
-#, no-c-format
-msgid "<![CDATA[@Inject PaymentService paymentService;]]>"
-msgstr "<![CDATA[@Inject PaymentService paymentService;]]>"
-
 #. Tag: para
-#: resources.xml:102
 #, no-c-format
 msgid ""
 "The bean type and qualifiers of the resource are determined by the producer "
@@ -260,7 +151,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:106
 #, no-c-format
 msgid ""
 "It might seem like a pain to have to write these extra producer field "
@@ -271,26 +161,72 @@
 "and more typesafe to write"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:113
-#, no-c-format
-msgid "@Inject @CustomerDatabase EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:115
 #, no-c-format
 msgid "instead of"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:117
-#, no-c-format
-msgid "@PersistenceContext(unitName=\"CustomerDatabase\") EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:119
 #, no-c-format
 msgid "all over the place?"
 msgstr ""
+
+#~ msgid ""
+#~ "<![CDATA[@Produces @WebServiceRef(lookup=\"java:app/service/Catalog\")\n"
+#~ "Catalog catalog;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @WebServiceRef(lookup=\"java:app/service/Catalog\")\n"
+#~ "Catalog catalog;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces @Resource(lookup=\"java:global/env/jdbc/"
+#~ "CustomerDatasource\") \n"
+#~ "@CustomerDatabase Datasource customerDatabase;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Resource(lookup=\"java:global/env/jdbc/"
+#~ "CustomerDatasource\") \n"
+#~ "@CustomerDatabase Datasource customerDatabase;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces @PersistenceContext(unitName=\"CustomerDatabase\")\n"
+#~ "@CustomerDatabase EntityManager customerDatabasePersistenceContext;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @PersistenceContext(unitName=\"CustomerDatabase\")\n"
+#~ "@CustomerDatabase EntityManager customerDatabasePersistenceContext;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces @PersistenceUnit(unitName=\"CustomerDatabase\") \n"
+#~ "@CustomerDatabase EntityManagerFactory customerDatabasePersistenceUnit;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @PersistenceUnit(unitName=\"CustomerDatabase\") \n"
+#~ "@CustomerDatabase EntityManagerFactory customerDatabasePersistenceUnit;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces @EJB(ejbLink=\"../their.jar#PaymentService\") \n"
+#~ "PaymentService paymentService;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @EJB(ejbLink=\"../their.jar#PaymentService\") \n"
+#~ "PaymentService paymentService;]]>"
+
+#~ msgid "<![CDATA[@Inject Catalog catalog;]]>"
+#~ msgstr "<![CDATA[@Inject Catalog catalog;]]>"
+
+#~ msgid "<![CDATA[@Inject @CustomerDatabase Datasource customerDatabase;]]>"
+#~ msgstr "<![CDATA[@Inject @CustomerDatabase Datasource customerDatabase;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Inject @CustomerDatabase EntityManager "
+#~ "customerDatabaseEntityManager;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Inject @CustomerDatabase EntityManager "
+#~ "customerDatabaseEntityManager;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Inject @CustomerDatabase EntityManagerFactory "
+#~ "customerDatabaseEntityManagerFactory;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Inject @CustomerDatabase EntityManagerFactory "
+#~ "customerDatabaseEntityManagerFactory;]]>"
+
+#~ msgid "<![CDATA[@Inject PaymentService paymentService;]]>"
+#~ msgstr "<![CDATA[@Inject PaymentService paymentService;]]>"

Modified: doc/trunk/reference/pt-BR/ri-spi.po
===================================================================
--- doc/trunk/reference/pt-BR/ri-spi.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/ri-spi.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-12-19 18:04-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: ri-spi.xml:4
 #, no-c-format
 msgid "Integrating Weld into other environments"
 msgstr "Integrando o Weld em outros ambientes"
 
 #. Tag: para
-#: ri-spi.xml:6
 #, no-c-format
 msgid ""
 "If you want to use Weld in another environment, you will need to provide "
@@ -29,13 +27,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:12
 #, fuzzy, no-c-format
 msgid "Enterprise Services"
 msgstr "Carregando recursos"
 
 #. Tag: para
-#: ri-spi.xml:13
 #, no-c-format
 msgid ""
 "If you just want to use managed beans, and not take advantage of enterprise "
@@ -47,7 +43,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:21
 #, no-c-format
 msgid ""
 "All SPIs and APIs described have extensive JavaDoc, which spell out the "
@@ -55,13 +50,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:27
 #, fuzzy, no-c-format
 msgid "The Weld SPI"
 msgstr "A SPI da Web Beans"
 
 #. Tag: para
-#: ri-spi.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "The Weld SPI is located in the <literal>weld-spi</literal> module, and "
@@ -75,7 +68,6 @@
 "obrigatórios."
 
 #. Tag: para
-#: ri-spi.xml:35
 #, no-c-format
 msgid ""
 "All interfaces in the SPI support the decorator pattern and provide a "
@@ -91,7 +83,6 @@
 "<literal>helpers</literal>."
 
 #. Tag: para
-#: ri-spi.xml:41
 #, no-c-format
 msgid ""
 "Weld supports multiple environments. An environment is defined by an "
@@ -105,7 +96,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:50
 #, no-c-format
 msgid ""
 "Weld uses a generic-typed service registry to allow services to be "
@@ -114,18 +104,16 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:56
 #, no-c-format
 msgid "Deployment structure"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:58
 #, no-c-format
 msgid ""
 "An application is often comprised of a number of modules. For example, a "
 "Java EE deployment may contain a number of EJB modules (containing business "
-"logic) and WAR modules (containing the user interface). A container may "
+"logic) and war modules (containing the user interface). A container may "
 "enforce certain <emphasis>accessibility</emphasis> rules which limit the "
 "visibility of classes between modules. CDI allows these same rules to apply "
 "to bean and observer method resolution. As the accessibility rules vary "
@@ -135,13 +123,12 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:67
 #, no-c-format
 msgid ""
 "The CDI specification discusses <emphasis>Bean Deployment Archives</"
-"emphasis> (BDAs)&#8212;archives which are marked as containing beans which "
-"should be deployed to the CDI container, and made available for injection "
-"and resolution. Weld reuses this description of <emphasis>Bean Deployment "
+"emphasis> (BDAs)—archives which are marked as containing beans which should "
+"be deployed to the CDI container, and made available for injection and "
+"resolution. Weld reuses this description of <emphasis>Bean Deployment "
 "Archives</emphasis> in its deployment structure SPI. Each deployment exposes "
 "the BDAs which it contains; each BDA may also reference other which it can "
 "access. Together, the transitive closure of this graph forms the beans which "
@@ -149,7 +136,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:76
 #, no-c-format
 msgid ""
 "To describe the deployment structure to Weld, the container should provide "
@@ -163,7 +149,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:85
 #, no-c-format
 msgid ""
 "As programmatically described beans may result in additional BDAs being "
@@ -173,13 +158,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:92
 #, no-c-format
 msgid "Virtual BDAs"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:93
 #, no-c-format
 msgid ""
 "In a strict container, each BDA might have to explicitly specify which other "
@@ -190,7 +173,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:100
 #, no-c-format
 msgid ""
 "A container, might, for example, use a flat accessibility structure for the "
@@ -199,11 +181,10 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:106
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it's contents to be discovered by Weld&#8212;<literal>BeanDeploymentArchive."
+"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
 "getBeanClasses()</literal> must return all the classes in the BDA, "
 "<literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the "
 "deployment descriptors in the archive, and <literal>BeanDeploymentArchive."
@@ -212,7 +193,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:114
 #, no-c-format
 msgid ""
 "BDA X may also reference another BDA Y whose beans can be resolved by, and "
@@ -223,13 +203,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:122
 #, no-c-format
 msgid "Matching the classloader structure for the deployment"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:124
 #, no-c-format
 msgid ""
 "In practice, you can regard the deployment structure represented by "
@@ -240,7 +218,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:132
 #, no-c-format
 msgid ""
 "To specify the directly accessible BDAs, the container should provide an "
@@ -249,7 +226,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:138
 #, no-c-format
 msgid ""
 "Weld allows the container to describe a circular graph, and will convert a "
@@ -257,7 +233,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:144
 #, no-c-format
 msgid ""
 "Certain services are provided for the whole deployment, whilst some are "
@@ -267,13 +242,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:153
 #, no-c-format
 msgid "EJB descriptors"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:155
 #, no-c-format
 msgid ""
 "Weld delegates EJB 3 bean discovery to the container so that it doesn't "
@@ -282,7 +255,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:160
 #, no-c-format
 msgid ""
 "The <literal>EjbDescriptor</literal> should return the relevant metadata as "
@@ -291,13 +263,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:169
 #, no-c-format
 msgid "EE resource injection and resolution services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:171
 #, no-c-format
 msgid ""
 "All the EE resource services are per-BDA services, and may be provided using "
@@ -306,37 +276,33 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:176
 #, no-c-format
 msgid ""
 "The integrator may choose to provide all EE resource injection services "
 "themselves, using another library or framework. In this case the integrator "
 "should use the <literal>EE</literal> environment, and implement the <xref "
-"linkend=\"injection.services\"/> SPI."
+"linkend=\"injection.services\" /> SPI."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:182
 #, no-c-format
 msgid ""
 "Alternatively, the integrator may choose to use CDI to provide EE resource "
 "injection. In this case, the <literal>EE_INJECT</literal> environment should "
 "be used, and the integrator should implement the <xref linkend=\"ejb."
-"services.resolution\"/>, <xref linkend=\"resource.services\"/> and <xref "
-"linkend=\"jpa.services\"/>."
+"services.resolution\" />, <xref linkend=\"resource.services\" /> and <xref "
+"linkend=\"jpa.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:189
 #, no-c-format
 msgid ""
 "CDI only provides annotation-based EE resource injection; if you wish to "
 "provide deployment descriptor (e.g. <literal>ejb-jar.xml</literal>) "
-"injection, you must use <xref linkend=\"injection.services\"/>."
+"injection, you must use <xref linkend=\"injection.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:195
 #, no-c-format
 msgid ""
 "If the container performs EE resource injection, the injected resources must "
@@ -345,7 +311,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:201
 #, no-c-format
 msgid ""
 "If you use a non-EE environment then you may implement any of the EE service "
@@ -354,49 +319,43 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:210
 #, no-c-format
 msgid "EJB services"
 msgstr "Serviços EJB"
 
 #. Tag: para
-#: ri-spi.xml:212
 #, no-c-format
 msgid "EJB services are split between two interfaces which are both per-BDA."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:216
 #, no-c-format
 msgid ""
 "<literal>EJBServices</literal> is used to resolve local EJBs used to back "
 "session beans, and must always be provided in an EE environment. "
 "<literal>EJBServices.resolveEjb(EjbDescriptor ejbDescriptor)</literal> "
-"returns a wrapper&#8212;<literal>SessionObjectReference</literal>&#8212;"
-"around the EJB reference. This wrapper allows Weld to request a reference "
-"that implements the given business interface, and, in the case of SFSBs, "
-"both request the removal of the EJB from the container and query whether the "
-"EJB has been previously removed."
+"returns a wrapper—<literal>SessionObjectReference</literal>—around the EJB "
+"reference. This wrapper allows Weld to request a reference that implements "
+"the given business interface, and, in the case of SFSBs, both request the "
+"removal of the EJB from the container and query whether the EJB has been "
+"previously removed."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:225
 #, no-c-format
 msgid ""
 "<literal>EJBResolutionServices.resolveEjb(InjectionPoint ij)</literal> "
 "allows the resolution of <literal>@EJB</literal> (for injection into managed "
 "beans). This service is not required if the implementation of <xref linkend="
-"\"injection.services\"/> takes care of <literal>@EJB</literal> injection."
+"\"injection.services\" /> takes care of <literal>@EJB</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:234
 #, no-c-format
 msgid "JPA services"
 msgstr "Serviços JPA"
 
 #. Tag: para
-#: ri-spi.xml:236
 #, no-c-format
 msgid ""
 "Just as EJB resolution is delegated to the container, resolution of "
@@ -406,23 +365,20 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:242
 #, no-c-format
 msgid ""
 "To allow JPA integration, the <literal>JpaServices</literal> interface "
 "should be implemented. This service is not required if the implementation of "
-"<xref linkend=\"injection.services\"/> takes care of "
+"<xref linkend=\"injection.services\" /> takes care of "
 "<literal>@PersistenceContext</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:251
 #, no-c-format
 msgid "Transaction Services"
 msgstr "Servicos de transação"
 
 #. Tag: para
-#: ri-spi.xml:253
 #, fuzzy, no-c-format
 msgid ""
 "Weld delegates JTA activities to the container. The SPI provides a couple "
@@ -434,7 +390,6 @@
 "<literal>TransactionServices</literal>."
 
 #. Tag: para
-#: ri-spi.xml:258
 #, no-c-format
 msgid ""
 "Any <literal>javax.transaction.Synchronization</literal> implementation may "
@@ -444,7 +399,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:264
 #, no-c-format
 msgid ""
 "To make it easier to determine whether or not a transaction is currently "
@@ -454,30 +408,26 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:272
 #, fuzzy, no-c-format
 msgid "Resource Services"
 msgstr "Carregando recursos"
 
 #. Tag: para
-#: ri-spi.xml:274
 #, no-c-format
 msgid ""
 "The resolution of <literal>@Resource</literal> (for injection into managed "
 "beans) is delegated to the container. You must provide an implementation of "
 "<literal>ResourceServices</literal> which provides these operations. This "
 "service is not required if the implementation of <xref linkend=\"injection."
-"services\"/> takes care of <literal>@Resource</literal> injection."
+"services\" /> takes care of <literal>@Resource</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:283
 #, fuzzy, no-c-format
 msgid "Injection Services"
 msgstr "Servicos de transação"
 
 #. Tag: para
-#: ri-spi.xml:285
 #, no-c-format
 msgid ""
 "An integrator may wish to use <literal>InjectionServices</literal> to "
@@ -488,7 +438,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:291
 #, no-c-format
 msgid ""
 "<literal>InjectionServices</literal> provides a very simple contract, the "
@@ -499,7 +448,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:298
 #, no-c-format
 msgid ""
 "The <literal>InjectionContext</literal> can be used to discover additional "
@@ -510,13 +458,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:307
 #, fuzzy, no-c-format
 msgid "Security Services"
 msgstr "Carregando recursos"
 
 #. Tag: para
-#: ri-spi.xml:309
 #, no-c-format
 msgid ""
 "In order to obtain the <literal>Principal</literal> representing the current "
@@ -525,13 +471,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:317
 #, fuzzy, no-c-format
 msgid "Bean Validation Services"
 msgstr "Servicos de transação"
 
 #. Tag: para
-#: ri-spi.xml:319
 #, no-c-format
 msgid ""
 "In order to obtain the default <literal>ValidatorFactory</literal> for the "
@@ -540,13 +484,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:327
 #, no-c-format
 msgid "Identifying the BDA being addressed"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:329
 #, no-c-format
 msgid ""
 "When a client makes a request to an application which uses Weld, the request "
@@ -557,43 +499,39 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:337
 #, no-c-format
 msgid ""
-"Most Servlet contains use a classloader-per-WAR, this may provide a good way "
+"Most Servlet contains use a classloader-per-war, this may provide a good way "
 "to identify the BDA in use for web requests."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:343
 #, no-c-format
 msgid ""
 "When Weld needs to identify the BDA, it will use one of these services, "
 "depending on what is servicing the request:"
 msgstr ""
 
-#. Tag: literal
-#: ri-spi.xml:350
+#. Tag: term
 #, no-c-format
-msgid "ServletServices.getBeanDeploymentArchive(ServletContext ctx)"
+msgid ""
+"<literal>ServletServices.getBeanDeploymentArchive(ServletContext ctx)</"
+"literal>"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:352
 #, no-c-format
 msgid ""
-"Identify the WAR in use. The <literal>ServletContext</literal> is provided "
+"Identify the war in use. The <literal>ServletContext</literal> is provided "
 "for additional context."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:362
 #, no-c-format
 msgid "The bean store"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:364
 #, no-c-format
 msgid ""
 "Weld uses a map like structure to store bean instances - <literal>org.jboss."
@@ -602,13 +540,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:372
 #, no-c-format
 msgid "The application context"
 msgstr "O contexto de aplicação"
 
 #. Tag: para
-#: ri-spi.xml:374
 #, no-c-format
 msgid ""
 "Weld expects the Application Server or other container to provide the "
@@ -618,13 +554,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:383
 #, fuzzy, no-c-format
 msgid "Initialization and shutdown"
 msgstr "Bootstrap e shutdown"
 
 #. Tag: para
-#: ri-spi.xml:384
 #, no-c-format
 msgid ""
 "The <literal>org.jboss.weld.bootstrap.api.Bootstrap</literal> interface "
@@ -635,7 +569,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:391
 #, no-c-format
 msgid ""
 "The bootstrap is split into phases, container initialization, bean "
@@ -646,7 +579,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:398
 #, no-c-format
 msgid ""
 "To initialize the container, you call <literal>Bootstrap.startInitialization"
@@ -658,7 +590,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:405
 #, no-c-format
 msgid ""
 "Having called <literal>startInitialization()</literal>, the "
@@ -667,7 +598,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:410
 #, fuzzy, no-c-format
 msgid ""
 "To deploy the discovered beans, call <literal>Bootstrap.deployBeans()</"
@@ -676,7 +606,6 @@
 "Para iniciar o container é chamado <literal>Bootstrap.boot()</literal>."
 
 #. Tag: para
-#: ri-spi.xml:414
 #, fuzzy, no-c-format
 msgid ""
 "To validate the deployed beans, call <literal>Bootstrap.validateBeans()</"
@@ -685,7 +614,6 @@
 "Para iniciar o container é chamado <literal>Bootstrap.boot()</literal>."
 
 #. Tag: para
-#: ri-spi.xml:418
 #, fuzzy, no-c-format
 msgid ""
 "To place the container into a state where it can service requests, call "
@@ -694,7 +622,6 @@
 "Para iniciar o container é chamado <literal>Bootstrap.boot()</literal>."
 
 #. Tag: para
-#: ri-spi.xml:423
 #, no-c-format
 msgid ""
 "To shutdown the container you call <literal>Bootstrap.shutdown()</literal>. "
@@ -702,13 +629,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:431
 #, no-c-format
 msgid "Resource loading"
 msgstr "Carregando recursos"
 
 #. Tag: para
-#: ri-spi.xml:433
 #, no-c-format
 msgid ""
 "Weld needs to load classes and resources from the classpath at various "
@@ -719,13 +644,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:445
 #, no-c-format
 msgid "The contract with the container"
 msgstr "O contrato com o container"
 
 #. Tag: para
-#: ri-spi.xml:447
 #, no-c-format
 msgid ""
 "There are a number of requirements that Weld places on the container for "
@@ -733,13 +656,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:454
 #, no-c-format
 msgid "Classloader isolation"
 msgstr "Isolamento de Classloader (Classloader isolation)"
 
 #. Tag: para
-#: ri-spi.xml:458
 #, no-c-format
 msgid ""
 "If you are integrating Weld into an environment that supports deployment of "
@@ -748,13 +669,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:466
 #, no-c-format
 msgid "Servlet"
 msgstr "Servlet"
 
 #. Tag: para
-#: ri-spi.xml:470
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a Servlet environment you must register "
@@ -764,7 +683,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:475
 #, no-c-format
 msgid ""
 "You must ensure that that <literal>WeldListener.contextInitialized()</"
@@ -773,13 +691,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:482
 #, no-c-format
-msgid "<term>JSF</term>"
-msgstr "<term>JSF</term>"
+msgid "JSF"
+msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:487
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -787,7 +703,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:492
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -796,7 +711,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:497
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -805,7 +719,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:502
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -817,7 +730,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:509
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -827,7 +739,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:516 ri-spi.xml:562
 #, no-c-format
 msgid ""
 "There are a number of ways you can obtain the bean manager for the module. "
@@ -837,7 +748,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:523
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -848,19 +758,16 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:531
 #, no-c-format
 msgid "Weld only supports JSF 1.2 and above."
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:538
-#, fuzzy, no-c-format
-msgid "<term>JSP</term>"
-msgstr "<term>JSF</term>"
+#, no-c-format
+msgid "JSP"
+msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:543
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must register "
@@ -869,7 +776,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:548
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -880,7 +786,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:555
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -890,24 +795,23 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:572
 #, no-c-format
 msgid "Session Bean Interceptor"
 msgstr "Interceptador de Session Bean (Session Bean Interceptor)"
 
 #. Tag: para
-#: ri-spi.xml:576
 #, no-c-format
 msgid ""
-"If you are integrating Weld into an EJB environment you must register "
-"<literal>org.jboss.weld.ejb.SessionBeanInterceptor</literal> as a EJB "
-"interceptor for all EJBs in the application, either automatically, or "
-"through user configuration, for each CDI application which uses enterprise "
-"beans."
+"If you are integrating Weld into an EJB environment you must register the "
+"<literal>aroundInvoke</literal> method of <literal>org.jboss.weld.ejb."
+"SessionBeanInterceptor</literal> as a EJB around-invoke interceptor for all "
+"EJBs in the application, either automatically, or through user "
+"configuration, for each CDI application which uses enterprise beans. If you "
+"are running in a EJB 3.1 environment, you should register this as an around-"
+"timeout interceptor as well."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:583
 #, no-c-format
 msgid ""
 "You must register the <literal>SessionBeanInterceptor</literal> as the inner "
@@ -915,13 +819,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:591
 #, fuzzy, no-c-format
 msgid "The <literal>weld-core.jar</literal>"
 msgstr "A <literal>webbeans-core.jar</literal>"
 
 #. Tag: para
-#: ri-spi.xml:595
 #, no-c-format
 msgid ""
 "Weld can reside on an isolated classloader, or on a shared classloader. If "
@@ -933,7 +835,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:601
 #, no-c-format
 msgid ""
 "You can provide your own implementation of <literal>Singleton</literal> and "
@@ -942,7 +843,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:606
 #, no-c-format
 msgid ""
 "Weld also provides an implementation of Thread Context Classloader per "
@@ -950,13 +850,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:613
 #, no-c-format
 msgid "Binding the manager in JNDI"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:617
 #, no-c-format
 msgid ""
 "You should bind the bean manager for the bean deployment archive into JNDI "
@@ -967,13 +865,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:627
 #, no-c-format
 msgid "Performing CDI injection on Java EE component classes"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:631
 #, no-c-format
 msgid ""
 "The CDI specification requires the container to provide injection into non-"
@@ -985,7 +881,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:639
 #, no-c-format
 msgid ""
 "The CDI specification also requires that a <literal>ProcessInjectionTarget</"
@@ -996,7 +891,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:646
 #, no-c-format
 msgid ""
 "To help the integrator, Weld provides <literal>WeldManager."
@@ -1004,58 +898,7 @@
 "<literal>InjectionTarget</literal> to use."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:651
-#, no-c-format
-msgid ""
-"<![CDATA[// Fire ProcessInjectionTarget, returning the InjectionTarget\n"
-"// to use\n"
-"InjectionTarget it = weldBeanManager.fireProcessInjectionTarget(clazz);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = beanManager.createCreationalContext(null);\n"
-"\n"
-"// Produce the instance, performing any constructor injection required\n"
-"Object instance = it.produce();\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
-"<![CDATA[// Fire ProcessInjectionTarget, returning the InjectionTarget\n"
-"// to use\n"
-"InjectionTarget it = weldBeanManager.fireProcessInjectionTarget(clazz);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = beanManager.createCreationalContext(null);\n"
-"\n"
-"// Produce the instance, performing any constructor injection required\n"
-"Object instance = it.produce();\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-
 #. Tag: para
-#: ri-spi.xml:652
 #, no-c-format
 msgid ""
 "The container may intersperse other operations between these calls. Further, "
@@ -1064,7 +907,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:656
 #, no-c-format
 msgid ""
 "When performing injections on EJBs you must use the Weld-defined SPI, "
@@ -1073,73 +915,124 @@
 "EJB."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:661
-#, no-c-format
-msgid ""
-"<![CDATA[// Obtain the EjbDescriptor for the EJB\n"
-"// You may choose to use this utility method to get the descriptor\n"
-"EjbDescriptor<?> ejbDescriptor = beanManager.getEjbDescriptor(ejbName);\n"
-"\n"
-"// Get an the Bean object\n"
-"Bean<?> bean = beanManager.getBean(ejbDescriptor);\n"
-"\n"
-"// Create the injection target\n"
-"InjectionTarget it = deploymentBeanManager.createInjectionTarget"
-"(ejbDescriptor);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = deploymentBeanManager.createCreationalContext"
-"(bean);\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// You may choose to have CDI call the post construct and pre destroy\n"
-"// lifecycle callbacks\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
-"<![CDATA[// Obtain the EjbDescriptor for the EJB\n"
-"// You may choose to use this utility method to get the descriptor\n"
-"EjbDescriptor<?> ejbDescriptor = beanManager.getEjbDescriptor(ejbName);\n"
-"\n"
-"// Get an the Bean object\n"
-"Bean<?> bean = beanManager.getBean(ejbDescriptor);\n"
-"\n"
-"// Create the injection target\n"
-"InjectionTarget it = deploymentBeanManager.createInjectionTarget"
-"(ejbDescriptor);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = deploymentBeanManager.createCreationalContext"
-"(bean);\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// You may choose to have CDI call the post construct and pre destroy\n"
-"// lifecycle callbacks\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
+#~ msgid "<term>JSF</term>"
+#~ msgstr "<term>JSF</term>"
 
+#, fuzzy
+#~ msgid "<term>JSP</term>"
+#~ msgstr "<term>JSF</term>"
+
 #~ msgid ""
+#~ "<![CDATA[// Fire ProcessInjectionTarget, returning the InjectionTarget\n"
+#~ "// to use\n"
+#~ "InjectionTarget it = weldBeanManager.fireProcessInjectionTarget(clazz);\n"
+#~ "\n"
+#~ "// Per instance required, create the creational context\n"
+#~ "CreationalContext<?> cc = beanManager.createCreationalContext(null);\n"
+#~ "\n"
+#~ "// Produce the instance, performing any constructor injection required\n"
+#~ "Object instance = it.produce();\n"
+#~ "\n"
+#~ "// Perform injection and call initializers\n"
+#~ "it.inject(instance, cc);\n"
+#~ "\n"
+#~ "// Call the post-construct callback\n"
+#~ "it.postConstruct(instance);\n"
+#~ "\n"
+#~ "// Call the pre-destroy callback\n"
+#~ "it.preDestroy(instance);\n"
+#~ "\n"
+#~ "// Clean up the instance\n"
+#~ "it.dispose();\n"
+#~ "cc.release();]]>"
+#~ msgstr ""
+#~ "<![CDATA[// Fire ProcessInjectionTarget, returning the InjectionTarget\n"
+#~ "// to use\n"
+#~ "InjectionTarget it = weldBeanManager.fireProcessInjectionTarget(clazz);\n"
+#~ "\n"
+#~ "// Per instance required, create the creational context\n"
+#~ "CreationalContext<?> cc = beanManager.createCreationalContext(null);\n"
+#~ "\n"
+#~ "// Produce the instance, performing any constructor injection required\n"
+#~ "Object instance = it.produce();\n"
+#~ "\n"
+#~ "// Perform injection and call initializers\n"
+#~ "it.inject(instance, cc);\n"
+#~ "\n"
+#~ "// Call the post-construct callback\n"
+#~ "it.postConstruct(instance);\n"
+#~ "\n"
+#~ "// Call the pre-destroy callback\n"
+#~ "it.preDestroy(instance);\n"
+#~ "\n"
+#~ "// Clean up the instance\n"
+#~ "it.dispose();\n"
+#~ "cc.release();]]>"
+
+#~ msgid ""
+#~ "<![CDATA[// Obtain the EjbDescriptor for the EJB\n"
+#~ "// You may choose to use this utility method to get the descriptor\n"
+#~ "EjbDescriptor<?> ejbDescriptor = beanManager.getEjbDescriptor(ejbName);\n"
+#~ "\n"
+#~ "// Get an the Bean object\n"
+#~ "Bean<?> bean = beanManager.getBean(ejbDescriptor);\n"
+#~ "\n"
+#~ "// Create the injection target\n"
+#~ "InjectionTarget it = deploymentBeanManager.createInjectionTarget"
+#~ "(ejbDescriptor);\n"
+#~ "\n"
+#~ "// Per instance required, create the creational context\n"
+#~ "CreationalContext<?> cc = deploymentBeanManager.createCreationalContext"
+#~ "(bean);\n"
+#~ "\n"
+#~ "// Perform injection and call initializers\n"
+#~ "it.inject(instance, cc);\n"
+#~ "\n"
+#~ "// You may choose to have CDI call the post construct and pre destroy\n"
+#~ "// lifecycle callbacks\n"
+#~ "\n"
+#~ "// Call the post-construct callback\n"
+#~ "it.postConstruct(instance);\n"
+#~ "\n"
+#~ "// Call the pre-destroy callback\n"
+#~ "it.preDestroy(instance);\n"
+#~ "\n"
+#~ "// Clean up the instance\n"
+#~ "it.dispose();\n"
+#~ "cc.release();]]>"
+#~ msgstr ""
+#~ "<![CDATA[// Obtain the EjbDescriptor for the EJB\n"
+#~ "// You may choose to use this utility method to get the descriptor\n"
+#~ "EjbDescriptor<?> ejbDescriptor = beanManager.getEjbDescriptor(ejbName);\n"
+#~ "\n"
+#~ "// Get an the Bean object\n"
+#~ "Bean<?> bean = beanManager.getBean(ejbDescriptor);\n"
+#~ "\n"
+#~ "// Create the injection target\n"
+#~ "InjectionTarget it = deploymentBeanManager.createInjectionTarget"
+#~ "(ejbDescriptor);\n"
+#~ "\n"
+#~ "// Per instance required, create the creational context\n"
+#~ "CreationalContext<?> cc = deploymentBeanManager.createCreationalContext"
+#~ "(bean);\n"
+#~ "\n"
+#~ "// Perform injection and call initializers\n"
+#~ "it.inject(instance, cc);\n"
+#~ "\n"
+#~ "// You may choose to have CDI call the post construct and pre destroy\n"
+#~ "// lifecycle callbacks\n"
+#~ "\n"
+#~ "// Call the post-construct callback\n"
+#~ "it.postConstruct(instance);\n"
+#~ "\n"
+#~ "// Call the pre-destroy callback\n"
+#~ "it.preDestroy(instance);\n"
+#~ "\n"
+#~ "// Clean up the instance\n"
+#~ "it.dispose();\n"
+#~ "cc.release();]]>"
+
+#~ msgid ""
 #~ "Currently Web Beans only runs in JBoss AS 5; integrating the RI into "
 #~ "other EE environments (for example another application server like "
 #~ "Glassfish), into a servlet container (like Tomcat), or with an Embedded "

Modified: doc/trunk/reference/pt-BR/scopescontexts.po
===================================================================
--- doc/trunk/reference/pt-BR/scopescontexts.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/scopescontexts.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2010-01-19 13:48-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: scopescontexts.xml:5
 #, no-c-format
 msgid "Scopes and contexts"
 msgstr "Escopos e contextos"
 
 #. Tag: para
-#: scopescontexts.xml:7
 #, no-c-format
 msgid ""
 "So far, we've seen a few examples of <emphasis>scope type annotations</"
@@ -34,20 +32,17 @@
 "do bean. De acordo com a  especificação CDI, um escopo determina:"
 
 #. Tag: para
-#: scopescontexts.xml:16
 #, no-c-format
 msgid "When a new instance of any bean with that scope is created"
 msgstr "Quando uma nova instância de qualquer bean com esse escopo é criada"
 
 #. Tag: para
-#: scopescontexts.xml:19
 #, no-c-format
 msgid "When an existing instance of any bean with that scope is destroyed"
 msgstr ""
 "Quando uma instância existente de qualquer bean com esse escopo é destruída"
 
 #. Tag: para
-#: scopescontexts.xml:22
 #, no-c-format
 msgid ""
 "Which injected references refer to any instance of a bean with that scope"
@@ -56,7 +51,6 @@
 "esse escopo"
 
 #. Tag: para
-#: scopescontexts.xml:27
 #, no-c-format
 msgid ""
 "For example, if we have a session-scoped bean, <literal>CurrentUser</"
@@ -74,7 +68,6 @@
 "sessão, e será automaticamente destruída quando a sessão terminar."
 
 #. Tag: para
-#: scopescontexts.xml:35
 #, no-c-format
 msgid ""
 "JPA entities aren't a great fit for this model. Entities have their whole "
@@ -94,13 +87,11 @@
 "passar uma instância injetada para o <literal>EntityManager</literal> do JPA."
 
 #. Tag: title
-#: scopescontexts.xml:45
 #, no-c-format
 msgid "Scope types"
 msgstr "Tipos de escopo"
 
 #. Tag: para
-#: scopescontexts.xml:47
 #, no-c-format
 msgid ""
 "CDI features an <emphasis>extensible context model</emphasis>. It's possible "
@@ -109,22 +100,7 @@
 "CDI possui um <emphasis>modelo extensível de contexto</emphasis>. É possível "
 "definir novos escopos, criando uma nova anotação de tipo de escopo:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:52
-#, no-c-format
-msgid ""
-"<![CDATA[@ScopeType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"public @interface ClusterScoped {}]]>"
-msgstr ""
-"<![CDATA[@ScopeType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"public @interface ClusterScoped {}]]>"
-
 #. Tag: para
-#: scopescontexts.xml:54
 #, no-c-format
 msgid ""
 "Of course, that's the easy part of the job. For this scope type to be "
@@ -142,7 +118,6 @@
 "exemplo, em uma versão futura do Seam."
 
 #. Tag: para
-#: scopescontexts.xml:61
 #, no-c-format
 msgid ""
 "We can apply a scope type annotation to a bean implementation class to "
@@ -151,66 +126,47 @@
 "Podemos aplicar uma anotação de tipo de escopo a uma classe de implementação "
 "de um bean para especificar o escopo do bean:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-msgstr ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:67
 #, no-c-format
 msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr "Normalmente, você usará um dos escopos pré-definidos do CDI."
 
 #. Tag: title
-#: scopescontexts.xml:72
 #, no-c-format
 msgid "Built-in scopes"
 msgstr "Escopos pré-definidos"
 
 #. Tag: para
-#: scopescontexts.xml:74
 #, no-c-format
 msgid "CDI defines four built-in scopes:"
 msgstr "CDI possui quatro escopos pré-definidos:"
 
-#. Tag: literal
-#: scopescontexts.xml:78
-#, no-c-format
-msgid "@RequestScoped"
-msgstr "@RequestScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@RequestScoped</literal>"
+msgstr "O qualificador <literal>@New</literal>"
 
-#. Tag: literal
-#: scopescontexts.xml:81
-#, no-c-format
-msgid "@SessionScoped"
-msgstr "@SessionScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@SessionScoped</literal>"
+msgstr "O qualificador <literal>@New</literal>"
 
-#. Tag: literal
-#: scopescontexts.xml:84
-#, no-c-format
-msgid "@ApplicationScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@ApplicationScoped</literal>"
 msgstr "@ApplicationScoped"
 
-#. Tag: literal
-#: scopescontexts.xml:87
-#, no-c-format
-msgid "@ConversationScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@ConversationScoped</literal>"
 msgstr "@ConversationScoped"
 
 #. Tag: para
-#: scopescontexts.xml:91
 #, no-c-format
 msgid "For a web application that uses CDI:"
 msgstr "Para uma aplicação web que utiliza CDI:"
 
 #. Tag: para
-#: scopescontexts.xml:95
 #, no-c-format
 msgid ""
 "any servlet request has access to active request, session and application "
@@ -220,13 +176,11 @@
 "aplicação ativos, e, adicionalmente"
 
 #. Tag: para
-#: scopescontexts.xml:100
 #, no-c-format
 msgid "any JSF request has access to an active conversation scope."
 msgstr "qualquer requisição JSF tem acesso ao escopo de conversação ativo."
 
 #. Tag: para
-#: scopescontexts.xml:105
 #, no-c-format
 msgid ""
 "A CDI extension can implement support for the conversation scope in other "
@@ -236,50 +190,42 @@
 "em outros frameworks web."
 
 #. Tag: para
-#: scopescontexts.xml:108
 #, no-c-format
 msgid "The request and application scopes are also active:"
 msgstr "Os escopos de solicitação e aplicação também estão disponíveis:"
 
 #. Tag: para
-#: scopescontexts.xml:112
 #, no-c-format
 msgid "during invocations of EJB remote methods,"
 msgstr "durante invocações de métodos remotos de EJB,"
 
 #. Tag: para
-#: scopescontexts.xml:115
 #, no-c-format
 msgid "during invocations of EJB asynchronous methods,"
 msgstr "durante invocações de métodos assíncronos de EJB,"
 
 #. Tag: para
-#: scopescontexts.xml:118
 #, no-c-format
 msgid "during EJB timeouts,"
 msgstr "durante timeouts de EJB,"
 
 #. Tag: para
-#: scopescontexts.xml:121
 #, no-c-format
 msgid "during message delivery to a message-driven bean,"
 msgstr "durante a entrega de mensagem a um message-driven bean,"
 
 #. Tag: para
-#: scopescontexts.xml:124
 #, no-c-format
 msgid "during message delivery to a <literal>MessageListener</literal>, and"
 msgstr ""
 "durante a entrega de mensagem a um <literal>MessageListener</literal>, e"
 
 #. Tag: para
-#: scopescontexts.xml:127
 #, no-c-format
 msgid "during web service invocations."
 msgstr "durante a invocação de um web service"
 
 #. Tag: para
-#: scopescontexts.xml:131
 #, no-c-format
 msgid ""
 "If the application tries to invoke a bean with a scope that does not have an "
@@ -291,7 +237,6 @@
 "pelo contêiner em tempo de execução."
 
 #. Tag: para
-#: scopescontexts.xml:136
 #, no-c-format
 msgid ""
 "Managed beans with scope <literal>@SessionScoped</literal> or "
@@ -303,7 +248,6 @@
 "o contêiner mantém a sessão HTTP resguardada ao longo do tempo."
 
 #. Tag: para
-#: scopescontexts.xml:141
 #, no-c-format
 msgid ""
 "Three of the four built-in scopes should be extremely familiar to every Java "
@@ -315,13 +259,11 @@
 "aqui. No entanto, um dos escopos é novo."
 
 #. Tag: title
-#: scopescontexts.xml:149
 #, no-c-format
 msgid "The conversation scope"
 msgstr "O escopo de conversação"
 
 #. Tag: para
-#: scopescontexts.xml:151
 #, no-c-format
 msgid ""
 "The conversation scope is a bit like the traditional session scope in that "
@@ -335,13 +277,11 @@
 "escopo de sessão, o escopo de conversação:"
 
 #. Tag: para
-#: scopescontexts.xml:159
 #, no-c-format
 msgid "is demarcated explicitly by the application, and"
 msgstr "é demarcado explicitamente pela aplicação, e"
 
 #. Tag: para
-#: scopescontexts.xml:162
 #, no-c-format
 msgid ""
 "holds state associated with a particular web browser tab in a JSF "
@@ -354,13 +294,12 @@
 "caso para o escopo de sessão)."
 
 #. Tag: para
-#: scopescontexts.xml:169
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A conversation represents a task&#8212;a unit of work from the point of view "
-"of the user. The conversation context holds state associated with what the "
-"user is currently working on. If the user is doing multiple things at the "
-"same time, there are multiple conversations."
+"A conversation represents a task—a unit of work from the point of view of "
+"the user. The conversation context holds state associated with what the user "
+"is currently working on. If the user is doing multiple things at the same "
+"time, there are multiple conversations."
 msgstr ""
 "Uma conversação representa uma tarefa&#8212;uma unidade de trabalho do ponto-"
 "de-vista do usuário. O contexto de conversação mantém o estado associado com "
@@ -368,7 +307,6 @@
 "várias coisas ao mesmo tempo, existirão várias conversações."
 
 #. Tag: para
-#: scopescontexts.xml:175
 #, no-c-format
 msgid ""
 "The conversation context is active during any JSF request. Most "
@@ -383,13 +321,11 @@
 "emphasis>."
 
 #. Tag: title
-#: scopescontexts.xml:182
 #, no-c-format
 msgid "Conversation demarcation"
 msgstr "Demarcação de contexto"
 
 #. Tag: para
-#: scopescontexts.xml:184
 #, no-c-format
 msgid ""
 "CDI provides a built-in bean for controlling the lifecycle of conversations "
@@ -398,14 +334,7 @@
 "CDI oferece um bean pré-definido para o controle do ciclo de vida das "
 "conversações em uma aplicação JSF. Esse bean pode ser obtido por injeção:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:189
-#, no-c-format
-msgid "@Inject Conversation conversation;"
-msgstr "@Inject Conversation conversation;"
-
 #. Tag: para
-#: scopescontexts.xml:191
 #, no-c-format
 msgid ""
 "To promote the conversation associated with the current request to a long-"
@@ -421,7 +350,6 @@
 "()</literal>."
 
 #. Tag: para
-#: scopescontexts.xml:197
 #, no-c-format
 msgid ""
 "In the following example, a conversation-scoped bean controls the "
@@ -430,70 +358,7 @@
 "No exemplo a seguir, um bean com escopo de conversação controla a "
 "conversação na qual estiver associado:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:201
-#, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"   private Order order;\n"
-"   private @Inject Conversation conversation;\n"
-"   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
-"   \n"
-"   @Produces public Order getOrder() {\n"
-"      return order;\n"
-"   }\n"
-"\n"
-"   public Order createOrder() {\n"
-"      order = new Order();\n"
-"      conversation.begin();\n"
-"      return order;\n"
-"   }\n"
-"   \n"
-"   public void addLineItem(Product product, int quantity) {\n"
-"      order.add(new LineItem(product, quantity));\n"
-"   }\n"
-"\n"
-"   public void saveOrder(Order order) {\n"
-"      em.persist(order);\n"
-"      conversation.end();\n"
-"   }\n"
-"   \n"
-"   @Remove\n"
-"   public void destroy() {}\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"   private Order order;\n"
-"   private @Inject Conversation conversation;\n"
-"   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
-"   \n"
-"   @Produces public Order getOrder() {\n"
-"      return order;\n"
-"   }\n"
-"\n"
-"   public Order createOrder() {\n"
-"      order = new Order();\n"
-"      conversation.begin();\n"
-"      return order;\n"
-"   }\n"
-"   \n"
-"   public void addLineItem(Product product, int quantity) {\n"
-"      order.add(new LineItem(product, quantity));\n"
-"   }\n"
-"\n"
-"   public void saveOrder(Order order) {\n"
-"      em.persist(order);\n"
-"      conversation.end();\n"
-"   }\n"
-"   \n"
-"   @Remove\n"
-"   public void destroy() {}\n"
-"}]]>"
-
 #. Tag: para
-#: scopescontexts.xml:203
 #, no-c-format
 msgid ""
 "This bean is able to control its own lifecycle through use of the "
@@ -505,13 +370,11 @@
 "cliclo vida que depende totalmente de um outro objeto."
 
 #. Tag: title
-#: scopescontexts.xml:211
 #, no-c-format
 msgid "Conversation propagation"
 msgstr "Propagação de conversação"
 
 #. Tag: para
-#: scopescontexts.xml:213
 #, no-c-format
 msgid ""
 "The conversation context automatically propagates with any JSF faces request "
@@ -524,7 +387,6 @@
 "link."
 
 #. Tag: para
-#: scopescontexts.xml:218
 #, no-c-format
 msgid ""
 "We can force the conversation to propagate with a non-faces request by "
@@ -542,41 +404,16 @@
 "literal>, que possui o nome de bean <literal>conversation</literal> em EL."
 
 #. Tag: para
-#: scopescontexts.xml:225
 #, no-c-format
 msgid "Therefore, the following link propagates the conversation:"
 msgstr "Portanto, o seguinte link propaga a conversação:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:229
-#, no-c-format
-msgid ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-msgstr ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-
 #. Tag: para
-#: scopescontexts.xml:231
 #, no-c-format
 msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr "É provavelmente melhor usar um dos componentes de link em JSF 2:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:235
-#, no-c-format
-msgid ""
-"<![CDATA[<h:link outcome=\"/addProduct.xhtml value=\"Add Product\">\n"
-"   <f:param name=\"cid\" value=\"#{conversation.id}\"/>\n"
-"</h:link>]]>"
-msgstr ""
-"<![CDATA[<h:link outcome=\"/addProduct.xhtml value=\"Add Product\">\n"
-"   <f:param name=\"cid\" value=\"#{conversation.id}\"/>\n"
-"</h:link>]]>"
-
 #. Tag: para
-#: scopescontexts.xml:238
 #, no-c-format
 msgid ""
 "The conversation context propagates across redirects, making it very easy to "
@@ -591,21 +428,19 @@
 "parâmetro de solicitação."
 
 #. Tag: title
-#: scopescontexts.xml:248
 #, no-c-format
 msgid "Conversation timeout"
 msgstr "Tempo limite de conversação"
 
 #. Tag: para
-#: scopescontexts.xml:250
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The container is permitted to destroy a conversation and all state held in "
 "its context at any time in order to conserve resources. A CDI implementation "
-"will normally do this on the basis of some kind of timeout&#8212;though this "
-"is not required by the specification. The timeout is the period of "
-"inactivity before the conversation is destroyed (as opposed to the amount of "
-"time the conversation is active)."
+"will normally do this on the basis of some kind of timeout—though this is "
+"not required by the specification. The timeout is the period of inactivity "
+"before the conversation is destroyed (as opposed to the amount of time the "
+"conversation is active)."
 msgstr ""
 "O contêiner pode destruir uma conversação e todo estado mantido em seu "
 "contexto, a qualquer momento, a fim de preservar recursos. A implementação "
@@ -615,7 +450,6 @@
 "contraste com a quantidade de tempo que a conversação está ativa)."
 
 #. Tag: para
-#: scopescontexts.xml:257
 #, no-c-format
 msgid ""
 "The <literal>Conversation</literal> object provides a method to set the "
@@ -626,20 +460,12 @@
 "tempo limite (timeout). Essa é uma sugestão para o contêiner, que está livre "
 "para ignorar essa configuração."
 
-#. Tag: programlisting
-#: scopescontexts.xml:262
-#, no-c-format
-msgid "conversation.setTimeout(timeoutInMillis);"
-msgstr "conversation.setTimeout(timeoutInMillis);"
-
 #. Tag: title
-#: scopescontexts.xml:269
 #, no-c-format
 msgid "The singleton pseudo-scope"
 msgstr "O pseudo-escopo singleton"
 
 #. Tag: para
-#: scopescontexts.xml:271
 #, no-c-format
 msgid ""
 "In addition to the four built-in scopes, CDI also supports two "
@@ -653,7 +479,6 @@
 "<literal>@Singleton</literal>."
 
 #. Tag: para
-#: scopescontexts.xml:277
 #, no-c-format
 msgid ""
 "Unlike the other scopes, which belong to the package <literal>javax."
@@ -665,7 +490,6 @@
 "definida no pacote <literal>javax.inject</literal>."
 
 #. Tag: para
-#: scopescontexts.xml:283
 #, no-c-format
 msgid ""
 "You can guess what \"singleton\" means here. It means a bean that is "
@@ -690,7 +514,6 @@
 "sessão com estado."
 
 #. Tag: para
-#: scopescontexts.xml:292
 #, no-c-format
 msgid ""
 "Now, if the singleton instance is a simple, immutable, serializable object "
@@ -706,7 +529,6 @@
 "com o escopo padrão."
 
 #. Tag: para
-#: scopescontexts.xml:298
 #, no-c-format
 msgid ""
 "There are several ways to ensure that the singleton bean remains a singleton "
@@ -716,7 +538,6 @@
 "singleton quando seu cliente se torna serializável."
 
 #. Tag: para
-#: scopescontexts.xml:302
 #, no-c-format
 msgid ""
 "have the singleton bean implement <literal>writeResolve()</literal> and "
@@ -728,7 +549,6 @@
 "serialização Java),"
 
 #. Tag: para
-#: scopescontexts.xml:308
 #, no-c-format
 msgid ""
 "make sure the client keeps only a transient reference to the singleton bean, "
@@ -738,7 +558,6 @@
 "bean singleton, ou"
 
 #. Tag: para
-#: scopescontexts.xml:313
 #, no-c-format
 msgid ""
 "give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
@@ -748,7 +567,6 @@
 "onde <literal>X</literal> é o tipo do bean singleton."
 
 #. Tag: para
-#: scopescontexts.xml:320
 #, no-c-format
 msgid ""
 "A fourth, better solution is to instead use <literal>@ApplicationScoped</"
@@ -760,13 +578,11 @@
 "os problemas de serialização."
 
 #. Tag: title
-#: scopescontexts.xml:326
 #, no-c-format
 msgid "The dependent pseudo-scope"
 msgstr "O pseudo-escopo dependente"
 
 #. Tag: para
-#: scopescontexts.xml:328
 #, no-c-format
 msgid ""
 "Finally, CDI features the so-called <emphasis>dependent pseudo-scope</"
@@ -778,21 +594,13 @@
 "explicitamente um tipo de escopo."
 
 #. Tag: para
-#: scopescontexts.xml:333
 #, no-c-format
 msgid ""
 "For example, this bean has the scope type <literal>@Dependent</literal>:"
 msgstr ""
 "Por exemplo, esse bean possui o tipo de escopo <literal>@Dependent</literal>:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:337
-#, no-c-format
-msgid "<![CDATA[public class Calculator { ... }]]>"
-msgstr "<![CDATA[public class Calculator { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:339
 #, no-c-format
 msgid ""
 "An instance of a dependent bean is never shared between different clients or "
@@ -808,7 +616,6 @@
 "o objeto a que ele pertence é destruído."
 
 #. Tag: para
-#: scopescontexts.xml:345
 #, no-c-format
 msgid ""
 "If a Unified EL expression refers to a dependent bean by EL name, an "
@@ -820,7 +627,6 @@
 "instância não é reutilizada durante qualquer outra avaliação de expressão."
 
 #. Tag: para
-#: scopescontexts.xml:351
 #, no-c-format
 msgid ""
 "If you need to access a bean directly by EL name in a JSF page, you probably "
@@ -845,7 +651,6 @@
 "exponha-o em EL por meio de um método getter."
 
 #. Tag: para
-#: scopescontexts.xml:361
 #, no-c-format
 msgid ""
 "Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
@@ -855,7 +660,6 @@
 "de proxy. O cliente mantém uma referência direta para sua instância."
 
 #. Tag: para
-#: scopescontexts.xml:366
 #, no-c-format
 msgid ""
 "CDI makes it easy to obtain a dependent instance of a bean, even if the bean "
@@ -865,13 +669,11 @@
 "o bean já tiver declarado como um bean com algum outro tipo de escopo."
 
 #. Tag: title
-#: scopescontexts.xml:374
 #, no-c-format
 msgid "The <literal>@New</literal> qualifier"
 msgstr "O qualificador <literal>@New</literal>"
 
 #. Tag: para
-#: scopescontexts.xml:376
 #, no-c-format
 msgid ""
 "The built-in qualifier <literal>@New</literal> allows us to obtain a "
@@ -880,14 +682,7 @@
 "O qualificador pré-definido <literal>@New</literal> nos permite obter um "
 "objeto dependente de uma classe especificada."
 
-#. Tag: programlisting
-#: scopescontexts.xml:380
-#, no-c-format
-msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
-msgstr "<![CDATA[@Inject @New Calculator calculator;]]>"
-
 #. Tag: para
-#: scopescontexts.xml:382
 #, no-c-format
 msgid ""
 "The class must be a valid managed bean or session bean, but need not be an "
@@ -897,7 +692,6 @@
 "ser um bean habilitado."
 
 #. Tag: para
-#: scopescontexts.xml:384
 #, no-c-format
 msgid ""
 "This works even if <literal>Calculator</literal> is <emphasis>already</"
@@ -906,18 +700,7 @@
 "Isso funciona mesmo se <literal>Calculator</literal> <emphasis>já</emphasis> "
 "estiver declarado com um tipo de escopo diferente, por exemplo:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-msgstr ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:391
 #, no-c-format
 msgid ""
 "So the following injected attributes each get a different instance of "
@@ -926,22 +709,7 @@
 "Portanto, os seguintes atributos injetados obtêm uma instância diferente de "
 "<literal>Calculator</literal>:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:395
-#, no-c-format
-msgid ""
-"<![CDATA[public class PaymentCalc {\n"
-"   @Inject Calculator calculator;\n"
-"   @Inject @New Calculator newCalculator;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class PaymentCalc {\n"
-"   @Inject Calculator calculator;\n"
-"   @Inject @New Calculator newCalculator;\n"
-"}]]>"
-
 #. Tag: para
-#: scopescontexts.xml:397
 #, no-c-format
 msgid ""
 "The <literal>calculator</literal> field has a conversation-scoped instance "
@@ -956,7 +724,6 @@
 "<literal>PaymentCalc</literal>."
 
 #. Tag: para
-#: scopescontexts.xml:403
 #, no-c-format
 msgid ""
 "This feature is particularly useful with producer methods, as we'll see in "
@@ -964,3 +731,132 @@
 msgstr ""
 "Essa funcionalidade é particularmente útil em métodos produtores, como "
 "poderemos verificar no próximo capítulo."
+
+#~ msgid ""
+#~ "<![CDATA[@ScopeType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD})\n"
+#~ "public @interface ClusterScoped {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ScopeType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD})\n"
+#~ "public @interface ClusterScoped {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ClusterScoped\n"
+#~ "public class SecondLevelCache { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ClusterScoped\n"
+#~ "public class SecondLevelCache { ... }]]>"
+
+#~ msgid "@RequestScoped"
+#~ msgstr "@RequestScoped"
+
+#~ msgid "@SessionScoped"
+#~ msgstr "@SessionScoped"
+
+#~ msgid "@Inject Conversation conversation;"
+#~ msgstr "@Inject Conversation conversation;"
+
+#~ msgid ""
+#~ "<![CDATA[@ConversationScoped @Stateful\n"
+#~ "public class OrderBuilder {\n"
+#~ "   private Order order;\n"
+#~ "   private @Inject Conversation conversation;\n"
+#~ "   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
+#~ "   \n"
+#~ "   @Produces public Order getOrder() {\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public Order createOrder() {\n"
+#~ "      order = new Order();\n"
+#~ "      conversation.begin();\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void addLineItem(Product product, int quantity) {\n"
+#~ "      order.add(new LineItem(product, quantity));\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public void saveOrder(Order order) {\n"
+#~ "      em.persist(order);\n"
+#~ "      conversation.end();\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Remove\n"
+#~ "   public void destroy() {}\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ConversationScoped @Stateful\n"
+#~ "public class OrderBuilder {\n"
+#~ "   private Order order;\n"
+#~ "   private @Inject Conversation conversation;\n"
+#~ "   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
+#~ "   \n"
+#~ "   @Produces public Order getOrder() {\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public Order createOrder() {\n"
+#~ "      order = new Order();\n"
+#~ "      conversation.begin();\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void addLineItem(Product product, int quantity) {\n"
+#~ "      order.add(new LineItem(product, quantity));\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public void saveOrder(Order order) {\n"
+#~ "      em.persist(order);\n"
+#~ "      conversation.end();\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Remove\n"
+#~ "   public void destroy() {}\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</"
+#~ "a>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</"
+#~ "a>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<h:link outcome=\"/addProduct.xhtml value=\"Add Product\">\n"
+#~ "   <f:param name=\"cid\" value=\"#{conversation.id}\"/>\n"
+#~ "</h:link>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<h:link outcome=\"/addProduct.xhtml value=\"Add Product\">\n"
+#~ "   <f:param name=\"cid\" value=\"#{conversation.id}\"/>\n"
+#~ "</h:link>]]>"
+
+#~ msgid "conversation.setTimeout(timeoutInMillis);"
+#~ msgstr "conversation.setTimeout(timeoutInMillis);"
+
+#~ msgid "<![CDATA[public class Calculator { ... }]]>"
+#~ msgstr "<![CDATA[public class Calculator { ... }]]>"
+
+#~ msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
+#~ msgstr "<![CDATA[@Inject @New Calculator calculator;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ConversationScoped\n"
+#~ "public class Calculator { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ConversationScoped\n"
+#~ "public class Calculator { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class PaymentCalc {\n"
+#~ "   @Inject Calculator calculator;\n"
+#~ "   @Inject @New Calculator newCalculator;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class PaymentCalc {\n"
+#~ "   @Inject Calculator calculator;\n"
+#~ "   @Inject @New Calculator newCalculator;\n"
+#~ "}]]>"

Modified: doc/trunk/reference/pt-BR/specialization.po
===================================================================
--- doc/trunk/reference/pt-BR/specialization.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/specialization.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-12-19 18:08-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,342 +14,388 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: specialization.xml:5
 #, no-c-format
 msgid "Specialization, inheritance and alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:7
 #, no-c-format
-msgid "When you first start developing with CDI, you'll likely be dealing only with a single bean implementation for each bean type. In this case, it's easy to understand how beans get selected for injection. As the complexity of your application grows, multiple occurrences of the same bean type start appearing, either because you have multiple implementations or two beans share a common (Java) inheritance. That's when you have to begin studying the specialization, inheritance and alternative rules to work through unsatisfied or ambiguous dependencies or to avoid certain beans from being called."
+msgid ""
+"When you first start developing with CDI, you'll likely be dealing only with "
+"a single bean implementation for each bean type. In this case, it's easy to "
+"understand how beans get selected for injection. As the complexity of your "
+"application grows, multiple occurrences of the same bean type start "
+"appearing, either because you have multiple implementations or two beans "
+"share a common (Java) inheritance. That's when you have to begin studying "
+"the specialization, inheritance and alternative rules to work through "
+"unsatisfied or ambiguous dependencies or to avoid certain beans from being "
+"called."
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:16
 #, no-c-format
-msgid "The CDI specification recognizes two distinct scenarios in which one bean extends another:"
+msgid ""
+"The CDI specification recognizes two distinct scenarios in which one bean "
+"extends another:"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:23
 #, no-c-format
-msgid "The second bean <emphasis>specializes</emphasis> the first bean in certain deployment scenarios. In these deployments, the second bean completely replaces the first, fulfilling the same role in the system."
+msgid ""
+"The second bean <emphasis>specializes</emphasis> the first bean in certain "
+"deployment scenarios. In these deployments, the second bean completely "
+"replaces the first, fulfilling the same role in the system."
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:29
 #, no-c-format
-msgid "The second bean is simply reusing the Java implementation, and otherwise bears no relation to the first bean. The first bean may not even have been designed for use as a contextual object."
+msgid ""
+"The second bean is simply reusing the Java implementation, and otherwise "
+"bears no relation to the first bean. The first bean may not even have been "
+"designed for use as a contextual object."
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:37
 #, no-c-format
-msgid "The second case is the default assumed by CDI. It's possible to have two beans in the system with the same part bean type (interface or parent class). As you've learned, you select between the two implementations using qualifiers."
+msgid ""
+"The second case is the default assumed by CDI. It's possible to have two "
+"beans in the system with the same part bean type (interface or parent "
+"class). As you've learned, you select between the two implementations using "
+"qualifiers."
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:43
 #, no-c-format
-msgid "The first case is the exception, and also requires more care. In any given deployment, only one bean can fulfill a given role at a time. That means one bean needs to be enabled and the other disabled. There are a two modifiers involved: <literal>@Alternative</literal> and <literal>@Specializes</literal>. We'll start by looking at alternatives and then show the guarantees that specialization adds."
+msgid ""
+"The first case is the exception, and also requires more care. In any given "
+"deployment, only one bean can fulfill a given role at a time. That means one "
+"bean needs to be enabled and the other disabled. There are a two modifiers "
+"involved: <literal>@Alternative</literal> and <literal>@Specializes</"
+"literal>. We'll start by looking at alternatives and then show the "
+"guarantees that specialization adds."
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:51
 #, no-c-format
 msgid "Using alternative stereotypes"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:53
 #, fuzzy, no-c-format
-msgid "CDI lets you <emphasis>override</emphasis> the implementation of a bean type at deployment time using an alternative. For example, the following bean provides a default implementation of the <literal>PaymentProcessor</literal> interface:"
-msgstr "Nós já vimos a forma como o modelo de injeção de dependências da Web Beans permite  <emphasis>sobrescrever</emphasis> a implementação da API em tempo de implantação. Por exemplo, o seguinte Bean Web corporativo fornece uma implementação da API <literal>PaymentProcessor</literal> em produção:"
-
-#. Tag: programlisting
-#: specialization.xml:59
-#, no-c-format
 msgid ""
-"<![CDATA[public class DefaultPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
+"CDI lets you <emphasis>override</emphasis> the implementation of a bean type "
+"at deployment time using an alternative. For example, the following bean "
+"provides a default implementation of the <literal>PaymentProcessor</literal> "
+"interface:"
 msgstr ""
-"<![CDATA[public class DefaultPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
+"Nós já vimos a forma como o modelo de injeção de dependências da Web Beans "
+"permite  <emphasis>sobrescrever</emphasis> a implementação da API em tempo "
+"de implantação. Por exemplo, o seguinte Bean Web corporativo fornece uma "
+"implementação da API <literal>PaymentProcessor</literal> em produção:"
 
 #. Tag: para
-#: specialization.xml:61
 #, fuzzy, no-c-format
-msgid "But in our staging environment, we don't really want to submit payments to the external system, so we override that implementation of <literal>PaymentProcessor</literal> with a different bean:"
-msgstr "Mas, no nosso ambiente simulado, nos sobrepomos a implementação de <literal>PaymentProcessor</literal> com um Web Bean diferente:"
-
-#. Tag: programlisting
-#: specialization.xml:66
-#, no-c-format
 msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
+"But in our staging environment, we don't really want to submit payments to "
+"the external system, so we override that implementation of "
+"<literal>PaymentProcessor</literal> with a different bean:"
 msgstr ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
+"Mas, no nosso ambiente simulado, nos sobrepomos a implementação de "
+"<literal>PaymentProcessor</literal> com um Web Bean diferente:"
 
 #. Tag: para
-#: specialization.xml:68
 #, no-c-format
-msgid "<para>or</para>"
+msgid "or"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:70
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      extends DefaultPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
+"We've already seen how we can enable this alternative by listing its class "
+"in the <literal>beans.xml</literal> descriptor."
 msgstr ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      extends DefaultPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
 
 #. Tag: para
-#: specialization.xml:72
 #, no-c-format
-msgid "We've already seen how we can enable this alternative by listing its class in the <literal>beans.xml</literal> descriptor."
+msgid ""
+"But suppose we have many alternatives in the staging environment. It would "
+"be much more convenient to be able to enable them all at once. So let's make "
+"<literal>@Staging</literal> an <literal>@Alternative</literal> stereotype "
+"and annotate the staging beans with this stereotype instead. You'll see how "
+"this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:77
 #, no-c-format
-msgid "But suppose we have many alternatives in the staging environment. It would be much more convenient to be able to enable them all at once. So let's make <literal>@Staging</literal> an <literal>@Alternative</literal> stereotype and annotate the staging beans with this stereotype instead. You'll see how this level of indirection pays off. First, we create the stereotype:"
-msgstr ""
-
-#. Tag: programlisting
-#: specialization.xml:84
-#, no-c-format
 msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Staging {}]]>"
+"Then we replace the <literal>@Alternative</literal> annotation on our bean "
+"with <literal>@Staging</literal>:"
 msgstr ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Staging {}]]>"
 
 #. Tag: para
-#: specialization.xml:86
 #, no-c-format
-msgid "Then we replace the <literal>@Alternative</literal> annotation on our bean with <literal>@Staging</literal>:"
-msgstr ""
-
-#. Tag: programlisting
-#: specialization.xml:90
-#, no-c-format
 msgid ""
-"<![CDATA[@Staging\n"
-"public class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
+"Finally, we activate the <literal>@Staging</literal> stereotype in the "
+"<literal>beans.xml</literal> descriptor:"
 msgstr ""
-"<![CDATA[@Staging\n"
-"public class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
 
 #. Tag: para
-#: specialization.xml:92
 #, no-c-format
-msgid "Finally, we activate the <literal>@Staging</literal> stereotype in the <literal>beans.xml</literal> descriptor:"
-msgstr ""
-
-#. Tag: programlisting
-#: specialization.xml:96
-#, no-c-format
 msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <stereotype>org.mycompany.myapp.Staging</stereotype>\n"
-"   </alternatives>\n"
-"</beans>]]>"
+"Now, no matter how many staging beans we have, they will all be enabled at "
+"once."
 msgstr ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <stereotype>org.mycompany.myapp.Staging</stereotype>\n"
-"   </alternatives>\n"
-"</beans>]]>"
 
-#. Tag: para
-#: specialization.xml:98
-#, no-c-format
-msgid "Now, no matter how many staging beans we have, they will all be enabled at once."
-msgstr ""
-
 #. Tag: title
-#: specialization.xml:105
 #, no-c-format
 msgid "A minor problem with alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:107
 #, no-c-format
-msgid "When we enable an alternative, does that mean the default implementation is disabled? Well, not exactly. If the default implementation has a qualifier, for instance <literal>@LargeTransaction</literal>, and the alternative does not, you could still inject the default implementation."
+msgid ""
+"When we enable an alternative, does that mean the default implementation is "
+"disabled? Well, not exactly. If the default implementation has a qualifier, "
+"for instance <literal>@LargeTransaction</literal>, and the alternative does "
+"not, you could still inject the default implementation."
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:113
-#, no-c-format
-msgid "<![CDATA[@Inject @LargeTransaction PaymentProcessor paymentProcessor;]]>"
-msgstr "<![CDATA[@Inject @LargeTransaction PaymentProcessor paymentProcessor;]]>"
-
 #. Tag: para
-#: specialization.xml:115
 #, no-c-format
-msgid "So we haven't completely replaced the default implementation in this deployment of the system. The only way one bean can completely override a second bean at all injection points is if it implements all the bean types and declares all the qualifiers of the second bean. However, if the second bean declares a producer method or observer method, then even this is not enough to ensure that the second bean is never called! We need something extra."
+msgid ""
+"So we haven't completely replaced the default implementation in this "
+"deployment of the system. The only way one bean can completely override a "
+"second bean at all injection points is if it implements all the bean types "
+"and declares all the qualifiers of the second bean. However, if the second "
+"bean declares a producer method or observer method, then even this is not "
+"enough to ensure that the second bean is never called! We need something "
+"extra."
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:123
 #, no-c-format
-msgid "CDI provides a special feature, called <emphasis>specialization</emphasis>, that helps the developer avoid these traps. Specialization is a way of informing the system of your intent to completely replace and disable an implementation of a bean."
+msgid ""
+"CDI provides a special feature, called <emphasis>specialization</emphasis>, "
+"that helps the developer avoid these traps. Specialization is a way of "
+"informing the system of your intent to completely replace and disable an "
+"implementation of a bean."
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:132
 #, no-c-format
 msgid "Using specialization"
 msgstr "Utilizando a especialização"
 
 #. Tag: para
-#: specialization.xml:134
 #, no-c-format
-msgid "When the goal is to replace one bean implementation with a second, to help prevent developer error, the first bean may:"
+msgid ""
+"When the goal is to replace one bean implementation with a second, to help "
+"prevent developer error, the first bean may:"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:141
 #, no-c-format
 msgid "directly extend the bean class of the second bean, or"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:146
 #, no-c-format
-msgid "directly override the producer method, in the case that the second bean is a producer method, and then"
+msgid ""
+"directly override the producer method, in the case that the second bean is a "
+"producer method, and then"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:152
 #, fuzzy, no-c-format
-msgid "explicitly declare that it <emphasis>specializes</emphasis> the second bean:"
-msgstr "Nós dizemos que a alta prioridade na Web Bean <emphasis>specializa</emphasis> sua superclasse."
-
-#. Tag: programlisting
-#: specialization.xml:154
-#, no-c-format
 msgid ""
-"<![CDATA[@Alternative @Specializes\n"
-"public class MockCreditCardPaymentProcessor \n"
-"      extends CreditCardPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
+"explicitly declare that it <emphasis>specializes</emphasis> the second bean:"
 msgstr ""
-"<![CDATA[@Alternative @Specializes\n"
-"public class MockCreditCardPaymentProcessor \n"
-"      extends CreditCardPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
+"Nós dizemos que a alta prioridade na Web Bean <emphasis>specializa</"
+"emphasis> sua superclasse."
 
 #. Tag: para
-#: specialization.xml:156
 #, no-c-format
-msgid "When an enabled bean specializes another bean, the other bean is never instantiated or called by the container. Even if the other bean defines a producer or observer method, the method will never be called."
+msgid ""
+"When an enabled bean specializes another bean, the other bean is never "
+"instantiated or called by the container. Even if the other bean defines a "
+"producer or observer method, the method will never be called."
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:161
 #, no-c-format
-msgid "So why does specialization work, and what does it have to do with inheritance?"
+msgid ""
+"So why does specialization work, and what does it have to do with "
+"inheritance?"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:165
 #, no-c-format
-msgid "Since we're informing the container that our alternative bean is meant to stand in as a replacement for the default implementation, the alternative implementation automatically inherits all qualifiers of the default implementation. Thus, in our example, <literal>MockCreditCardPaymentProcessor</literal> inherits the qualifiers <literal>@Default</literal> and <literal>@CreditCard</literal>."
+msgid ""
+"Since we're informing the container that our alternative bean is meant to "
+"stand in as a replacement for the default implementation, the alternative "
+"implementation automatically inherits all qualifiers of the default "
+"implementation. Thus, in our example, "
+"<literal>MockCreditCardPaymentProcessor</literal> inherits the qualifiers "
+"<literal>@Default</literal> and <literal>@CreditCard</literal>."
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:172
 #, no-c-format
-msgid "Furthermore, if the default implementation declares a bean EL name using <literal>@Named</literal>, the name is inherited by the specialized alternative bean."
+msgid ""
+"Furthermore, if the default implementation declares a bean EL name using "
+"<literal>@Named</literal>, the name is inherited by the specialized "
+"alternative bean."
 msgstr ""
 
+#~ msgid ""
+#~ "<![CDATA[public class DefaultPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DefaultPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      extends DefaultPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      extends DefaultPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Alternative\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Staging {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Alternative\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Staging {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Staging\n"
+#~ "public class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Staging\n"
+#~ "public class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<beans\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
+#~ "   <alternatives>\n"
+#~ "         <stereotype>org.mycompany.myapp.Staging</stereotype>\n"
+#~ "   </alternatives>\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<beans\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
+#~ "   <alternatives>\n"
+#~ "         <stereotype>org.mycompany.myapp.Staging</stereotype>\n"
+#~ "   </alternatives>\n"
+#~ "</beans>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Inject @LargeTransaction PaymentProcessor paymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Inject @LargeTransaction PaymentProcessor paymentProcessor;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Alternative @Specializes\n"
+#~ "public class MockCreditCardPaymentProcessor \n"
+#~ "      extends CreditCardPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Alternative @Specializes\n"
+#~ "public class MockCreditCardPaymentProcessor \n"
+#~ "      extends CreditCardPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+
 #~ msgid "Specialization"
 #~ msgstr "Especialização"
+
 #~ msgid "@CreditCard PaymentProcessor ccpp"
 #~ msgstr "@CreditCard PaymentProcessor ccpp"
+
 #~ msgid ""
 #~ "Would receive an instance of <literal>StagingCreditCardPaymentProcessor</"
 #~ "literal>."
 #~ msgstr ""
 #~ "Pode receber uma instância de <literal>StagingCreditCardPaymentProcessor</"
 #~ "literal>."
+
 #~ msgid "Unfortunately, there are several traps we can easily fall into:"
 #~ msgstr ""
 #~ "Infelizmente, existem várias armadilhas que facilmente podemos cair:"
+
 #~ msgid ""
 #~ "the higher-priority Web Bean may not implement all the API types of the "
 #~ "Web Bean that it attempts to override,"
 #~ msgstr ""
 #~ "o Web Bean de maior prioridade não pode implementar todos os tipos da API "
 #~ "do Web Bean que tenta sobrepor,"
+
 #~ msgid ""
 #~ "the higher-priority Web Bean may not declare all the binding types of the "
 #~ "Web Bean that it attempts to override,"
 #~ msgstr ""
 #~ "o Web Bean de maior prioridade não pode declarar todos os tipos de "
 #~ "binding do Web Bean que tenta sobrepor,"
+
 #~ msgid ""
 #~ "the higher-priority Web Bean might not have the same name as the Web Bean "
 #~ "that it attempts to override, or"
 #~ msgstr ""
 #~ "o Web Bean de maior prioridade talvez não tenha o mesmo nome que o Web "
 #~ "Bean que tenta sobrepor, ou"
+
 #~ msgid ""
 #~ "the Web Bean that it attempts to override might declare a producer "
 #~ "method, disposal method or observer method."
 #~ msgstr ""
 #~ "o Web Bean que tenta sobrepor poderia declarar um método produtor, método "
 #~ "de eliminação ou método observador."
+
 #~ msgid ""
 #~ "In each of these cases, the Web Bean that we tried to override could "
 #~ "still be called at runtime. Therefore, overriding is somewhat prone to "
@@ -358,6 +404,7 @@
 #~ "Em cada um destes casos, o Web Bean que tentamos sobrescrever ainda podia "
 #~ "ser chamado em tempo de execução. Portanto, a sobrescrita é algo propensa "
 #~ "a erros de desenvolvimento."
+
 #~ msgid ""
 #~ "Specialization is a feature that is specific to simple and enterprise Web "
 #~ "Beans. To make use of specialization, the higher-priority Web Bean must:"
@@ -365,8 +412,10 @@
 #~ "Especialização é uma característica que é específica de Web Beans simples "
 #~ "e enterprise. Para fazer uso da especialização, o Web Bean de maior "
 #~ "prioridade deve:"
+
 #~ msgid "be a direct subclass of the Web Bean it overrides, and"
 #~ msgstr "ser uma subclasse direta do Web Bean que sobrescreve, e"
+
 #~ msgid ""
 #~ "be a simple Web Bean if the Web Bean it overrides is a simple Web Bean or "
 #~ "an enterprise Web Bean if the Web Bean it overrides is an enterprise Web "
@@ -375,12 +424,16 @@
 #~ "ser um simples Web se o Web Bean que sobrepuser for um Web Bean simples "
 #~ "ou um Web Bean enterprise se o Web Bean que sobrepuser for um Web Bean "
 #~ "enterprise, e"
+
 #~ msgid "be annotated <literal>@Specializes</literal>."
 #~ msgstr "será anotada <literal>@Specializes</literal>."
+
 #~ msgid "Advantages of specialization"
 #~ msgstr "Vantagens da especialização"
+
 #~ msgid "When specialization is used:"
 #~ msgstr "Quando a especialização é utilizada:"
+
 #~ msgid ""
 #~ "producer methods, disposal methods and observer methods declared by the "
 #~ "superclass are called upon an instance of the Web Bean annotated "
@@ -389,6 +442,7 @@
 #~ "métodos produtores, métodos de eliminação e métodos observadores "
 #~ "declarados pela superclasse são chamados sobre uma instância do Web Bean "
 #~ "anotado com <literal>@Specializes</literal>."
+
 #~ msgid ""
 #~ "In our example, the binding type <literal>@CreditCard</literal> of "
 #~ "<literal>CreditCardPaymentProcessor</literal> is inherited by "
@@ -397,8 +451,10 @@
 #~ "Em nosso exemplo, o tipo de ligação (binding type) <literal>@CreditCard</"
 #~ "literal> do <literal>CreditCardPaymentProcessor</literal> é herdado por "
 #~ "<literal>StagingCreditCardPaymentProcessor</literal>."
+
 #~ msgid "Furthermore, the Web Bean manager will validate that:"
 #~ msgstr "Além disso, o gerenciador do Web Bean irá validar que:"
+
 #~ msgid ""
 #~ "the deployment type of the Web Bean annotated <literal>@Specializes</"
 #~ "literal> has a higher precedence than the deployment type of the "
@@ -407,13 +463,14 @@
 #~ "o tipo de implantação do Web Bean anotado com <literal>@Specializes</"
 #~ "literal> tem uma precedência maior do que o tipo de implantação da "
 #~ "superclasse, e"
+
 #~ msgid ""
 #~ "there is no other enabled Web Bean that also specializes the superclass."
 #~ msgstr "não há outro Web Bean ativado que também especializa a superclasse."
+
 #~ msgid ""
 #~ "If any of these conditions are violated, the Web Bean manager throws an "
 #~ "exception at initialization time."
 #~ msgstr ""
 #~ "Se qualquer uma dessas condições são violadas, o gerenciador do Web Bean "
 #~ "lança uma excepção em tempo de inicialização."
-

Modified: doc/trunk/reference/pt-BR/stereotypes.po
===================================================================
--- doc/trunk/reference/pt-BR/stereotypes.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/stereotypes.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-12-19 18:10-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,371 +14,383 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: stereotypes.xml:5
 #, no-c-format
 msgid "Stereotypes"
 msgstr "Estereótipos"
 
 #. Tag: para
-#: stereotypes.xml:7
 #, no-c-format
 msgid "The CDI specification defines a stereotype as follows:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:11
 #, fuzzy, no-c-format
-msgid "In many systems, use of architectural patterns produces a set of recurring bean roles. A stereotype allows a framework developer to identify such a role and declare some common metadata for beans with that role in a central place."
-msgstr "Em muitos sistemas, a utilização de padrões arquiteturais produz um conjunto de papéis Web Bean recorrentes. Um estereótipo permite a um desenvolvedor de framwework identificar esse papel e declarar alguns metadados comums para Web Beans com esse papel em um local centralizado."
+msgid ""
+"In many systems, use of architectural patterns produces a set of recurring "
+"bean roles. A stereotype allows a framework developer to identify such a "
+"role and declare some common metadata for beans with that role in a central "
+"place."
+msgstr ""
+"Em muitos sistemas, a utilização de padrões arquiteturais produz um conjunto "
+"de papéis Web Bean recorrentes. Um estereótipo permite a um desenvolvedor de "
+"framwework identificar esse papel e declarar alguns metadados comums para "
+"Web Beans com esse papel em um local centralizado."
 
 #. Tag: para
-#: stereotypes.xml:17
 #, no-c-format
 msgid "A stereotype encapsulates any combination of:"
 msgstr "Um estereótipo encapsula qualquer combinação de:"
 
 #. Tag: para
-#: stereotypes.xml:21
 #, fuzzy, no-c-format
 msgid "a default scope, and"
 msgstr "um tipo de escopo padrão,"
 
 #. Tag: para
-#: stereotypes.xml:24
 #, fuzzy, no-c-format
 msgid "a set of interceptor bindings."
 msgstr "um conjunto de anotações para binding de interceptadores "
 
 #. Tag: para
-#: stereotypes.xml:28
 #, no-c-format
 msgid "A stereotype may also specify that:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:34
 #, fuzzy, no-c-format
 msgid "all beans with the stereotype have defaulted bean EL names, or that"
-msgstr "Um estereótipo também pode especificar que todos os Web Beans com o estereótipo têm um nome Web Bean padrão."
+msgstr ""
+"Um estereótipo também pode especificar que todos os Web Beans com o "
+"estereótipo têm um nome Web Bean padrão."
 
 #. Tag: para
-#: stereotypes.xml:37
 #, no-c-format
 msgid "all beans with the stereotype are alternatives."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:41
 #, no-c-format
-msgid "A bean may declare zero, one or multiple stereotypes. Stereotype annotations may be applied to a bean class or producer method or field."
+msgid ""
+"A bean may declare zero, one or multiple stereotypes. Stereotype annotations "
+"may be applied to a bean class or producer method or field."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:48
 #, fuzzy, no-c-format
-msgid "A stereotype is an annotation, annotated <literal>@Stereotype</literal>, that packages several other annotations. For instance, the following stereotype identifies action classes in some MVC framework:"
-msgstr "Um estereótipo é um tipo de anotação Java. Esse estereótipo identifica classes de ação em algum framework MVC:"
-
-#. Tag: programlisting
-#: stereotypes.xml:53
-#, no-c-format
 msgid ""
-"<![CDATA[@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"...\n"
-"public @interface Action {}]]>"
+"A stereotype is an annotation, annotated <literal>@Stereotype</literal>, "
+"that packages several other annotations. For instance, the following "
+"stereotype identifies action classes in some MVC framework:"
 msgstr ""
-"<![CDATA[@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"...\n"
-"public @interface Action {}]]>"
+"Um estereótipo é um tipo de anotação Java. Esse estereótipo identifica "
+"classes de ação em algum framework MVC:"
 
 #. Tag: para
-#: stereotypes.xml:55
 #, fuzzy, no-c-format
 msgid "We use the stereotype by applying the annotation to a bean."
 msgstr "Nós utilizamos o estereótipo, aplicando a anotação ao Web Bean."
 
-#. Tag: programlisting
-#: stereotypes.xml:59
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
+"Of course, we need to apply some other annotations to our stereotype or else "
+"it wouldn't be adding much value."
 msgstr ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
 
-#. Tag: para
-#: stereotypes.xml:61
-#, no-c-format
-msgid "Of course, we need to apply some other annotations to our stereotype or else it wouldn't be adding much value."
-msgstr ""
-
 #. Tag: title
-#: stereotypes.xml:66
 #, fuzzy, no-c-format
 msgid "Default scope for a stereotype"
 msgstr "Escopo padrão e o tipo de implantação para um estereótipo"
 
 #. Tag: para
-#: stereotypes.xml:68
 #, fuzzy, no-c-format
-msgid "A stereotype may specify a default scope for beans annotated with the stereotype. For example:"
-msgstr "Um estereótipo também pode especificar que todos os Web Beans com o estereótipo têm um nome Web Bean padrão."
-
-#. Tag: programlisting
-#: stereotypes.xml:72
-#, no-c-format
 msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
+"A stereotype may specify a default scope for beans annotated with the "
+"stereotype. For example:"
 msgstr ""
-"<![CDATA[@RequestScoped\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
+"Um estereótipo também pode especificar que todos os Web Beans com o "
+"estereótipo têm um nome Web Bean padrão."
 
 #. Tag: para
-#: stereotypes.xml:74
 #, fuzzy, no-c-format
 msgid "A particular action may still override this default if necessary:"
-msgstr "Evidentemente, uma determinada ação pode ainda,se necessário, substituir estes padrões:"
-
-#. Tag: programlisting
-#: stereotypes.xml:78
-#, no-c-format
-msgid ""
-"<![CDATA[@Dependent @Action \n"
-"public class DependentScopedLoginAction { ... }]]>"
 msgstr ""
-"<![CDATA[@Dependent @Action \n"
-"public class DependentScopedLoginAction { ... }]]>"
+"Evidentemente, uma determinada ação pode ainda,se necessário, substituir "
+"estes padrões:"
 
 #. Tag: para
-#: stereotypes.xml:80
 #, no-c-format
-msgid "Naturally, overriding a single default isn't much use. But remember, stereotypes can define more than just the default scope."
+msgid ""
+"Naturally, overriding a single default isn't much use. But remember, "
+"stereotypes can define more than just the default scope."
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:88
 #, no-c-format
 msgid "Interceptor bindings for stereotypes"
 msgstr "Bindings de interceptadores para estereótipos"
 
 #. Tag: para
-#: stereotypes.xml:90
 #, fuzzy, no-c-format
-msgid "A stereotype may specify a set of interceptor bindings to be inherited by all beans with that stereotype."
-msgstr "Um estereótipo pode especificar um conjunto de interceptadores de bindings a serem herdados por todos os Web Beans com esse estereótipo."
-
-#. Tag: programlisting
-#: stereotypes.xml:94
-#, no-c-format
 msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
+"A stereotype may specify a set of interceptor bindings to be inherited by "
+"all beans with that stereotype."
 msgstr ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
+"Um estereótipo pode especificar um conjunto de interceptadores de bindings a "
+"serem herdados por todos os Web Beans com esse estereótipo."
 
 #. Tag: para
-#: stereotypes.xml:96
 #, fuzzy, no-c-format
-msgid "This helps us get technical concerns, like transactions and security, even further away from the business code!"
-msgstr "Isso nos ajuda a manter os detalhes técnicos ainda mais longe do código de negócios!"
+msgid ""
+"This helps us get technical concerns, like transactions and security, even "
+"further away from the business code!"
+msgstr ""
+"Isso nos ajuda a manter os detalhes técnicos ainda mais longe do código de "
+"negócios!"
 
 #. Tag: title
-#: stereotypes.xml:103
 #, no-c-format
 msgid "Name defaulting with stereotypes"
 msgstr "Padronização de nomes com estereótipos"
 
 #. Tag: para
-#: stereotypes.xml:105
 #, fuzzy, no-c-format
-msgid "We can specify that all beans with a certain stereotype have a defaulted EL name when a name is not explicitly defined for that bean. All we need to do is add an empty <literal>@Named</literal> annotation:"
-msgstr "Por último, é possível especificar que todos os Web Beans com um certo estereótipo tenham um nome Web Bean padronizado pelo gerenciador do Web Bean. As ações são,muitas vezes, referenciadas em páginas JSP. Por isso, elas são um caso de utilização perfeito desse recurso. Tudo o que precisamos fazer é adicionar uma anotação <literal>@Nome</literal> vazia:\t"
-
-#. Tag: programlisting
-#: stereotypes.xml:110
-#, no-c-format
 msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
+"We can specify that all beans with a certain stereotype have a defaulted EL "
+"name when a name is not explicitly defined for that bean. All we need to do "
+"is add an empty <literal>@Named</literal> annotation:"
 msgstr ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
+"Por último, é possível especificar que todos os Web Beans com um certo "
+"estereótipo tenham um nome Web Bean padronizado pelo gerenciador do Web "
+"Bean. As ações são,muitas vezes, referenciadas em páginas JSP. Por isso, "
+"elas são um caso de utilização perfeito desse recurso. Tudo o que precisamos "
+"fazer é adicionar uma anotação <literal>@Nome</literal> vazia:\t"
 
 #. Tag: para
-#: stereotypes.xml:112
 #, fuzzy, no-c-format
-msgid "Now, the <literal>LoginAction</literal> bean will have the defaulted name <literal>loginAction</literal>."
-msgstr "Agora, <literal>LoginAction</literal> terá o nome <literal>loginAction</literal>."
+msgid ""
+"Now, the <literal>LoginAction</literal> bean will have the defaulted name "
+"<literal>loginAction</literal>."
+msgstr ""
+"Agora, <literal>LoginAction</literal> terá o nome <literal>loginAction</"
+"literal>."
 
 #. Tag: title
-#: stereotypes.xml:119
 #, fuzzy, no-c-format
 msgid "Alternative stereotypes"
 msgstr "Estereótipos padrões"
 
 #. Tag: para
-#: stereotypes.xml:121
 #, no-c-format
-msgid "A stereotype can indicate that all beans to which it is applied are <literal>@Alternative</literal>s. An <emphasis>alternative stereotype</emphasis> lets us classify beans by deployment scenario."
-msgstr ""
-
-#. Tag: programlisting
-#: stereotypes.xml:126
-#, no-c-format
 msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Mock {}]]>"
+"A stereotype can indicate that all beans to which it is applied are "
+"<literal>@Alternative</literal>s. An <emphasis>alternative stereotype</"
+"emphasis> lets us classify beans by deployment scenario."
 msgstr ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Mock {}]]>"
 
 #. Tag: para
-#: stereotypes.xml:128
 #, no-c-format
-msgid "We can apply an alternative stereotype to a whole set of beans, and activate them all with one line of code in <literal>beans.xml</literal>."
-msgstr ""
-
-#. Tag: programlisting
-#: stereotypes.xml:133
-#, no-c-format
 msgid ""
-"<![CDATA[@Mock\n"
-"public class MockLoginAction extends LoginAction { ... }]]>"
+"We can apply an alternative stereotype to a whole set of beans, and activate "
+"them all with one line of code in <literal>beans.xml</literal>."
 msgstr ""
-"<![CDATA[@Mock\n"
-"public class MockLoginAction extends LoginAction { ... }]]>"
 
 #. Tag: title
-#: stereotypes.xml:141
 #, fuzzy, no-c-format
 msgid "Stereotype stacking"
 msgstr "Estereótipos"
 
 #. Tag: para
-#: stereotypes.xml:143
 #, no-c-format
-msgid "This may blow your mind a bit, but stereotypes may declare other stereotypes, which we'll call <emphasis>stereotype stacking</emphasis>. You may want to do this if you have two distinct stereotypes which are meaningful on their own, but in other situation may be meaningful when combined."
+msgid ""
+"This may blow your mind a bit, but stereotypes may declare other "
+"stereotypes, which we'll call <emphasis>stereotype stacking</emphasis>. You "
+"may want to do this if you have two distinct stereotypes which are "
+"meaningful on their own, but in other situation may be meaningful when "
+"combined."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:150
 #, no-c-format
-msgid "Here's an example that combines the <literal>@Action</literal> and <literal>@Auditable</literal> stereotypes:"
-msgstr ""
-
-#. Tag: programlisting
-#: stereotypes.xml:155
-#, no-c-format
 msgid ""
-"<![CDATA[@Auditable\n"
-"@Action\n"
-"@Stereotype\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface AuditableAction {}]]>"
+"Here's an example that combines the <literal>@Action</literal> and "
+"<literal>@Auditable</literal> stereotypes:"
 msgstr ""
-"<![CDATA[@Auditable\n"
-"@Action\n"
-"@Stereotype\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface AuditableAction {}]]>"
 
 #. Tag: title
-#: stereotypes.xml:160
 #, fuzzy, no-c-format
 msgid "Built-in stereotypes"
 msgstr "Estereótipos padrões"
 
 #. Tag: para
-#: stereotypes.xml:162
 #, fuzzy, no-c-format
-msgid "We've already met two standard stereotypes defined by the CDI specification: <literal>@Interceptor</literal> and <literal>@Decorator</literal>."
-msgstr "Já conhecemos dois estereótipos padrões definidos pela especificação de Web Beans: <literal>@Interceptor</literal> e <literal>@Decorator</literal>."
+msgid ""
+"We've already met two standard stereotypes defined by the CDI specification: "
+"<literal>@Interceptor</literal> and <literal>@Decorator</literal>."
+msgstr ""
+"Já conhecemos dois estereótipos padrões definidos pela especificação de Web "
+"Beans: <literal>@Interceptor</literal> e <literal>@Decorator</literal>."
 
 #. Tag: para
-#: stereotypes.xml:167
 #, no-c-format
-msgid "CDI defines one further standard stereotype, <literal>@Model</literal>, which is expected to be used frequently in web applications:"
-msgstr ""
-
-#. Tag: programlisting
-#: stereotypes.xml:172
-#, no-c-format
 msgid ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {}]]>"
+"CDI defines one further standard stereotype, <literal>@Model</literal>, "
+"which is expected to be used frequently in web applications:"
 msgstr ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {}]]>"
 
 #. Tag: para
-#: stereotypes.xml:174
 #, fuzzy, no-c-format
-msgid "Instead of using JSF managed beans, just annotate a bean <literal>@Model</literal>, and use it directly in your JSF view!"
-msgstr "Esse estereótipo é destinado ao uso com o JSF. Em vez de utilizar JSF managed beans, basta anotar um Web Bean com <literal>@Model</literal>, e utilizá-lo diretamente em sua página JSF."
+msgid ""
+"Instead of using JSF managed beans, just annotate a bean <literal>@Model</"
+"literal>, and use it directly in your JSF view!"
+msgstr ""
+"Esse estereótipo é destinado ao uso com o JSF. Em vez de utilizar JSF "
+"managed beans, basta anotar um Web Bean com <literal>@Model</literal>, e "
+"utilizá-lo diretamente em sua página JSF."
 
+#~ msgid ""
+#~ "<![CDATA[@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "...\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "...\n"
+#~ "public @interface Action {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Dependent @Action \n"
+#~ "public class DependentScopedLoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Dependent @Action \n"
+#~ "public class DependentScopedLoginAction { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Named\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Named\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Alternative\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Mock {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Alternative\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Mock {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Mock\n"
+#~ "public class MockLoginAction extends LoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Mock\n"
+#~ "public class MockLoginAction extends LoginAction { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Auditable\n"
+#~ "@Action\n"
+#~ "@Stereotype\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface AuditableAction {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Auditable\n"
+#~ "@Action\n"
+#~ "@Stereotype\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface AuditableAction {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {}]]>"
+
 #~ msgid "According to the Web Beans specification:"
 #~ msgstr "De acordo com a especificação Web Beans:"
+
 #~ msgid "a default deployment type,"
 #~ msgstr "um tipo padrão de implantação, "
+
 #~ msgid "a restriction upon the Web Bean scope,"
 #~ msgstr "uma restrição ao escopo do Web Bean,"
+
 #~ msgid ""
 #~ "a requirement that the Web Bean implement or extend a certain type, and"
 #~ msgstr ""
 #~ "uma exigência de que o Web Bean implemente ou estenda um certo tipo, e"
+
 #~ msgid "A Web Bean may declare zero, one or multiple stereotypes."
 #~ msgstr "Um Web Bean pode declarar zero, um ou vários estereótipos."
+
 #~ msgid ""
 #~ "A stereotype may specify a default scope and/or default deployment type "
 #~ "for Web Beans with that stereotype. For example, if the deployment type "
@@ -391,6 +403,7 @@
 #~ "implantação <literal>@WebTier</literal> identifica Web Beans que só "
 #~ "deverão ser implantados quando o sistema executar como uma aplicação web. "
 #~ "Podemos especificar os seguintes padrões para classes de ação :"
+
 #~ msgid ""
 #~ "<![CDATA[@Retention(RUNTIME)\n"
 #~ "@Target(TYPE)\n"
@@ -405,13 +418,16 @@
 #~ "@WebTier\n"
 #~ "@Stereotype\n"
 #~ "public @interface Action {}]]>"
+
 #~ msgid ""
 #~ "If we want to force all actions to a particular scope, we can do that too."
 #~ msgstr ""
 #~ "Se  quisermos forçar todas as ações para um escopo particular,  podemos "
 #~ "fazer isso também."
+
 #~ msgid "Restricting scope and type with a stereotype"
 #~ msgstr "Restringindo o escopo e o tipo com um estereótipo"
+
 #~ msgid ""
 #~ "Suppose that we wish to prevent actions from declaring certain scopes. "
 #~ "Web Beans lets us explicitly specify the set of allowed scopes for Web "
@@ -420,6 +436,7 @@
 #~ "Suponha que queremos impedir as ações de declarar certos escopos. Web "
 #~ "Beans permite-nos indicar explicitamente o conjunto de escopos permitidos "
 #~ "para Web Beans com um certo estereótipo. Por exemplo:"
+
 #~ msgid ""
 #~ "<![CDATA[@Retention(RUNTIME)\n"
 #~ "@Target(TYPE)\n"
@@ -434,6 +451,7 @@
 #~ "@WebTier\n"
 #~ "@Stereotype(supportedScopes=RequestScoped.class)\n"
 #~ "public @interface Action {}]]>"
+
 #~ msgid ""
 #~ "If a particular action class attempts to specify a scope other than the "
 #~ "Web Beans request scope, an exception will be thrown by the Web Bean "
@@ -442,12 +460,14 @@
 #~ "Se uma determinada classe de ação tenta especificar um escopo diferente "
 #~ "do escopo de requisição da Web Beans, uma exceção será lançada pelo "
 #~ "gerenciador do Web Bean em tempo de inicialização."
+
 #~ msgid ""
 #~ "We can also force all Web Bean with a certain stereotype to implement an "
 #~ "interface or extend a class:"
 #~ msgstr ""
 #~ "Também podemos forçar todos os Web Beans com um certo estereótipo a  "
 #~ "implementar uma interface ou estender uma classe:"
+
 #~ msgid ""
 #~ "<![CDATA[@Retention(RUNTIME)\n"
 #~ "@Target(TYPE)\n"
@@ -462,6 +482,7 @@
 #~ "@WebTier\n"
 #~ "@Stereotype(requiredTypes=AbstractAction.class)\n"
 #~ "public @interface Action {}]]>"
+
 #~ msgid ""
 #~ "If a particular action class does not extend the class "
 #~ "<literal>AbstractAction</literal>, an exception will be thrown by the Web "
@@ -470,6 +491,6 @@
 #~ "Se uma determinada classe de ação não estender a classe "
 #~ "<literal>AbstractAction</literal>, uma exceção será lançada pelo "
 #~ "gerenciador do Web Bean em tempo de inicialização."
+
 #~ msgid "Web Beans defines one further standard stereotype:"
 #~ msgstr "Web Beans define mais um estereótipo padrão:"
-

Modified: doc/trunk/reference/pt-BR/viewlayers.po
===================================================================
--- doc/trunk/reference/pt-BR/viewlayers.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/viewlayers.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -3,9 +3,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection VERSION\n"
+"Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
+"VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-12-19 18:08-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,151 +15,169 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: viewlayers.xml:5
 #, no-c-format
 msgid "Alternative view layers"
 msgstr "Camadas de apresentação alternativas"
 
 #. Tag: title
-#: viewlayers.xml:8
 #, no-c-format
 msgid "Wicket CDI integration"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:10
 #, no-c-format
-msgid "Weld provides integration between the Apache Wicket web framework and CDI. This functionality is provided by the <literal>weld-wicket</literal> extension module, which naturally must be on the classpath of the Wicket application."
+msgid ""
+"Weld provides integration between the Apache Wicket web framework and CDI. "
+"This functionality is provided by the <literal>weld-wicket</literal> "
+"extension module, which naturally must be on the classpath of the Wicket "
+"application."
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:16
 #, no-c-format
-msgid "This section describes some of the utilities provided by the Wicket extension module to support the CDI integration."
+msgid ""
+"This section describes some of the utilities provided by the Wicket "
+"extension module to support the CDI integration."
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:22
 #, no-c-format
 msgid "The <literal>WebApplication</literal> class"
 msgstr "A classe <literal>WebApplication</literal>"
 
 #. Tag: para
-#: viewlayers.xml:24
 #, no-c-format
-msgid "Each wicket application must have a <literal>WebApplication</literal> subclass; Weld provides, for your utility, a subclass of this which sets up the Wicket CDI integration. You should subclass <literal>org.jboss.weld.wicket.WeldApplication</literal>."
+msgid ""
+"Each wicket application must have a <literal>WebApplication</literal> "
+"subclass; Weld provides, for your utility, a subclass of this which sets up "
+"the Wicket CDI integration. You should subclass <literal>org.jboss.weld."
+"wicket.WeldApplication</literal>."
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:31
 #, no-c-format
-msgid "If you would prefer not to subclass <literal>WeldApplication</literal>, you can manually add a (small!) number of overrides and listeners to your own <literal>WebApplication</literal> subclass. The JavaDocs of <literal>WeldApplication</literal>detail this."
+msgid ""
+"If you would prefer not to subclass <literal>WeldApplication</literal>, you "
+"can manually add a (small!) number of overrides and listeners to your own "
+"<literal>WebApplication</literal> subclass. The JavaDocs of "
+"<literal>WeldApplication</literal>detail this."
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:38
 #, no-c-format
 msgid "For example:"
 msgstr "Por exemplo:"
 
-#. Tag: programlisting
-#: viewlayers.xml:41
-#, no-c-format
-msgid ""
-"<![CDATA[public class SampleApplication extends WeldApplication {\n"
-"   @Override\n"
-"   public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class SampleApplication extends WeldApplication {\n"
-"   @Override\n"
-"   public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-
 #. Tag: title
-#: viewlayers.xml:45
 #, no-c-format
 msgid "Conversations with Wicket"
 msgstr "Conversação com Wicket"
 
 #. Tag: para
-#: viewlayers.xml:46
 #, no-c-format
-msgid "Wicket can also take advantage of the conversation scope from CDI, provided by the Wicket extension module. This module takes care of:"
+msgid ""
+"Wicket can also take advantage of the conversation scope from CDI, provided "
+"by the Wicket extension module. This module takes care of:"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:52
 #, no-c-format
-msgid "Setting up the conversation context at the beginning of a Wicket request, and tearing it down afterwards"
+msgid ""
+"Setting up the conversation context at the beginning of a Wicket request, "
+"and tearing it down afterwards"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:58
 #, no-c-format
-msgid "Storing the id of any long-running conversation in Wicket's metadata when the page response is complete"
+msgid ""
+"Storing the id of any long-running conversation in Wicket's metadata when "
+"the page response is complete"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:64
 #, no-c-format
-msgid "Activating the correct long-running conversation based upon which page is being accessed"
+msgid ""
+"Activating the correct long-running conversation based upon which page is "
+"being accessed"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:69
 #, no-c-format
-msgid "Propagating the conversation context for any long-running conversation to new pages"
+msgid ""
+"Propagating the conversation context for any long-running conversation to "
+"new pages"
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:76
 #, no-c-format
 msgid "Starting and stopping conversations in Wicket"
 msgstr "Iniciar e interromper conversações no Wicket"
 
 #. Tag: para
-#: viewlayers.xml:77
 #, no-c-format
-msgid "As in JSF applications, a conversation <emphasis>always</emphasis> exists for any request to Wicket, but its lifetime is only that of the current request unless it is marked as <emphasis>long-running</emphasis>. The boundaries of a long-running conversation are controlled in the same way as in JSF applications, by injecting the <literal>Conversation</literal> instance and invoking either the <literal>begin()</literal> or <literal>end()</literal> methods:"
-msgstr ""
-
-#. Tag: programlisting
-#: viewlayers.xml:86
-#, no-c-format
 msgid ""
-"<![CDATA[private @Inject Conversation conversation;\n"
-"...\n"
-"// begin a conversation\n"
-"conversation.begin();\n"
-"...\n"
-"// end a conversation\n"
-"conversation.end();]]>"
+"As in JSF applications, a conversation <emphasis>always</emphasis> exists "
+"for any request to Wicket, but its lifetime is only that of the current "
+"request unless it is marked as <emphasis>long-running</emphasis>. The "
+"boundaries of a long-running conversation are controlled in the same way as "
+"in JSF applications, by injecting the <literal>Conversation</literal> "
+"instance and invoking either the <literal>begin()</literal> or <literal>end()"
+"</literal> methods:"
 msgstr ""
-"<![CDATA[private @Inject Conversation conversation;\n"
-"...\n"
-"// begin a conversation\n"
-"conversation.begin();\n"
-"...\n"
-"// end a conversation\n"
-"conversation.end();]]>"
 
 #. Tag: title
-#: viewlayers.xml:91
 #, no-c-format
 msgid "Long running conversation propagation in Wicket"
 msgstr "Propagação de conversação de longa duração no Wicket"
 
 #. Tag: para
-#: viewlayers.xml:92
 #, no-c-format
-msgid "When a conversation is marked as long-running, the id of that conversation will be stored in Wicket's metadata for the current page. If a new page is created and set as the response target through <literal>setResponsePage()</literal>, this new page will also participate in this conversation. This occurs for both directly instantiated pages (<literal>setResponsePage(new OtherPage())</literal>), as well as for bookmarkable pages created with <literal>setResponsePage(OtherPage.class)</literal> where <literal>OtherPage.class</literal> is mounted as bookmarkable from your <literal>WebApplication</literal> subclass (or through annotations). In the latter case, because the new page instance is not created until after a redirect, the conversation id will be propagated through a request parameter, and then stored in page metadata after the redirect."
+msgid ""
+"When a conversation is marked as long-running, the id of that conversation "
+"will be stored in Wicket's metadata for the current page. If a new page is "
+"created and set as the response target through <literal>setResponsePage()</"
+"literal>, this new page will also participate in this conversation. This "
+"occurs for both directly instantiated pages (<literal>setResponsePage(new "
+"OtherPage())</literal>), as well as for bookmarkable pages created with "
+"<literal>setResponsePage(OtherPage.class)</literal> where <literal>OtherPage."
+"class</literal> is mounted as bookmarkable from your "
+"<literal>WebApplication</literal> subclass (or through annotations). In the "
+"latter case, because the new page instance is not created until after a "
+"redirect, the conversation id will be propagated through a request "
+"parameter, and then stored in page metadata after the redirect."
 msgstr ""
 
+#~ msgid ""
+#~ "<![CDATA[public class SampleApplication extends WeldApplication {\n"
+#~ "   @Override\n"
+#~ "   public Class getHomePage() {\n"
+#~ "      return HomePage.class;\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class SampleApplication extends WeldApplication {\n"
+#~ "   @Override\n"
+#~ "   public Class getHomePage() {\n"
+#~ "      return HomePage.class;\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[private @Inject Conversation conversation;\n"
+#~ "...\n"
+#~ "// begin a conversation\n"
+#~ "conversation.begin();\n"
+#~ "...\n"
+#~ "// end a conversation\n"
+#~ "conversation.end();]]>"
+#~ msgstr ""
+#~ "<![CDATA[private @Inject Conversation conversation;\n"
+#~ "...\n"
+#~ "// begin a conversation\n"
+#~ "conversation.begin();\n"
+#~ "...\n"
+#~ "// end a conversation\n"
+#~ "conversation.end();]]>"
+
 #~ msgid "Using Web Beans with Wicket"
 #~ msgstr "Utilizando a Web Beans com o Wicket"
-

Modified: doc/trunk/reference/pt-BR/weldexamples.po
===================================================================
--- doc/trunk/reference/pt-BR/weldexamples.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/weldexamples.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-12-19 18:04-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: weldexamples.xml:5
 #, no-c-format
 msgid "Diving into the Weld examples"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:7
 #, no-c-format
 msgid ""
 "It's time to pull the covers back and dive into the internals of Weld "
@@ -29,13 +27,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:13
 #, no-c-format
 msgid "The numberguess example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:15
 #, no-c-format
 msgid ""
 "In the numberguess application you get 10 attempts to guess a number between "
@@ -44,16 +40,14 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:20
 #, no-c-format
 msgid ""
 "The numberguess example is comprised of a number of beans, configuration "
-"files and Facelets (JSF) views, packaged as a WAR module. Let's start by "
+"files and Facelets (JSF) views, packaged as a war module. Let's start by "
 "examining the configuration files."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:25
 #, no-c-format
 msgid ""
 "All the configuration files for this example are located in <literal>WEB-INF/"
@@ -64,28 +58,7 @@
 "to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:33
-#, no-c-format
-msgid ""
-"<![CDATA[<faces-config version=\"2.0\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd\">\n"
-"</faces-config>]]>"
-msgstr ""
-"<![CDATA[<faces-config version=\"2.0\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd\">\n"
-"</faces-config>]]>"
-
 #. Tag: para
-#: weldexamples.xml:35
 #, no-c-format
 msgid ""
 "There's also an empty <literal>beans.xml</literal> file, which tells the "
@@ -94,242 +67,120 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:40
 #, no-c-format
 msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:42
+#. Tag: para
 #, no-c-format
+msgid "Enable and initialize the JSF servlet"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"faces.servlet\" coords=\"10\"/> "
-"<area id=\"faces.servlet.mapping\" coords=\"16\"/> <area id=\"faces.default."
-"suffix\" coords=\"21\"/> <area id=\"session.timeout\" coords=\"26\"/> </"
-"areaspec> <programlisting role=\"XML\"><![CDATA[<web-app version=\"2.5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n"
-"   \n"
-"   <display-name>weld-jsf-numberguess-war</display-name>\n"
-"   <description>Weld JSF numberguess example (WAR)</description>\n"
-"\n"
-"   <servlet>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>\n"
-"      <load-on-startup>1</load-on-startup>\n"
-"   </servlet>\n"
-"\n"
-"   <servlet-mapping>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <url-pattern>*.jsf</url-pattern>\n"
-"   </servlet-mapping>\n"
-"   \n"
-"   <context-param>\n"
-"      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>\n"
-"      <param-value>.xhtml</param-value>\n"
-"   </context-param>\n"
-"\n"
-"   <session-config>\n"
-"      <session-timeout>10</session-timeout>\n"
-"   </session-config>\n"
-"\n"
-"</web-app>]]></programlisting> <calloutlist> <callout arearefs=\"faces."
-"servlet\"> <para> Enable and initialize the JSF servlet </para> </callout> "
-"<callout arearefs=\"faces.servlet.mapping\"> <para> Configure requests for "
-"URLs ending in <literal>.jsf</literal> to be handled by JSF </para> </"
-"callout> <callout arearefs=\"faces.default.suffix\"> <para> Tell JSF that we "
-"will be giving our JSF views (Facelets templates) an extension of <literal>."
-"xhtml</literal> </para> </callout> <callout arearefs=\"session.timeout\"> "
-"<para> Configure a session timeout of 10 minutes </para> </callout> </"
-"calloutlist> </programlistingco> <note> <para> This demo uses JSF 2 as the "
-"view framework, but you can use Weld with any servlet-based web framework, "
-"such as JSF 1.2 or Wicket. </para> </note> <para> Let's take a look at the "
-"main JSF view, <literal>src/main/webapp/home.xhtml</literal>. </para> "
-"<programlistingco> <areaspec> <area id=\"template\" coords=\"8\"/> <area id="
-"\"statusMessages\" coords=\"12\"/> <area id=\"instructions\" coords=\"20\"/> "
-"<area id=\"guess\" coords=\"27\"/> <area id=\"validator\" coords=\"29\"/> "
-"<area id=\"submit\" coords=\"30\"/> </areaspec> <programlisting role=\"XML"
-"\"><![CDATA[<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN"
-"\"\n"
-"   \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
-"<html xmlns=\"http://www.w3.org/1999/xhtml\"\n"
-"   xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n"
-"   xmlns:h=\"http://java.sun.com/jsf/html\"\n"
-"   xmlns:f=\"http://java.sun.com/jsf/core\">\n"
-"\n"
-"   <ui:composition template=\"/template.xhtml\">\n"
-"      <ui:define name=\"content\">\n"
-"         <h1>Guess a number...</h1>\n"
-"         <h:form id=\"numberGuess\">\n"
-"            <div style=\"color: red\">\n"
-"               <h:messages id=\"messages\" globalOnly=\"false\"/>\n"
-"               <h:outputText id=\"Higher\" value=\"Higher!\"\n"
-"                  rendered=\"#{game.number gt game.guess and game.guess ne 0}"
-"\"/>\n"
-"               <h:outputText id=\"Lower\" value=\"Lower!\"\n"
-"                  rendered=\"#{game.number lt game.guess and game.guess ne 0}"
-"\"/>\n"
-"            </div>\n"
-"    \n"
-"            <div>\n"
-"               I'm thinking of a number between #{game.smallest} and #{game."
-"biggest}.\n"
-"               You have #{game.remainingGuesses} guesses remaining.\n"
-"            </div>\n"
-"       \n"
-"            <div>\n"
-"               Your guess: \n"
-"               <h:inputText id=\"inputGuess\" value=\"#{game.guess}\"\n"
-"                  size=\"3\" required=\"true\" disabled=\"#{game.number eq "
-"game.guess}\"\n"
-"                  validator=\"#{game.validateNumberRange}\"/>\n"
-"               <h:commandButton id=\"guessButton\" value=\"Guess\" \n"
-"                  action=\"#{game.check}\" disabled=\"#{game.number eq game."
-"guess}\"/>\n"
-"            </div>\n"
-"            <div>\n"
-"              <h:commandButton id=\"restartButton\" value=\"Reset\" action="
-"\"#{game.reset}\" immediate=\"true\"/>\n"
-"            </div>\n"
-"         </h:form>\n"
-"      </ui:define>\n"
-"   </ui:composition>\n"
-"</html>]]></programlisting> <calloutlist> <callout arearefs=\"template\"> "
-"<para> Facelets is the built-in templating language for JSF. Here we are "
-"wrapping our page in a template which defines the layout. </para> </callout> "
-"<callout arearefs=\"statusMessages\"> <para> There are a number of messages "
-"which can be sent to the user, \"Higher!\", \"Lower!\" and \"Correct!\" </"
-"para> </callout> <callout arearefs=\"instructions\"> <para> As the user "
-"guesses, the range of numbers they can guess gets smaller - this sentence "
-"changes to make sure they know the number range of a valid guess. </para> </"
-"callout> <callout arearefs=\"guess\"> <para> This input field is bound to a "
-"bean property using a value expression. </para> </callout> <callout arearefs="
-"\"validator\"> <para> A validator binding is used to make sure the user "
-"doesn't accidentally input a number outside of the range in which they can "
-"guess - if the validator wasn't here, the user might use up a guess on an "
-"out of bounds number. </para> </callout> <callout arearefs=\"submit\"> "
-"<para> And, of course, there must be a way for the user to send their guess "
-"to the server. Here we bind to an action method on the bean. </para> </"
-"callout> </calloutlist> </programlistingco>"
+"Configure requests for URLs ending in <literal>.jsf</literal> to be handled "
+"by JSF"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:142
 #, no-c-format
 msgid ""
-"The example exists of 4 classes, the first two of which are qualifiers. "
-"First, there is the <literal>@Random</literal> qualifier, used for injecting "
-"a random number:"
+"Tell JSF that we will be giving our JSF views (Facelets templates) an "
+"extension of <literal>.xhtml</literal>"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:147
+#. Tag: para
 #, no-c-format
+msgid "Configure a session timeout of 10 minutes"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Random {}]]>"
+"This demo uses JSF 2 as the view framework, but you can use Weld with any "
+"servlet-based web framework, such as JSF 1.2 or Wicket."
 msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Random {}]]>"
 
 #. Tag: para
-#: weldexamples.xml:149
 #, no-c-format
 msgid ""
-"There is also the <literal>@MaxNumber</literal> qualifier, used for "
-"injecting the maximum number that can be injected:"
+"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
+"literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:154
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface MaxNumber {}\n"
-"]]>"
+"Facelets is the built-in templating language for JSF. Here we are wrapping "
+"our page in a template which defines the layout."
 msgstr ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface MaxNumber {}\n"
-"]]>"
 
 #. Tag: para
-#: weldexamples.xml:156
 #, no-c-format
 msgid ""
-"The application-scoped <literal>Generator</literal> class is responsible for "
-"creating the random number, via a producer method. It also exposes the "
-"maximum possible number via a producer method:"
+"There are a number of messages which can be sent to the user, \"Higher!\", "
+"\"Lower!\" and \"Correct!\""
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:161
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class Generator implements Serializable {\n"
-"\n"
-"   private java.util.Random random = new java.util.Random(System."
-"currentTimeMillis());\n"
-"   \n"
-"   private int maxNumber = 100;\n"
-"   \n"
-"   java.util.Random getRandom() {\n"
-"      return random;\n"
-"   }\n"
-"   \n"
-"   @Produces @Random int next() { \n"
-"      return getRandom().nextInt(maxNumber); \n"
-"   }\n"
-"   \n"
-"   @Produces @MaxNumber int getMaxNumber() {\n"
-"      return maxNumber;\n"
-"   }\n"
-"\n"
-"}]]>"
+"As the user guesses, the range of numbers they can guess gets smaller - this "
+"sentence changes to make sure they know the number range of a valid guess."
 msgstr ""
-"<![CDATA[@ApplicationScoped\n"
-"public class Generator implements Serializable {\n"
-"\n"
-"   private java.util.Random random = new java.util.Random(System."
-"currentTimeMillis());\n"
-"   \n"
-"   private int maxNumber = 100;\n"
-"   \n"
-"   java.util.Random getRandom() {\n"
-"      return random;\n"
-"   }\n"
-"   \n"
-"   @Produces @Random int next() { \n"
-"      return getRandom().nextInt(maxNumber); \n"
-"   }\n"
-"   \n"
-"   @Produces @MaxNumber int getMaxNumber() {\n"
-"      return maxNumber;\n"
-"   }\n"
-"\n"
-"}]]>"
 
 #. Tag: para
-#: weldexamples.xml:163
 #, no-c-format
+msgid "This input field is bound to a bean property using a value expression."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
+"A validator binding is used to make sure the user doesn't accidentally input "
+"a number outside of the range in which they can guess - if the validator "
+"wasn't here, the user might use up a guess on an out of bounds number."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"And, of course, there must be a way for the user to send their guess to the "
+"server. Here we bind to an action method on the bean."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The example exists of 4 classes, the first two of which are qualifiers. "
+"First, there is the <literal>@Random</literal> qualifier, used for injecting "
+"a random number:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"There is also the <literal>@MaxNumber</literal> qualifier, used for "
+"injecting the maximum number that can be injected:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The application-scoped <literal>Generator</literal> class is responsible for "
+"creating the random number, via a producer method. It also exposes the "
+"maximum possible number via a producer method:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The <literal>Generator</literal> is application scoped, so we don't get a "
 "different random each time."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:168
 #, no-c-format
 msgid ""
 "The package declaration and imports have been excluded from these listings. "
@@ -337,7 +188,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:174
 #, no-c-format
 msgid ""
 "The final bean in the application is the session-scoped <literal>Game</"
@@ -350,7 +200,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:182
 #, no-c-format
 msgid ""
 "You'll notice that we've also added the <literal>@Named</literal> annotation "
@@ -358,204 +207,32 @@
 "bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:187
-#, no-c-format
-msgid ""
-"<![CDATA[@Named\n"
-"@SessionScoped\n"
-"public class Game implements Serializable {\n"
-"\n"
-"   private int number;\n"
-"   private int guess;\n"
-"   private int smallest;\n"
-"   private int biggest;\n"
-"   private int remainingGuesses;\n"
-"\n"
-"   @Inject @MaxNumber private int maxNumber;\n"
-"   @Inject @Random Instance<Integer> randomNumber;\n"
-"   \n"
-"   public Game() {}\n"
-"   \n"
-"   public void check() {\n"
-"      if (guess > number) {\n"
-"         biggest = guess - 1;\n"
-"      }\n"
-"      else if (guess < number) {\n"
-"         smallest = guess + 1;\n"
-"      }\n"
-"      else if (guess == number) {\n"
-"         FacesContext.getCurrentInstance().addMessage(null, new FacesMessage"
-"(\"Correct!\"));\n"
-"      }\n"
-"      remainingGuesses--;\n"
-"   }\n"
-"   \n"
-"   @PostConstruct\n"
-"   public void reset() {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = randomNumber.get();\n"
-"   }\n"
-"   \n"
-"   public void validateNumberRange(FacesContext context,  UIComponent "
-"toValidate, Object value) {\n"
-"      if (remainingGuesses <= 0) {\n"
-"         FacesMessage message = new FacesMessage(\"No guesses left!\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"         return;\n"
-"      }\n"
-"      int input = (Integer) value;\n"
-"\n"
-"      if (input < smallest || input > biggest) {\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"\n"
-"         FacesMessage message = new FacesMessage(\"Invalid guess\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"      }\n"
-"   }\n"
-"\n"
-"   public int getNumber() {\n"
-"      return number;\n"
-"   }\n"
-"   \n"
-"   public int getGuess() {\n"
-"      return guess;\n"
-"   }\n"
-"   \n"
-"   public void setGuess(int guess) {\n"
-"      this.guess = guess;\n"
-"   }\n"
-"   \n"
-"   public int getSmallest() {\n"
-"      return smallest;\n"
-"   }\n"
-"   \n"
-"   public int getBiggest() {\n"
-"      return biggest;\n"
-"   }\n"
-"   \n"
-"   public int getRemainingGuesses() {\n"
-"      return remainingGuesses;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named\n"
-"@SessionScoped\n"
-"public class Game implements Serializable {\n"
-"\n"
-"   private int number;\n"
-"   private int guess;\n"
-"   private int smallest;\n"
-"   private int biggest;\n"
-"   private int remainingGuesses;\n"
-"\n"
-"   @Inject @MaxNumber private int maxNumber;\n"
-"   @Inject @Random Instance<Integer> randomNumber;\n"
-"   \n"
-"   public Game() {}\n"
-"   \n"
-"   public void check() {\n"
-"      if (guess > number) {\n"
-"         biggest = guess - 1;\n"
-"      }\n"
-"      else if (guess < number) {\n"
-"         smallest = guess + 1;\n"
-"      }\n"
-"      else if (guess == number) {\n"
-"         FacesContext.getCurrentInstance().addMessage(null, new FacesMessage"
-"(\"Correct!\"));\n"
-"      }\n"
-"      remainingGuesses--;\n"
-"   }\n"
-"   \n"
-"   @PostConstruct\n"
-"   public void reset() {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = randomNumber.get();\n"
-"   }\n"
-"   \n"
-"   public void validateNumberRange(FacesContext context,  UIComponent "
-"toValidate, Object value) {\n"
-"      if (remainingGuesses <= 0) {\n"
-"         FacesMessage message = new FacesMessage(\"No guesses left!\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"         return;\n"
-"      }\n"
-"      int input = (Integer) value;\n"
-"\n"
-"      if (input < smallest || input > biggest) {\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"\n"
-"         FacesMessage message = new FacesMessage(\"Invalid guess\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"      }\n"
-"   }\n"
-"\n"
-"   public int getNumber() {\n"
-"      return number;\n"
-"   }\n"
-"   \n"
-"   public int getGuess() {\n"
-"      return guess;\n"
-"   }\n"
-"   \n"
-"   public void setGuess(int guess) {\n"
-"      this.guess = guess;\n"
-"   }\n"
-"   \n"
-"   public int getSmallest() {\n"
-"      return smallest;\n"
-"   }\n"
-"   \n"
-"   public int getBiggest() {\n"
-"      return biggest;\n"
-"   }\n"
-"   \n"
-"   public int getRemainingGuesses() {\n"
-"      return remainingGuesses;\n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: title
-#: weldexamples.xml:190
 #, no-c-format
 msgid "The numberguess example in Apache Tomcat or Jetty"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:192
 #, no-c-format
 msgid ""
 "A couple of modifications must be made to the numberguess artifact in order "
 "to deploy it to Tomcat or Jetty. First, Weld must be deployed as a Web "
 "Application library under <literal>WEB-INF/lib</literal> since the servlet "
 "container does not provide the CDI services. For your convenience we provide "
-"a single JAR suitable for running Weld in any servlet container (including "
+"a single jar suitable for running Weld in any servlet container (including "
 "Jetty), <literal>weld-servlet.jar</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:200
 #, no-c-format
 msgid ""
-"You must also include the JARs for JSF, EL, and the common annotations "
+"You must also include the jars for JSF, EL, and the common annotations "
 "(<literal>jsr250-api.jar</literal>), all of which are provided by the Java "
 "EE platform (a Java EE application server). Are you starting to appreciate "
 "why a Java EE platform is worth using?"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:207
 #, no-c-format
 msgid ""
 "Second, we need to explicitly specify the servlet listener in <literal>web."
@@ -563,22 +240,7 @@
 "The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:213
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-
 #. Tag: para
-#: weldexamples.xml:215
 #, no-c-format
 msgid ""
 "When Weld boots, it places the <literal>javax.enterprise.inject.spi."
@@ -589,13 +251,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:226
 #, no-c-format
 msgid "The numberguess example for Apache Wicket"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:227
 #, no-c-format
 msgid ""
 "Weld includes a number of portable extensions for JSR-299, including an "
@@ -605,7 +265,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:234
 #, no-c-format
 msgid ""
 "You may want to review the Wicket documentation at <ulink url=\"http://"
@@ -614,7 +273,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:241
 #, no-c-format
 msgid ""
 "Wicket is another environment that relies on the Weld servlet extension. The "
@@ -625,7 +283,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:249
 #, no-c-format
 msgid ""
 "We'll also be using the Eclipse IDE in these examples. Instructions are "
@@ -635,13 +292,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:257
 #, no-c-format
 msgid "Creating the Eclipse project"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:259
 #, no-c-format
 msgid ""
 "To use the Wicket example in Eclipse, you have one of two choices. You can "
@@ -653,17 +308,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:267
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -> Import... -> Maven Projects</"
-"emphasis>. Then, browse to the location of the Wicket numberguess example. "
-"You should see that Eclipse recognizes the existence of a Maven project."
+"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
+"Projects</emphasis>. Then, browse to the location of the Wicket numberguess "
+"example. You should see that Eclipse recognizes the existence of a Maven "
+"project."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:279
 #, no-c-format
 msgid ""
 "This will create a project in your workspace called <literal>weld-wicket-"
@@ -671,7 +325,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:283
 #, no-c-format
 msgid ""
 "You'll notice after importing, the project has a build error. That's because "
@@ -679,21 +332,24 @@
 "<emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> "
 "tab in the window that appears. In the form field labeled \"Active Maven "
 "Profiles (comma separated):\", type <literal>jetty</literal>. That will "
-"enable some extra dependencies that allow the project to compile. You're now "
-"ready to develop!"
+"enable some extra dependencies that allow the project to compile. "
+"Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven "
+"compile plugin when processing resources (recommended)\". That solves an "
+"incompatiblity between the m2eclipse plugin and the Maven enforcer plugin "
+"that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:292
 #, no-c-format
 msgid ""
-"You are also advised to uncheck the box \"Skip Maven compiler when "
-"processing resources\" in the Maven properties screen because of conflicts "
-"with the Maven enforcer plugin."
+"Be sure to uncheck the box \"Skip Maven compile plugin when processing "
+"resources (recommended)\" in the Maven properties screen or else the example "
+"might not run in Eclipse because beans.xml will be missing from the "
+"classpath! See the <ulink url=\"https://issues.sonatype.org/browse/"
+"MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:298
 #, no-c-format
 msgid ""
 "If you are not using the m2eclipse plugin, you have to follow different "
@@ -702,38 +358,26 @@
 "activated, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:304
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/wicket/numberguess\n"
-"mvn -Pjetty eclipse:eclipse]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:306
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -> Import... -> General -> "
-"Existing Projects into Workspace</emphasis>, select the root directory of "
-"the numberguess example, and click Finish. This will create a project in "
+"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
+"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
+"of the numberguess example, and click Finish. This will create a project in "
 "your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:318
 #, no-c-format
 msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:325
 #, no-c-format
 msgid "Running the example from Eclipse"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:327
 #, no-c-format
 msgid ""
 "This project follows the <literal>wicket-quickstart</literal> approach of "
@@ -748,13 +392,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:338
 #, no-c-format
 msgid "Running the example from the command line in JBoss AS or Tomcat"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:340
 #, no-c-format
 msgid ""
 "This example can also be deployed from the command line in a (similar to the "
@@ -764,26 +406,12 @@
 "run:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:346
-#, no-c-format
-msgid "<![CDATA[$> ant deploy]]>"
-msgstr "<![CDATA[$> ant deploy]]>"
-
 #. Tag: para
-#: weldexamples.xml:348
 #, no-c-format
 msgid "to deploy the example to JBoss AS, and:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:350
-#, no-c-format
-msgid "<![CDATA[$> ant tomcat.deploy]]>"
-msgstr "<![CDATA[$> ant tomcat.deploy]]>"
-
 #. Tag: para
-#: weldexamples.xml:352
 #, no-c-format
 msgid ""
 "to deploy the example to Tomcat. You can then access application at <ulink "
@@ -792,33 +420,23 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:357
 #, no-c-format
 msgid ""
 "Alternatively, you can run the application in place on an embedded Jetty "
 "container using the following Maven command:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:362
-#, no-c-format
-msgid "<![CDATA[$> mvn jetty:run -Pjetty]]>"
-msgstr "<![CDATA[$> mvn jetty:run -Pjetty]]>"
-
 #. Tag: para
-#: weldexamples.xml:364
 #, no-c-format
 msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:371
 #, no-c-format
 msgid "Understanding the code"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:373
 #, no-c-format
 msgid ""
 "The code in the wicket numberguess example is very similar to the JSF-based "
@@ -832,7 +450,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:382
 #, no-c-format
 msgid ""
 "The integration of Weld with Wicket takes advantage of the same qualifier "
@@ -842,13 +459,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:388
 #, no-c-format
 msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:394
 #, no-c-format
 msgid ""
 "Each wicket application must have a <literal>WeldApplication</literal> "
@@ -856,24 +471,7 @@
 "<literal>NumberGuessApplication</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:398
-#, no-c-format
-msgid ""
-"<![CDATA[public class NumberGuessApplication extends WeldApplication {\n"
-"   @Override public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class NumberGuessApplication extends WeldApplication {\n"
-"   @Override public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-
 #. Tag: para
-#: weldexamples.xml:399
 #, no-c-format
 msgid ""
 "This class specifies which page Wicket should treat as our home page, in our "
@@ -881,7 +479,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:405
 #, no-c-format
 msgid ""
 "In <literal>HomePage</literal>, we see typical Wicket code to set up page "
@@ -889,76 +486,14 @@
 "literal> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:410
-#, no-c-format
-msgid "<![CDATA[@Inject Game game;]]>"
-msgstr "<![CDATA[@Inject Game game;]]>"
-
 #. Tag: para
-#: weldexamples.xml:412
 #, no-c-format
 msgid ""
 "The <literal>Game</literal> bean is can then be used, for example, by the "
 "code for submitting a guess:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:417
-#, no-c-format
-msgid ""
-"<![CDATA[final Component guessButton = new AjaxButton(\"GuessButton\") {\n"
-"   protected void onSubmit(AjaxRequestTarget target, Form form) {\n"
-"      if (game.check()) {\n"
-"         info(\"Correct!\");\n"
-"         setVisible(false);\n"
-"         prompt.setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == 0) {\n"
-"         info(\"Sorry, the answer was \" + game.getNumber());\n"
-"         setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getNumber() > game.getGuess()) {\n"
-"         info(\"Higher!\");\n"
-"      }\n"
-"      else if (game.getNumber() < game.getGuess()) {\n"
-"         info(\"Lower\");\n"
-"      }\n"
-"      target.addComponent(form);\n"
-"   } \n"
-"};      ]]>"
-msgstr ""
-"<![CDATA[final Component guessButton = new AjaxButton(\"GuessButton\") {\n"
-"   protected void onSubmit(AjaxRequestTarget target, Form form) {\n"
-"      if (game.check()) {\n"
-"         info(\"Correct!\");\n"
-"         setVisible(false);\n"
-"         prompt.setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == 0) {\n"
-"         info(\"Sorry, the answer was \" + game.getNumber());\n"
-"         setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getNumber() > game.getGuess()) {\n"
-"         info(\"Higher!\");\n"
-"      }\n"
-"      else if (game.getNumber() < game.getGuess()) {\n"
-"         info(\"Lower\");\n"
-"      }\n"
-"      target.addComponent(form);\n"
-"   } \n"
-"};      ]]>"
-
 #. Tag: para
-#: weldexamples.xml:420
 #, no-c-format
 msgid ""
 "All injections may be serialized; actual storage of the bean is managed by "
@@ -967,7 +502,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:425
 #, no-c-format
 msgid ""
 "Wicket components allow injection, but they <emphasis>cannot</emphasis> use "
@@ -977,7 +511,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:433
 #, no-c-format
 msgid ""
 "The example uses AJAX for processing of button events, and dynamically hides "
@@ -986,7 +519,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:440
 #, no-c-format
 msgid ""
 "In order to activate Wicket for this webapp, the Wicket filter is added to "
@@ -994,44 +526,7 @@
 "<literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:445
-#, no-c-format
-msgid ""
-"<![CDATA[<filter>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-"
-"class>\n"
-"   <init-param>\n"
-"      <param-name>applicationClassName</param-name>\n"
-"      <param-value>org.jboss.weld.examples.wicket.NumberGuessApplication</"
-"param-value>\n"
-"   </init-param>\n"
-"</filter>\n"
-"\n"
-"<filter-mapping>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <url-pattern>/*</url-pattern>\n"
-"</filter-mapping>]]>"
-msgstr ""
-"<![CDATA[<filter>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-"
-"class>\n"
-"   <init-param>\n"
-"      <param-name>applicationClassName</param-name>\n"
-"      <param-value>org.jboss.weld.examples.wicket.NumberGuessApplication</"
-"param-value>\n"
-"   </init-param>\n"
-"</filter>\n"
-"\n"
-"<filter-mapping>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <url-pattern>/*</url-pattern>\n"
-"</filter-mapping>]]>"
-
 #. Tag: para
-#: weldexamples.xml:447
 #, no-c-format
 msgid ""
 "The servlet listener is still required, as in the Tomcat example, to "
@@ -1042,32 +537,12 @@
 "descriptor to be appended to the <literal>web.xml</literal> configuration."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:455
-#, no-c-format
-msgid ""
-"<![CDATA[<web-app version=\"2.4\" ...>\n"
-"   <listener>\n"
-"      <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"   </listener>\n"
-"</web-app>]]>"
-msgstr ""
-"<![CDATA[<web-app version=\"2.4\" ...>\n"
-"   <listener>\n"
-"      <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"   </listener>\n"
-"</web-app>]]>"
-
 #. Tag: title
-#: weldexamples.xml:464
 #, no-c-format
 msgid "The numberguess example for Java SE with Swing"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:466
 #, no-c-format
 msgid ""
 "This example shows how to use the Weld SE extension to in a Java SE based "
@@ -1077,19 +552,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:473
 #, no-c-format
 msgid "To run the example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:479
 #, no-c-format
 msgid "Ensure that Maven 2 (version 2.0.10+) is installed and in your PATH"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:484
 #, no-c-format
 msgid ""
 "Ensure that the <literal>JAVA_HOME</literal> environment variable is "
@@ -1097,7 +569,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:490
 #, no-c-format
 msgid ""
 "Open a command line or terminal window in the <literal>examples/se/"
@@ -1105,19 +576,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:496
 #, no-c-format
 msgid "Execute the following command"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:499
-#, no-c-format
-msgid "mvn -Drun"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:503
 #, no-c-format
 msgid ""
 "Let's have a look at the significant code and configuration files that make "
@@ -1125,7 +588,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:508
 #, no-c-format
 msgid ""
 "As usual, there is an empty <literal>beans.xml</literal> file in the root "
@@ -1134,7 +596,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:514
 #, no-c-format
 msgid ""
 "The game's main logic is located in <literal>Game.java</literal>. Here is "
@@ -1142,293 +603,170 @@
 "the web application version:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:518
+#. Tag: para
 #, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"scope\" coords=\"1\"/> <area id="
-"\"name\" coords=\"2\"/> <area id=\"messages1\" coords=\"26\"/> <area id="
-"\"validation\" coords=\"41\"/> <area id=\"reset\" coords=\"73\"/> </"
-"areaspec> <programlisting role=\"JAVA\"><![CDATA[@ApplicationScoped\n"
-"public class Game\n"
-"{\n"
-"\n"
-"   public static final int MAX_NUM_GUESSES = 10;\n"
-"\n"
-"   private Integer number;\n"
-"   private int guess = 0;\n"
-"   private int smallest = 0;\n"
-"\n"
-"   @Inject\n"
-"   @MaxNumber\n"
-"   private int maxNumber;\n"
-"\n"
-"   private int biggest;\n"
-"   private int remainingGuesses = MAX_NUM_GUESSES;\n"
-"   private boolean validNumberRange = true;\n"
-"\n"
-"   @Inject\n"
-"   Generator rndGenerator;\n"
-"\n"
-"   public Game()\n"
-"   {\n"
-"   }\n"
-"\n"
-"   ...\n"
-"\n"
-"   public boolean isValidNumberRange()\n"
-"   {\n"
-"      return validNumberRange;\n"
-"   }\n"
-"\n"
-"   public boolean isGameWon()\n"
-"   {\n"
-"      return guess == number;\n"
-"   }\n"
-"\n"
-"   public boolean isGameLost()\n"
-"   {\n"
-"      return guess != number && remainingGuesses <= 0;\n"
-"   }\n"
-"\n"
-"   public boolean check()\n"
-"   {\n"
-"      boolean result = false;\n"
-"\n"
-"      if (checkNewNumberRangeIsValid())\n"
-"      {\n"
-"         if (guess > number)\n"
-"         {\n"
-"            biggest = guess - 1;\n"
-"         }\n"
-"\n"
-"         if (guess < number)\n"
-"         {\n"
-"            smallest = guess + 1;\n"
-"         }\n"
-"\n"
-"         if (guess == number)\n"
-"         {\n"
-"            result = true;\n"
-"         }\n"
-"\n"
-"         remainingGuesses--;\n"
-"      }\n"
-"\n"
-"      return result;\n"
-"   }\n"
-"\n"
-"   private boolean checkNewNumberRangeIsValid()\n"
-"   {\n"
-"      return validNumberRange = ((guess >= smallest) && (guess <= "
-"biggest));\n"
-"   }\n"
-"\n"
-"   @PostConstruct\n"
-"   public void reset()\n"
-"   {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = rndGenerator.next();\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"scope\"> <para> The "
-"bean is application scoped rather than session scoped, since an instance of "
-"a Swing application typically represents a single 'session'. </para> </"
-"callout> <callout arearefs=\"name\"> <para> Notice that the bean is not "
-"named, since it doesn't need to be accessed via EL. </para> </callout> "
-"<callout arearefs=\"messages1\"> <para> In Java SE there is no JSF "
-"<literal>FacesContext</literal> to which messages can be added. Instead the "
-"<literal>Game</literal> class provides additional information about the "
-"state of the current game including: </para> <itemizedlist> <listitem> "
-"<para> If the game has been won or lost </para> </listitem> <listitem> "
-"<para> If the most recent guess was invalid </para> </listitem> </"
-"itemizedlist> <para> This allows the Swing UI to query the state of the "
-"game, which it does indirectly via a class called <literal>MessageGenerator</"
-"literal>, in order to determine the appropriate messages to display to the "
-"user during the game. </para> </callout> <callout arearefs=\"validation\"> "
-"<para> Since there is no dedicated validation phase, validation of user "
-"input is performed during the <literal>check()</literal> method. </para> </"
-"callout> <callout arearefs=\"reset\"> <para> The <literal>reset()</literal> "
-"method makes a call to the injected <literal>rndGenerator</literal> in order "
-"to get the random number at the start of each game. Note that it can't use "
-"<literal>Instance.get()</literal> like the JSF example does because there "
-"will not be any active contexts like there are during a JSF request. </para> "
-"</callout> </calloutlist> </programlistingco> <para> The "
-"<literal>MessageGenerator</literal> class depends on the current instance of "
-"<literal>Game</literal> and queries its state in order to determine the "
-"appropriate messages to provide as the prompt for the user's next guess and "
-"the response to the previous guess. The code for <literal>MessageGenerator</"
-"literal> is as follows: </para> <programlistingco> <areaspec> <area id=\"game"
-"\" coords=\"3\"/> <area id=\"challenge\" coords=\"6\"/> <area id=\"result\" "
-"coords=\"17\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA[public "
-"class MessageGenerator\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   public String getChallengeMessage()\n"
-"   {\n"
-"      StringBuilder challengeMsg = new StringBuilder(\"I'm thinking of a "
-"number between \");\n"
-"      challengeMsg.append(game.getSmallest());\n"
-"      challengeMsg.append(\" and \");\n"
-"      challengeMsg.append(game.getBiggest());\n"
-"      challengeMsg.append(\". Can you guess what it is?\");\n"
-"\n"
-"      return challengeMsg.toString();\n"
-"   }\n"
-"\n"
-"   public String getResultMessage()\n"
-"   {\n"
-"      if (game.isGameWon())\n"
-"      {\n"
-"         return \"You guessed it! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (game.isGameLost())\n"
-"      {\n"
-"         return \"You are fail! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (!game.isValidNumberRange())\n"
-"      {\n"
-"         return \"Invalid number range!\";\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == Game.MAX_NUM_GUESSES)\n"
-"      {\n"
-"         return \"What is your first guess?\";\n"
-"      }\n"
-"      else\n"
-"      {\n"
-"         String direction = null;\n"
-"\n"
-"         if (game.getGuess() < game.getNumber())\n"
-"         {\n"
-"            direction = \"Higher\";\n"
-"         }\n"
-"         else\n"
-"         {\n"
-"            direction = \"Lower\";\n"
-"         }\n"
-"\n"
-"         return direction + \"! You have \" + game.getRemainingGuesses() + "
-"\" guesses left.\";\n"
-"      }\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"game\"> <para> The "
-"instance of <literal>Game</literal> for the application is injected here. </"
-"para> </callout> <callout arearefs=\"challenge\"> <para> The <literal>Game</"
-"literal>'s state is interrogated to determine the appropriate challenge "
-"message ... </para> </callout> <callout arearefs=\"result\"> <para> ... and "
-"again to determine whether to congratulate, console or encourage the user to "
-"continue. </para> </callout> </calloutlist> </programlistingco> <para> "
+"The bean is application scoped rather than session scoped, since an instance "
+"of a Swing application typically represents a single 'session'."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Notice that the bean is not named, since it doesn't need to be accessed via "
+"EL."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"In Java SE there is no JSF <literal>FacesContext</literal> to which messages "
+"can be added. Instead the <literal>Game</literal> class provides additional "
+"information about the state of the current game including:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the game has been won or lost"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the most recent guess was invalid"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This allows the Swing UI to query the state of the game, which it does "
+"indirectly via a class called <literal>MessageGenerator</literal>, in order "
+"to determine the appropriate messages to display to the user during the game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Since there is no dedicated validation phase, validation of user input is "
+"performed during the <literal>check()</literal> method."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>reset()</literal> method makes a call to the injected "
+"<literal>rndGenerator</literal> in order to get the random number at the "
+"start of each game. Note that it can't use <literal>Instance.get()</literal> "
+"like the JSF example does because there will not be any active contexts like "
+"there are during a JSF request."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>MessageGenerator</literal> class depends on the current "
+"instance of <literal>Game</literal> and queries its state in order to "
+"determine the appropriate messages to provide as the prompt for the user's "
+"next guess and the response to the previous guess. The code for "
+"<literal>MessageGenerator</literal> is as follows:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The instance of <literal>Game</literal> for the application is injected here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>Game</literal>'s state is interrogated to determine the "
+"appropriate challenge message ..."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"... and again to determine whether to congratulate, console or encourage the "
+"user to continue."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "Finally we come to the <literal>NumberGuessFrame</literal> class which "
-"provides the Swing front end to our guessing game. </para> "
-"<programlistingco> <areaspec> <area id=\"gameIn\" coords=\"3\"/> <area id="
-"\"messagesIn\" coords=\"6\"/> <area id=\"start\" coords=\"9\"/> <area id="
-"\"init\" coords=\"21\"/> <area id=\"guess1\" coords=\"38\"/> <area id="
-"\"replay\" coords=\"48\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA"
-"[public class NumberGuessFrame extends javax.swing.JFrame\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   @Inject\n"
-"   private MessageGenerator msgGenerator;\n"
-"\n"
-"   public void start(@Observes ContainerInitialized event)\n"
-"   {\n"
-"      java.awt.EventQueue.invokeLater(new Runnable()\n"
-"      {\n"
-"         public void run()\n"
-"         {\n"
-"            initComponents();\n"
-"            setVisible(true);\n"
-"         }\n"
-"      });\n"
-"   }\n"
-"\n"
-"   private void initComponents()\n"
-"   {\n"
-"\n"
-"      buttonPanel = new javax.swing.JPanel();\n"
-"      mainMsgPanel = new javax.swing.JPanel();\n"
-"      mainLabel = new javax.swing.JLabel();\n"
-"      messageLabel = new javax.swing.JLabel();\n"
-"      guessText = new javax.swing.JTextField();\n"
-"      ...\n"
-"      mainLabel.setText(msgGenerator.getChallengeMessage());\n"
-"      mainMsgPanel.add(mainLabel);\n"
-"\n"
-"      messageLabel.setText(msgGenerator.getResultMessage());\n"
-"      mainMsgPanel.add(messageLabel);\n"
-"      ...\n"
-"   }\n"
-"\n"
-"   private void guessButtonActionPerformed( java.awt.event.ActionEvent "
-"evt )\n"
-"   {\n"
-"      int guess =  Integer.parseInt(guessText.getText());\n"
-"      game.setGuess( guess );\n"
-"      game.check();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void replayBtnActionPerformed(java.awt.event.ActionEvent evt)\n"
-"   {\n"
-"      game.reset();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void refreshUI() {\n"
-"      mainLabel.setText( msgGenerator.getChallengeMessage() );\n"
-"      messageLabel.setText( msgGenerator.getResultMessage() );\n"
-"      guessText.setText( \"\" );\n"
-"      guessesLeftBar.setValue( game.getRemainingGuesses() );\n"
-"      guessText.requestFocus();\n"
-"   }\n"
-"\n"
-"   // swing components\n"
-"   private javax.swing.JPanel borderPanel;\n"
-"   ...\n"
-"   private javax.swing.JButton replayBtn;\n"
-"\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"gameIn\"> <para> The "
-"injected instance of the game (logic and state). </para> </callout> <callout "
-"arearefs=\"messagesIn\"> <para> The injected message generator for UI "
-"messages. </para> </callout> <callout arearefs=\"start\"> <para> This "
-"application is started in the prescribed Weld SE way, by observing the "
-"<literal>ContainerInitialized</literal> event. </para> </callout> <callout "
-"arearefs=\"init\"> <para> This method initializes all of the Swing "
-"components. Note the use of the <literal>msgGenerator</literal> here. </"
-"para> </callout> <callout arearefs=\"guess1\"> <para> "
+"provides the Swing front end to our guessing game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected instance of the game (logic and state)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected message generator for UI messages."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This application is started in the prescribed Weld SE way, by observing the "
+"<literal>ContainerInitialized</literal> event."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This method initializes all of the Swing components. Note the use of the "
+"<literal>msgGenerator</literal> here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
-"button is clicked, and it does the following: </para> <itemizedlist> "
-"<listitem> <para> Gets the guess entered by the user and sets it as the "
-"current guess in the <literal>Game</literal> </para> </listitem> <listitem> "
-"<para> Calls <literal>game.check()</literal> to validate and perform one "
-"'turn' of the game </para> </listitem> <listitem> <para> Calls "
-"<literal>refreshUI</literal>. If there were validation errors with the "
+"button is clicked, and it does the following:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Gets the guess entered by the user and sets it as the current guess in the "
+"<literal>Game</literal>"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
+"the game"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>refreshUI</literal>. If there were validation errors with the "
 "input, this will have been captured during <literal>game.check()</literal> "
 "and as such will be reflected in the messages returned by "
 "<literal>MessageGenerator</literal> and subsequently presented to the user. "
 "If there are no validation errors then the user will be told to guess again "
 "(higher or lower) or that the game has ended either in a win (correct guess) "
-"or a loss (ran out of guesses). </para> </listitem> </itemizedlist> </"
-"callout> <callout arearefs=\"replay\"> <para> "
+"or a loss (ran out of guesses)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>replayBtnActionPerformed</literal> simply calls <literal>game.reset"
-"()</literal> to start a new game and refreshes the messages in the UI. </"
-"para> </callout> </calloutlist> </programlistingco>"
+"()</literal> to start a new game and refreshes the messages in the UI."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:716
 #, no-c-format
 msgid "The translator example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:718
 #, no-c-format
 msgid ""
 "The translator example will take any sentences you enter, and translate them "
@@ -1437,65 +775,29 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:723
 #, no-c-format
 msgid ""
-"The translator example is built as an EAR and contains EJBs. As a result, "
+"The translator example is built as an ear and contains EJBs. As a result, "
 "it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:729
 #, no-c-format
 msgid ""
-"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a WAR, which "
+"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a war, which "
 "will make this structure much simpler! Still, there are other advantages of "
-"using an EAR."
+"using an ear."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:735
 #, no-c-format
 msgid ""
-"First, let's take a look at the EAR aggregator, which is located in the "
+"First, let's take a look at the ear aggregator, which is located in the "
 "example's <literal>ear</literal> directory. Maven automatically generates "
 "the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:740
-#, no-c-format
-msgid ""
-"<![CDATA[<plugin>\n"
-"   <groupId>org.apache.maven.plugins</groupId>\n"
-"   <artifactId>maven-ear-plugin</artifactId>\n"
-"   <configuration>\n"
-"      <modules>\n"
-"         <webModule>\n"
-"            <groupId>org.jboss.weld.examples.jsf.translator</groupId>\n"
-"            <artifactId>weld-jsf-translator-war</artifactId>\n"
-"            <contextRoot>/weld-translator</contextRoot>\n"
-"         </webModule>\n"
-"      </modules>\n"
-"   </configuration>\n"
-"</plugin>]]>"
-msgstr ""
-"<![CDATA[<plugin>\n"
-"   <groupId>org.apache.maven.plugins</groupId>\n"
-"   <artifactId>maven-ear-plugin</artifactId>\n"
-"   <configuration>\n"
-"      <modules>\n"
-"         <webModule>\n"
-"            <groupId>org.jboss.weld.examples.jsf.translator</groupId>\n"
-"            <artifactId>weld-jsf-translator-war</artifactId>\n"
-"            <contextRoot>/weld-translator</contextRoot>\n"
-"         </webModule>\n"
-"      </modules>\n"
-"   </configuration>\n"
-"</plugin>]]>"
-
 #. Tag: para
-#: weldexamples.xml:742
 #, no-c-format
 msgid ""
 "This configuration overrides the web context path, resulting in this "
@@ -1504,64 +806,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:748
 #, no-c-format
 msgid ""
 "If you weren't using Maven to generate these files, you would need "
 "<literal>META-INF/application.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:753
-#, no-c-format
-msgid ""
-"<![CDATA[<application version=\"5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/application_5.xsd\">\n"
-"\n"
-"  <display-name>weld-jsf-translator-ear</display-name>\n"
-"  <description>The Weld JSF translator example (EAR)</description>\n"
-"  \n"
-"  <module>\n"
-"    <web>\n"
-"      <web-uri>weld-translator.war</web-uri>\n"
-"      <context-root>/weld-translator</context-root>\n"
-"    </web>\n"
-"  </module>\n"
-"  <module>\n"
-"    <ejb>weld-translator.jar</ejb>\n"
-"  </module>\n"
-"</application>]]>"
-msgstr ""
-"<![CDATA[<application version=\"5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/application_5.xsd\">\n"
-"\n"
-"  <display-name>weld-jsf-translator-ear</display-name>\n"
-"  <description>The Weld JSF translator example (EAR)</description>\n"
-"  \n"
-"  <module>\n"
-"    <web>\n"
-"      <web-uri>weld-translator.war</web-uri>\n"
-"      <context-root>/weld-translator</context-root>\n"
-"    </web>\n"
-"  </module>\n"
-"  <module>\n"
-"    <ejb>weld-translator.jar</ejb>\n"
-"  </module>\n"
-"</application>]]>"
-
 #. Tag: para
-#: weldexamples.xml:756
 #, no-c-format
 msgid ""
-"Next, lets look at the WAR, which is located in the example's <literal>war</"
+"Next, lets look at the war, which is located in the example's <literal>war</"
 "literal> directory. Just as in the numberguess example, we have a "
 "<literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</"
 "literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/"
@@ -1569,7 +823,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:762
 #, no-c-format
 msgid ""
 "More interesting is the JSF view used to translate text. Just as in the "
@@ -1577,68 +830,7 @@
 "here for brevity):"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:767
-#, no-c-format
-msgid ""
-"<![CDATA[<h:form id=\"translator\">\n"
-"\n"
-"   <table>\n"
-"      <tr align=\"center\" style=\"font-weight: bold\">\n"
-"         <td>\n"
-"            Your text\n"
-"         </td>\n"
-"         <td>\n"
-"            Translation\n"
-"         </td>\n"
-"      </tr>\n"
-"      <tr>\n"
-"         <td>\n"
-"            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
-"required=\"true\" rows=\"5\" cols=\"80\"/>\n"
-"         </td>\n"
-"         <td>\n"
-"            <h:outputText value=\"#{translator.translatedText}\"/>\n"
-"         </td>\n"
-"      </tr>\n"
-"   </table>\n"
-"   <div>\n"
-"      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
-"{translator.translate}\"/>\n"
-"   </div>\n"
-"   \n"
-"</h:form>]]>"
-msgstr ""
-"<![CDATA[<h:form id=\"translator\">\n"
-"\n"
-"   <table>\n"
-"      <tr align=\"center\" style=\"font-weight: bold\">\n"
-"         <td>\n"
-"            Your text\n"
-"         </td>\n"
-"         <td>\n"
-"            Translation\n"
-"         </td>\n"
-"      </tr>\n"
-"      <tr>\n"
-"         <td>\n"
-"            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
-"required=\"true\" rows=\"5\" cols=\"80\"/>\n"
-"         </td>\n"
-"         <td>\n"
-"            <h:outputText value=\"#{translator.translatedText}\"/>\n"
-"         </td>\n"
-"      </tr>\n"
-"   </table>\n"
-"   <div>\n"
-"      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
-"{translator.translate}\"/>\n"
-"   </div>\n"
-"   \n"
-"</h:form>]]>"
-
 #. Tag: para
-#: weldexamples.xml:769
 #, no-c-format
 msgid ""
 "The user can enter some text in the left-hand textarea, and hit the "
@@ -1646,7 +838,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:774
 #, no-c-format
 msgid ""
 "Finally, let's look at the EJB module, which is located in the example's "
@@ -1656,7 +847,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:780
 #, no-c-format
 msgid ""
 "We've saved the most interesting bit to last, the code! The project has two "
@@ -1668,7 +858,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:787
 #, no-c-format
 msgid ""
 "Both <literal>SentenceParser</literal> and <literal>TextTranslator</literal> "
@@ -1676,52 +865,7 @@
 "injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:792
-#, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator implements Serializable { \n"
-"\n"
-"   private SentenceParser sentenceParser; \n"
-"\n"
-"   @EJB private Translator translator; \n"
-"   \n"
-"   @Inject public TextTranslator(SentenceParser sentenceParser) { \n"
-"      this.sentenceParser = sentenceParser; \n"
-"   }\n"
-"   \n"
-"   public String translate(String text) { \n"
-"      StringBuilder sb = new StringBuilder(); \n"
-"      for (String sentence: sentenceParser.parse(text)) { \n"
-"         sb.append(translator.translate(sentence)).append(\". \"); \n"
-"      } \n"
-"      return sb.toString().trim(); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TextTranslator implements Serializable { \n"
-"\n"
-"   private SentenceParser sentenceParser; \n"
-"\n"
-"   @EJB private Translator translator; \n"
-"   \n"
-"   @Inject public TextTranslator(SentenceParser sentenceParser) { \n"
-"      this.sentenceParser = sentenceParser; \n"
-"   }\n"
-"   \n"
-"   public String translate(String text) { \n"
-"      StringBuilder sb = new StringBuilder(); \n"
-"      for (String sentence: sentenceParser.parse(text)) { \n"
-"         sb.append(translator.translate(sentence)).append(\". \"); \n"
-"      } \n"
-"      return sb.toString().trim(); \n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: weldexamples.xml:794
 #, no-c-format
 msgid ""
 "<literal>TextTranslator</literal> uses the simple bean (really just a plain "
@@ -1732,30 +876,7 @@
 "convincing enough to anyone who doesn't understand Latin!"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:802
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator { \n"
-"\n"
-"   public String translate(String sentence) { \n"
-"      return \"Lorem ipsum dolor sit amet\"; \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator { \n"
-"\n"
-"   public String translate(String sentence) { \n"
-"      return \"Lorem ipsum dolor sit amet\"; \n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: weldexamples.xml:804
 #, no-c-format
 msgid ""
 "Finally, there is UI orientated controller. This is a request scoped, named, "
@@ -1764,77 +885,648 @@
 "and setters for all the fields on the page."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:810
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"@RequestScoped\n"
-"@Named(\"translator\")\n"
-"public class TranslatorControllerBean implements TranslatorController {\n"
-"\n"
-"   @Inject private TextTranslator translator;\n"
-"   \n"
-"   private String inputText;\n"
-"   \n"
-"   private String translatedText;\n"
-"   \n"
-"   public void translate() {\n"
-"      translatedText = translator.translate(inputText);\n"
-"   }\n"
-"   \n"
-"   public String getText() {\n"
-"      return inputText;\n"
-"   }\n"
-"   \n"
-"   public void setText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"   \n"
-"   public String getTranslatedText() {\n"
-"      return translatedText;\n"
-"   }\n"
-"   \n"
-"   @Remove public void remove() {}\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateful\n"
-"@RequestScoped\n"
-"@Named(\"translator\")\n"
-"public class TranslatorControllerBean implements TranslatorController {\n"
-"\n"
-"   @Inject private TextTranslator translator;\n"
-"   \n"
-"   private String inputText;\n"
-"   \n"
-"   private String translatedText;\n"
-"   \n"
-"   public void translate() {\n"
-"      translatedText = translator.translate(inputText);\n"
-"   }\n"
-"   \n"
-"   public String getText() {\n"
-"      return inputText;\n"
-"   }\n"
-"   \n"
-"   public void setText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"   \n"
-"   public String getTranslatedText() {\n"
-"      return translatedText;\n"
-"   }\n"
-"   \n"
-"   @Remove public void remove() {}\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: weldexamples.xml:814
 #, no-c-format
 msgid ""
 "That concludes our short tour of the Weld starter examples. For more "
 "information on Weld, please visit <ulink url=\"http://www.seamframework.org/"
 "Weld\">http://www.seamframework.org/Weld</ulink>."
 msgstr ""
+
+#~ msgid ""
+#~ "<![CDATA[<faces-config version=\"2.0\"\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd\">\n"
+#~ "</faces-config>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<faces-config version=\"2.0\"\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd\">\n"
+#~ "</faces-config>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Random {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Random {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface MaxNumber {}\n"
+#~ "]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface MaxNumber {}\n"
+#~ "]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped\n"
+#~ "public class Generator implements Serializable {\n"
+#~ "\n"
+#~ "   private java.util.Random random = new java.util.Random(System."
+#~ "currentTimeMillis());\n"
+#~ "   \n"
+#~ "   private int maxNumber = 100;\n"
+#~ "   \n"
+#~ "   java.util.Random getRandom() {\n"
+#~ "      return random;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Produces @Random int next() { \n"
+#~ "      return getRandom().nextInt(maxNumber); \n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Produces @MaxNumber int getMaxNumber() {\n"
+#~ "      return maxNumber;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped\n"
+#~ "public class Generator implements Serializable {\n"
+#~ "\n"
+#~ "   private java.util.Random random = new java.util.Random(System."
+#~ "currentTimeMillis());\n"
+#~ "   \n"
+#~ "   private int maxNumber = 100;\n"
+#~ "   \n"
+#~ "   java.util.Random getRandom() {\n"
+#~ "      return random;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Produces @Random int next() { \n"
+#~ "      return getRandom().nextInt(maxNumber); \n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Produces @MaxNumber int getMaxNumber() {\n"
+#~ "      return maxNumber;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Named\n"
+#~ "@SessionScoped\n"
+#~ "public class Game implements Serializable {\n"
+#~ "\n"
+#~ "   private int number;\n"
+#~ "   private int guess;\n"
+#~ "   private int smallest;\n"
+#~ "   private int biggest;\n"
+#~ "   private int remainingGuesses;\n"
+#~ "\n"
+#~ "   @Inject @MaxNumber private int maxNumber;\n"
+#~ "   @Inject @Random Instance<Integer> randomNumber;\n"
+#~ "   \n"
+#~ "   public Game() {}\n"
+#~ "   \n"
+#~ "   public void check() {\n"
+#~ "      if (guess > number) {\n"
+#~ "         biggest = guess - 1;\n"
+#~ "      }\n"
+#~ "      else if (guess < number) {\n"
+#~ "         smallest = guess + 1;\n"
+#~ "      }\n"
+#~ "      else if (guess == number) {\n"
+#~ "         FacesContext.getCurrentInstance().addMessage(null, new "
+#~ "FacesMessage(\"Correct!\"));\n"
+#~ "      }\n"
+#~ "      remainingGuesses--;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @PostConstruct\n"
+#~ "   public void reset() {\n"
+#~ "      this.smallest = 0;\n"
+#~ "      this.guess = 0;\n"
+#~ "      this.remainingGuesses = 10;\n"
+#~ "      this.biggest = maxNumber;\n"
+#~ "      this.number = randomNumber.get();\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void validateNumberRange(FacesContext context,  UIComponent "
+#~ "toValidate, Object value) {\n"
+#~ "      if (remainingGuesses <= 0) {\n"
+#~ "         FacesMessage message = new FacesMessage(\"No guesses left!\");\n"
+#~ "         context.addMessage(toValidate.getClientId(context), message);\n"
+#~ "         ((UIInput) toValidate).setValid(false);\n"
+#~ "         return;\n"
+#~ "      }\n"
+#~ "      int input = (Integer) value;\n"
+#~ "\n"
+#~ "      if (input < smallest || input > biggest) {\n"
+#~ "         ((UIInput) toValidate).setValid(false);\n"
+#~ "\n"
+#~ "         FacesMessage message = new FacesMessage(\"Invalid guess\");\n"
+#~ "         context.addMessage(toValidate.getClientId(context), message);\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public int getNumber() {\n"
+#~ "      return number;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getGuess() {\n"
+#~ "      return guess;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void setGuess(int guess) {\n"
+#~ "      this.guess = guess;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getSmallest() {\n"
+#~ "      return smallest;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getBiggest() {\n"
+#~ "      return biggest;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getRemainingGuesses() {\n"
+#~ "      return remainingGuesses;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named\n"
+#~ "@SessionScoped\n"
+#~ "public class Game implements Serializable {\n"
+#~ "\n"
+#~ "   private int number;\n"
+#~ "   private int guess;\n"
+#~ "   private int smallest;\n"
+#~ "   private int biggest;\n"
+#~ "   private int remainingGuesses;\n"
+#~ "\n"
+#~ "   @Inject @MaxNumber private int maxNumber;\n"
+#~ "   @Inject @Random Instance<Integer> randomNumber;\n"
+#~ "   \n"
+#~ "   public Game() {}\n"
+#~ "   \n"
+#~ "   public void check() {\n"
+#~ "      if (guess > number) {\n"
+#~ "         biggest = guess - 1;\n"
+#~ "      }\n"
+#~ "      else if (guess < number) {\n"
+#~ "         smallest = guess + 1;\n"
+#~ "      }\n"
+#~ "      else if (guess == number) {\n"
+#~ "         FacesContext.getCurrentInstance().addMessage(null, new "
+#~ "FacesMessage(\"Correct!\"));\n"
+#~ "      }\n"
+#~ "      remainingGuesses--;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @PostConstruct\n"
+#~ "   public void reset() {\n"
+#~ "      this.smallest = 0;\n"
+#~ "      this.guess = 0;\n"
+#~ "      this.remainingGuesses = 10;\n"
+#~ "      this.biggest = maxNumber;\n"
+#~ "      this.number = randomNumber.get();\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void validateNumberRange(FacesContext context,  UIComponent "
+#~ "toValidate, Object value) {\n"
+#~ "      if (remainingGuesses <= 0) {\n"
+#~ "         FacesMessage message = new FacesMessage(\"No guesses left!\");\n"
+#~ "         context.addMessage(toValidate.getClientId(context), message);\n"
+#~ "         ((UIInput) toValidate).setValid(false);\n"
+#~ "         return;\n"
+#~ "      }\n"
+#~ "      int input = (Integer) value;\n"
+#~ "\n"
+#~ "      if (input < smallest || input > biggest) {\n"
+#~ "         ((UIInput) toValidate).setValid(false);\n"
+#~ "\n"
+#~ "         FacesMessage message = new FacesMessage(\"Invalid guess\");\n"
+#~ "         context.addMessage(toValidate.getClientId(context), message);\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public int getNumber() {\n"
+#~ "      return number;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getGuess() {\n"
+#~ "      return guess;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void setGuess(int guess) {\n"
+#~ "      this.guess = guess;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getSmallest() {\n"
+#~ "      return smallest;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getBiggest() {\n"
+#~ "      return biggest;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getRemainingGuesses() {\n"
+#~ "      return remainingGuesses;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<listener>\n"
+#~ "   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
+#~ "class>\n"
+#~ "</listener>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<listener>\n"
+#~ "   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
+#~ "class>\n"
+#~ "</listener>]]>"
+
+#~ msgid "<![CDATA[$> ant deploy]]>"
+#~ msgstr "<![CDATA[$> ant deploy]]>"
+
+#~ msgid "<![CDATA[$> ant tomcat.deploy]]>"
+#~ msgstr "<![CDATA[$> ant tomcat.deploy]]>"
+
+#~ msgid "<![CDATA[$> mvn jetty:run -Pjetty]]>"
+#~ msgstr "<![CDATA[$> mvn jetty:run -Pjetty]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class NumberGuessApplication extends WeldApplication {\n"
+#~ "   @Override public Class getHomePage() {\n"
+#~ "      return HomePage.class;\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class NumberGuessApplication extends WeldApplication {\n"
+#~ "   @Override public Class getHomePage() {\n"
+#~ "      return HomePage.class;\n"
+#~ "   }\n"
+#~ "}]]>"
+
+#~ msgid "<![CDATA[@Inject Game game;]]>"
+#~ msgstr "<![CDATA[@Inject Game game;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[final Component guessButton = new AjaxButton(\"GuessButton\") {\n"
+#~ "   protected void onSubmit(AjaxRequestTarget target, Form form) {\n"
+#~ "      if (game.check()) {\n"
+#~ "         info(\"Correct!\");\n"
+#~ "         setVisible(false);\n"
+#~ "         prompt.setVisible(false);\n"
+#~ "         guessLabel.setVisible(false);\n"
+#~ "         inputGuess.setVisible(false);\n"
+#~ "      }\n"
+#~ "      else if (game.getRemainingGuesses() == 0) {\n"
+#~ "         info(\"Sorry, the answer was \" + game.getNumber());\n"
+#~ "         setVisible(false);\n"
+#~ "         guessLabel.setVisible(false);\n"
+#~ "         inputGuess.setVisible(false);\n"
+#~ "      }\n"
+#~ "      else if (game.getNumber() > game.getGuess()) {\n"
+#~ "         info(\"Higher!\");\n"
+#~ "      }\n"
+#~ "      else if (game.getNumber() < game.getGuess()) {\n"
+#~ "         info(\"Lower\");\n"
+#~ "      }\n"
+#~ "      target.addComponent(form);\n"
+#~ "   } \n"
+#~ "};      ]]>"
+#~ msgstr ""
+#~ "<![CDATA[final Component guessButton = new AjaxButton(\"GuessButton\") {\n"
+#~ "   protected void onSubmit(AjaxRequestTarget target, Form form) {\n"
+#~ "      if (game.check()) {\n"
+#~ "         info(\"Correct!\");\n"
+#~ "         setVisible(false);\n"
+#~ "         prompt.setVisible(false);\n"
+#~ "         guessLabel.setVisible(false);\n"
+#~ "         inputGuess.setVisible(false);\n"
+#~ "      }\n"
+#~ "      else if (game.getRemainingGuesses() == 0) {\n"
+#~ "         info(\"Sorry, the answer was \" + game.getNumber());\n"
+#~ "         setVisible(false);\n"
+#~ "         guessLabel.setVisible(false);\n"
+#~ "         inputGuess.setVisible(false);\n"
+#~ "      }\n"
+#~ "      else if (game.getNumber() > game.getGuess()) {\n"
+#~ "         info(\"Higher!\");\n"
+#~ "      }\n"
+#~ "      else if (game.getNumber() < game.getGuess()) {\n"
+#~ "         info(\"Lower\");\n"
+#~ "      }\n"
+#~ "      target.addComponent(form);\n"
+#~ "   } \n"
+#~ "};      ]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<filter>\n"
+#~ "   <filter-name>Wicket Filter</filter-name>\n"
+#~ "   <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-"
+#~ "class>\n"
+#~ "   <init-param>\n"
+#~ "      <param-name>applicationClassName</param-name>\n"
+#~ "      <param-value>org.jboss.weld.examples.wicket.NumberGuessApplication</"
+#~ "param-value>\n"
+#~ "   </init-param>\n"
+#~ "</filter>\n"
+#~ "\n"
+#~ "<filter-mapping>\n"
+#~ "   <filter-name>Wicket Filter</filter-name>\n"
+#~ "   <url-pattern>/*</url-pattern>\n"
+#~ "</filter-mapping>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<filter>\n"
+#~ "   <filter-name>Wicket Filter</filter-name>\n"
+#~ "   <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-"
+#~ "class>\n"
+#~ "   <init-param>\n"
+#~ "      <param-name>applicationClassName</param-name>\n"
+#~ "      <param-value>org.jboss.weld.examples.wicket.NumberGuessApplication</"
+#~ "param-value>\n"
+#~ "   </init-param>\n"
+#~ "</filter>\n"
+#~ "\n"
+#~ "<filter-mapping>\n"
+#~ "   <filter-name>Wicket Filter</filter-name>\n"
+#~ "   <url-pattern>/*</url-pattern>\n"
+#~ "</filter-mapping>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<web-app version=\"2.4\" ...>\n"
+#~ "   <listener>\n"
+#~ "      <listener-class>org.jboss.weld.environment.servlet.Listener</"
+#~ "listener-class>\n"
+#~ "   </listener>\n"
+#~ "</web-app>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<web-app version=\"2.4\" ...>\n"
+#~ "   <listener>\n"
+#~ "      <listener-class>org.jboss.weld.environment.servlet.Listener</"
+#~ "listener-class>\n"
+#~ "   </listener>\n"
+#~ "</web-app>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<plugin>\n"
+#~ "   <groupId>org.apache.maven.plugins</groupId>\n"
+#~ "   <artifactId>maven-ear-plugin</artifactId>\n"
+#~ "   <configuration>\n"
+#~ "      <modules>\n"
+#~ "         <webModule>\n"
+#~ "            <groupId>org.jboss.weld.examples.jsf.translator</groupId>\n"
+#~ "            <artifactId>weld-jsf-translator-war</artifactId>\n"
+#~ "            <contextRoot>/weld-translator</contextRoot>\n"
+#~ "         </webModule>\n"
+#~ "      </modules>\n"
+#~ "   </configuration>\n"
+#~ "</plugin>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<plugin>\n"
+#~ "   <groupId>org.apache.maven.plugins</groupId>\n"
+#~ "   <artifactId>maven-ear-plugin</artifactId>\n"
+#~ "   <configuration>\n"
+#~ "      <modules>\n"
+#~ "         <webModule>\n"
+#~ "            <groupId>org.jboss.weld.examples.jsf.translator</groupId>\n"
+#~ "            <artifactId>weld-jsf-translator-war</artifactId>\n"
+#~ "            <contextRoot>/weld-translator</contextRoot>\n"
+#~ "         </webModule>\n"
+#~ "      </modules>\n"
+#~ "   </configuration>\n"
+#~ "</plugin>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<application version=\"5\"\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/application_5.xsd\">\n"
+#~ "\n"
+#~ "  <display-name>weld-jsf-translator-ear</display-name>\n"
+#~ "  <description>The Weld JSF translator example (EAR)</description>\n"
+#~ "  \n"
+#~ "  <module>\n"
+#~ "    <web>\n"
+#~ "      <web-uri>weld-translator.war</web-uri>\n"
+#~ "      <context-root>/weld-translator</context-root>\n"
+#~ "    </web>\n"
+#~ "  </module>\n"
+#~ "  <module>\n"
+#~ "    <ejb>weld-translator.jar</ejb>\n"
+#~ "  </module>\n"
+#~ "</application>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<application version=\"5\"\n"
+#~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"\n"
+#~ "      http://java.sun.com/xml/ns/javaee\n"
+#~ "      http://java.sun.com/xml/ns/javaee/application_5.xsd\">\n"
+#~ "\n"
+#~ "  <display-name>weld-jsf-translator-ear</display-name>\n"
+#~ "  <description>The Weld JSF translator example (EAR)</description>\n"
+#~ "  \n"
+#~ "  <module>\n"
+#~ "    <web>\n"
+#~ "      <web-uri>weld-translator.war</web-uri>\n"
+#~ "      <context-root>/weld-translator</context-root>\n"
+#~ "    </web>\n"
+#~ "  </module>\n"
+#~ "  <module>\n"
+#~ "    <ejb>weld-translator.jar</ejb>\n"
+#~ "  </module>\n"
+#~ "</application>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<h:form id=\"translator\">\n"
+#~ "\n"
+#~ "   <table>\n"
+#~ "      <tr align=\"center\" style=\"font-weight: bold\">\n"
+#~ "         <td>\n"
+#~ "            Your text\n"
+#~ "         </td>\n"
+#~ "         <td>\n"
+#~ "            Translation\n"
+#~ "         </td>\n"
+#~ "      </tr>\n"
+#~ "      <tr>\n"
+#~ "         <td>\n"
+#~ "            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
+#~ "required=\"true\" rows=\"5\" cols=\"80\"/>\n"
+#~ "         </td>\n"
+#~ "         <td>\n"
+#~ "            <h:outputText value=\"#{translator.translatedText}\"/>\n"
+#~ "         </td>\n"
+#~ "      </tr>\n"
+#~ "   </table>\n"
+#~ "   <div>\n"
+#~ "      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
+#~ "{translator.translate}\"/>\n"
+#~ "   </div>\n"
+#~ "   \n"
+#~ "</h:form>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<h:form id=\"translator\">\n"
+#~ "\n"
+#~ "   <table>\n"
+#~ "      <tr align=\"center\" style=\"font-weight: bold\">\n"
+#~ "         <td>\n"
+#~ "            Your text\n"
+#~ "         </td>\n"
+#~ "         <td>\n"
+#~ "            Translation\n"
+#~ "         </td>\n"
+#~ "      </tr>\n"
+#~ "      <tr>\n"
+#~ "         <td>\n"
+#~ "            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
+#~ "required=\"true\" rows=\"5\" cols=\"80\"/>\n"
+#~ "         </td>\n"
+#~ "         <td>\n"
+#~ "            <h:outputText value=\"#{translator.translatedText}\"/>\n"
+#~ "         </td>\n"
+#~ "      </tr>\n"
+#~ "   </table>\n"
+#~ "   <div>\n"
+#~ "      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
+#~ "{translator.translate}\"/>\n"
+#~ "   </div>\n"
+#~ "   \n"
+#~ "</h:form>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public class TextTranslator implements Serializable { \n"
+#~ "\n"
+#~ "   private SentenceParser sentenceParser; \n"
+#~ "\n"
+#~ "   @EJB private Translator translator; \n"
+#~ "   \n"
+#~ "   @Inject public TextTranslator(SentenceParser sentenceParser) { \n"
+#~ "      this.sentenceParser = sentenceParser; \n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public String translate(String text) { \n"
+#~ "      StringBuilder sb = new StringBuilder(); \n"
+#~ "      for (String sentence: sentenceParser.parse(text)) { \n"
+#~ "         sb.append(translator.translate(sentence)).append(\". \"); \n"
+#~ "      } \n"
+#~ "      return sb.toString().trim(); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TextTranslator implements Serializable { \n"
+#~ "\n"
+#~ "   private SentenceParser sentenceParser; \n"
+#~ "\n"
+#~ "   @EJB private Translator translator; \n"
+#~ "   \n"
+#~ "   @Inject public TextTranslator(SentenceParser sentenceParser) { \n"
+#~ "      this.sentenceParser = sentenceParser; \n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public String translate(String text) { \n"
+#~ "      StringBuilder sb = new StringBuilder(); \n"
+#~ "      for (String sentence: sentenceParser.parse(text)) { \n"
+#~ "         sb.append(translator.translate(sentence)).append(\". \"); \n"
+#~ "      } \n"
+#~ "      return sb.toString().trim(); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator { \n"
+#~ "\n"
+#~ "   public String translate(String sentence) { \n"
+#~ "      return \"Lorem ipsum dolor sit amet\"; \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator { \n"
+#~ "\n"
+#~ "   public String translate(String sentence) { \n"
+#~ "      return \"Lorem ipsum dolor sit amet\"; \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Stateful\n"
+#~ "@RequestScoped\n"
+#~ "@Named(\"translator\")\n"
+#~ "public class TranslatorControllerBean implements TranslatorController {\n"
+#~ "\n"
+#~ "   @Inject private TextTranslator translator;\n"
+#~ "   \n"
+#~ "   private String inputText;\n"
+#~ "   \n"
+#~ "   private String translatedText;\n"
+#~ "   \n"
+#~ "   public void translate() {\n"
+#~ "      translatedText = translator.translate(inputText);\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public String getText() {\n"
+#~ "      return inputText;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void setText(String text) {\n"
+#~ "      this.inputText = text;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public String getTranslatedText() {\n"
+#~ "      return translatedText;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Remove public void remove() {}\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateful\n"
+#~ "@RequestScoped\n"
+#~ "@Named(\"translator\")\n"
+#~ "public class TranslatorControllerBean implements TranslatorController {\n"
+#~ "\n"
+#~ "   @Inject private TextTranslator translator;\n"
+#~ "   \n"
+#~ "   private String inputText;\n"
+#~ "   \n"
+#~ "   private String translatedText;\n"
+#~ "   \n"
+#~ "   public void translate() {\n"
+#~ "      translatedText = translator.translate(inputText);\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public String getText() {\n"
+#~ "      return inputText;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void setText(String text) {\n"
+#~ "      this.inputText = text;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public String getTranslatedText() {\n"
+#~ "      return translatedText;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Remove public void remove() {}\n"
+#~ "\n"
+#~ "}]]>"

Modified: doc/trunk/reference/pt-BR/xml.po
===================================================================
--- doc/trunk/reference/pt-BR/xml.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/pt-BR/xml.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-12-19 18:03-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -14,337 +14,396 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: xml.xml:5
 #, fuzzy, no-c-format
 msgid "Defining beans using XML"
 msgstr "Definindo Web Beans utilizando XML"
 
 #. Tag: para
-#: xml.xml:7
 #, fuzzy, no-c-format
-msgid "So far, we've seen plenty of examples of beans declared using annotations. However, there are a couple of occasions when we can't use annotations to define the bean:"
-msgstr "Até agora,vimos muitos exemplos de declaração de Web Beans usando anotações. No entanto, há várias situações em que não podemos usar anotações para definir um Web Bean:"
+msgid ""
+"So far, we've seen plenty of examples of beans declared using annotations. "
+"However, there are a couple of occasions when we can't use annotations to "
+"define the bean:"
+msgstr ""
+"Até agora,vimos muitos exemplos de declaração de Web Beans usando anotações. "
+"No entanto, há várias situações em que não podemos usar anotações para "
+"definir um Web Bean:"
 
 #. Tag: para
-#: xml.xml:14
 #, no-c-format
 msgid "when the implementation class comes from some preexisting library, or"
-msgstr "quando a classe de implementação vem de alguma biblioteca preexistente, ou"
+msgstr ""
+"quando a classe de implementação vem de alguma biblioteca preexistente, ou"
 
 #. Tag: para
-#: xml.xml:19
 #, fuzzy, no-c-format
 msgid "when there should be multiple beans with the same implementation class."
-msgstr "quando deveria haver vários Web Beans com a mesma classe de implementação."
+msgstr ""
+"quando deveria haver vários Web Beans com a mesma classe de implementação."
 
 #. Tag: para
-#: xml.xml:25
 #, no-c-format
-msgid "One way to address these problems is to write a producer method. Weld offers another option: declare the bean using XML. This feature will hopefully one day be part of the CDI specification. Until then, it remains a portable extension."
+msgid ""
+"One way to address these problems is to write a producer method. Weld offers "
+"another option: declare the bean using XML. This feature will hopefully one "
+"day be part of the CDI specification. Until then, it remains a portable "
+"extension."
 msgstr ""
 
 #. Tag: para
-#: xml.xml:31
 #, fuzzy, no-c-format
-msgid "Many frameworks use XML to provide metadata relating to Java classes. However, Weld uses a very different approach to specifying the names of Java classes, fields or methods to most other frameworks. Instead of writing class and member names as the string values of XML elements and attributes, Weld lets you use the class or member name as the name of the XML element."
-msgstr "Muitos frameworks usam XML para fornecer metadados relativos às classes Java. No entanto, Web Beans utiliza uma abordagem muito diferente para especificar os nomes de classes Java, atributos ou métodos dos outros frameworks. Em vez de escrever os nomes das classes e dos membros ( como uma String de valores em elementos e atributos XML), Web Beans permite que você use o nome da classe ou membro como o nome do elemento XML."
+msgid ""
+"Many frameworks use XML to provide metadata relating to Java classes. "
+"However, Weld uses a very different approach to specifying the names of Java "
+"classes, fields or methods to most other frameworks. Instead of writing "
+"class and member names as the string values of XML elements and attributes, "
+"Weld lets you use the class or member name as the name of the XML element."
+msgstr ""
+"Muitos frameworks usam XML para fornecer metadados relativos às classes "
+"Java. No entanto, Web Beans utiliza uma abordagem muito diferente para "
+"especificar os nomes de classes Java, atributos ou métodos dos outros "
+"frameworks. Em vez de escrever os nomes das classes e dos membros ( como uma "
+"String de valores em elementos e atributos XML), Web Beans permite que você "
+"use o nome da classe ou membro como o nome do elemento XML."
 
 #. Tag: para
-#: xml.xml:38
 #, no-c-format
-msgid "The advantage of this approach is that you can write an XML schema that prevents spelling errors in your XML document. It's even possible for a tool to generate the XML schema automatically from the compiled Java code. Or, an integrated development environment could perform the same validation without the need for the explicit intermediate generation step."
-msgstr "A vantagem dessa abordagem é que você pode escrever um esquema XML (XML schema) que evita erros ortográficos no seu documento XML. É até mesmo possível para uma ferramenta gerar o esquema XML (XML schema) automaticamente, a partir do código Java compilad.Ou, um ambiente integrado de desenvolvimento poderia fazer a mesma validação sem a necessidade explicíta do passo intermediário de geração."
+msgid ""
+"The advantage of this approach is that you can write an XML schema that "
+"prevents spelling errors in your XML document. It's even possible for a tool "
+"to generate the XML schema automatically from the compiled Java code. Or, an "
+"integrated development environment could perform the same validation without "
+"the need for the explicit intermediate generation step."
+msgstr ""
+"A vantagem dessa abordagem é que você pode escrever um esquema XML (XML "
+"schema) que evita erros ortográficos no seu documento XML. É até mesmo "
+"possível para uma ferramenta gerar o esquema XML (XML schema) "
+"automaticamente, a partir do código Java compilad.Ou, um ambiente integrado "
+"de desenvolvimento poderia fazer a mesma validação sem a necessidade "
+"explicíta do passo intermediário de geração."
 
 #. Tag: title
-#: xml.xml:46
 #, fuzzy, no-c-format
 msgid "Declaring beans"
 msgstr "Declarando classes Web Beans"
 
 #. Tag: para
-#: xml.xml:48
 #, fuzzy, no-c-format
-msgid "For each Java package, Weld defines a corresponding XML namespace. The namespace is formed by prepending <literal>urn:java:</literal> to the Java package name. For the package <literal>com.mydomain.myapp</literal>, the XML namespace is <literal>urn:java:com.mydomain.myapp</literal>."
-msgstr "Para cada pacote Java, Web Beans define um namespace XML correspondente. O nome é formado precedendo <literal>urn:java:</literal> ao nome do pacote Java. Para o pacote <literal>com.mydomain.myapp</literal>, o namespace XML é <literal>urn:java:com.mydomain.myapp</literal>."
+msgid ""
+"For each Java package, Weld defines a corresponding XML namespace. The "
+"namespace is formed by prepending <literal>urn:java:</literal> to the Java "
+"package name. For the package <literal>com.mydomain.myapp</literal>, the XML "
+"namespace is <literal>urn:java:com.mydomain.myapp</literal>."
+msgstr ""
+"Para cada pacote Java, Web Beans define um namespace XML correspondente. O "
+"nome é formado precedendo <literal>urn:java:</literal> ao nome do pacote "
+"Java. Para o pacote <literal>com.mydomain.myapp</literal>, o namespace XML é "
+"<literal>urn:java:com.mydomain.myapp</literal>."
 
 #. Tag: para
-#: xml.xml:54
 #, no-c-format
-msgid "Java types belonging to a package are referred to using an XML element in the namespace corresponding to the package. The name of the element is the name of the Java type. Fields and methods of the type are specified by child elements in the same namespace. If the type is an annotation, members are specified by attributes of the element."
-msgstr "Tipos Java pertencentes a um pacote são referenciados a utilizar um elemento XML no namespace correspondente ao pacote. O nome do elemento é o nome do tipo Java. Atributos e métodos do tipo são especificados por elementos filhos do mesmo namespace. Se o tipo for uma anotação, os membros são definidos por atributos do elemento."
+msgid ""
+"Java types belonging to a package are referred to using an XML element in "
+"the namespace corresponding to the package. The name of the element is the "
+"name of the Java type. Fields and methods of the type are specified by child "
+"elements in the same namespace. If the type is an annotation, members are "
+"specified by attributes of the element."
+msgstr ""
+"Tipos Java pertencentes a um pacote são referenciados a utilizar um elemento "
+"XML no namespace correspondente ao pacote. O nome do elemento é o nome do "
+"tipo Java. Atributos e métodos do tipo são especificados por elementos "
+"filhos do mesmo namespace. Se o tipo for uma anotação, os membros são "
+"definidos por atributos do elemento."
 
 #. Tag: para
-#: xml.xml:61
 #, no-c-format
-msgid "For example, the element <literal>&lt;util:Date/&gt;</literal> in the following XML fragment refers to the class <literal>java.util.Date</literal>:"
-msgstr "Por exemplo, o elemento <literal>&lt;util:Date/&gt;</literal> no seguinte fragmento XML refere-se à classe <literal>java.util.Date</literal>:"
-
-#. Tag: programlisting
-#: xml.xml:66
-#, no-c-format
 msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:util=\"urn:java:java.util\">\n"
-"   <util:Date/>\n"
-"</beans>]]>"
+"For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
+"following XML fragment refers to the class <literal>java.util.Date</literal>:"
 msgstr ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:util=\"urn:java:java.util\">\n"
-"   <util:Date/>\n"
-"</beans>]]>"
+"Por exemplo, o elemento <literal>&lt;util:Date/&gt;</literal> no seguinte "
+"fragmento XML refere-se à classe <literal>java.util.Date</literal>:"
 
 #. Tag: para
-#: xml.xml:68
 #, fuzzy, no-c-format
-msgid "And this is all the code we need to declare that <literal>Date</literal> is a bean! An instance of <literal>Date</literal> may now be injected by any other bean:"
-msgstr "E esse é todo o código necessário para declarar que <literal>Date</literal> é um simples Web Bean! Uma instância de <literal>Date</literal> pode agora ser injetada por qualquer outro Web Bean:"
+msgid ""
+"And this is all the code we need to declare that <literal>Date</literal> is "
+"a bean! An instance of <literal>Date</literal> may now be injected by any "
+"other bean:"
+msgstr ""
+"E esse é todo o código necessário para declarar que <literal>Date</literal> "
+"é um simples Web Bean! Uma instância de <literal>Date</literal> pode agora "
+"ser injetada por qualquer outro Web Bean:"
 
-#. Tag: programlisting
-#: xml.xml:73
-#, no-c-format
-msgid "<![CDATA[private @Inject Date date;]]>"
-msgstr "<![CDATA[private @Inject Date date;]]>"
-
 #. Tag: title
-#: xml.xml:78
 #, fuzzy, no-c-format
 msgid "Declaring bean metadata"
 msgstr "Declarando metadados Web Bean"
 
 #. Tag: para
-#: xml.xml:80
 #, fuzzy, no-c-format
-msgid "We can declare the scope, deployment type and interceptor binding types using direct child elements of the bean declaration:"
-msgstr "Podemos declarar o escopo, tipo de puplicação (deployment type) e tipo de ligação de interceptador (interceptor binding types) com a utilização direta de elementos filhos na declaração do Web Bean:"
-
-#. Tag: programlisting
-#: xml.xml:85
-#, no-c-format
 msgid ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"   <SessionScoped/>\n"
-"   <myfwk:Transactional requiresNew=\"true\"/>\n"
-"   <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
+"We can declare the scope, deployment type and interceptor binding types "
+"using direct child elements of the bean declaration:"
 msgstr ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"   <SessionScoped/>\n"
-"   <myfwk:Transactional requiresNew=\"true\"/>\n"
-"   <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
+"Podemos declarar o escopo, tipo de puplicação (deployment type) e tipo de "
+"ligação de interceptador (interceptor binding types) com a utilização direta "
+"de elementos filhos na declaração do Web Bean:"
 
 #. Tag: para
-#: xml.xml:87
 #, fuzzy, no-c-format
 msgid "We use exactly the same approach to specify names and qualifiers:"
-msgstr "Utilizamos exatamente a mesma abordagem para especificar nomes e tipos de ligação:"
-
-#. Tag: programlisting
-#: xml.xml:89
-#, no-c-format
-msgid ""
-"<![CDATA[<util:Date>\n"
-"   <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <SessionScoped/>\n"
-"   <myapp:Login/>\n"
-"   <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:SystemStart/>\n"
-"   <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
 msgstr ""
-"<![CDATA[<util:Date>\n"
-"   <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <SessionScoped/>\n"
-"   <myapp:Login/>\n"
-"   <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:SystemStart/>\n"
-"   <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
+"Utilizamos exatamente a mesma abordagem para especificar nomes e tipos de "
+"ligação:"
 
 #. Tag: para
-#: xml.xml:91
 #, fuzzy, no-c-format
-msgid "Where <literal>@Login</literal> and <literal>@SystemStart</literal> are qualifier annotations types."
-msgstr "Em que <literal>@Login</literal> e <literal>@SystemStart</literal> são anotações do tipo ligação."
-
-#. Tag: programlisting
-#: xml.xml:95
-#, no-c-format
 msgid ""
-"<![CDATA[private @Inject Date currentTime;\n"
-"private @Login Date loginTime;\n"
-"private @SystemStart Date systemStartTime;]]>"
+"Where <literal>@Login</literal> and <literal>@SystemStart</literal> are "
+"qualifier annotations types."
 msgstr ""
-"<![CDATA[private @Inject Date currentTime;\n"
-"private @Login Date loginTime;\n"
-"private @SystemStart Date systemStartTime;]]>"
+"Em que <literal>@Login</literal> e <literal>@SystemStart</literal> são "
+"anotações do tipo ligação."
 
 #. Tag: para
-#: xml.xml:97
 #, fuzzy, no-c-format
 msgid "As usual, a bean may support multiple qualifier types:"
-msgstr "Como é habitual, um Web Bean pode suportar múltiplos tipos de ligação (binding types):"
-
-#. Tag: programlisting
-#: xml.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"   <myapp:PayByCheque/>\n"
-"   <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
 msgstr ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"   <myapp:PayByCheque/>\n"
-"   <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
+"Como é habitual, um Web Bean pode suportar múltiplos tipos de ligação "
+"(binding types):"
 
 #. Tag: para
-#: xml.xml:101
 #, fuzzy, no-c-format
-msgid "Interceptors and decorators are beans as well, so they may be declared just like any other bean:"
-msgstr "Interceptadores e Decoradores são simplesmente Web Beans. Assim, podem ser declarados como qualquer outro Web Bean:"
-
-#. Tag: programlisting
-#: xml.xml:105
-#, no-c-format
 msgid ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"   <Interceptor/>\n"
-"   <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
+"Interceptors and decorators are beans as well, so they may be declared just "
+"like any other bean:"
 msgstr ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"   <Interceptor/>\n"
-"   <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
+"Interceptadores e Decoradores são simplesmente Web Beans. Assim, podem ser "
+"declarados como qualquer outro Web Bean:"
 
 #. Tag: title
-#: xml.xml:110
 #, fuzzy, no-c-format
 msgid "Declaring bean members"
 msgstr "Declarando membros Web Bean"
 
 #. Tag: para
-#: xml.xml:112
 #, no-c-format
 msgid "TODO!"
 msgstr "TODO!"
 
 #. Tag: title
-#: xml.xml:119
 #, fuzzy, no-c-format
 msgid "Declaring inline beans"
 msgstr "Declarando inline Web Beans"
 
 #. Tag: para
-#: xml.xml:121
 #, fuzzy, no-c-format
 msgid "Weld lets us define a bean at an injection point. For example:"
-msgstr "Web Beans nos permite definir um Web Bean em um ponto de injeção. Por exemplo:"
-
-#. Tag: programlisting
-#: xml.xml:123
-#, no-c-format
-msgid ""
-"<![CDATA[<myapp:System>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:admin>\n"
-"      <myapp:Name>\n"
-"         <myapp:firstname>Gavin</myapp:firstname>\n"
-"         <myapp:lastname>King</myapp:lastname>\n"
-"         <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"      </myapp:Name>\n"
-"   </myapp:admin>\n"
-"</myapp:System>]]>"
 msgstr ""
-"<![CDATA[<myapp:System>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:admin>\n"
-"      <myapp:Name>\n"
-"         <myapp:firstname>Gavin</myapp:firstname>\n"
-"         <myapp:lastname>King</myapp:lastname>\n"
-"         <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"      </myapp:Name>\n"
-"   </myapp:admin>\n"
-"</myapp:System>]]>"
+"Web Beans nos permite definir um Web Bean em um ponto de injeção. Por "
+"exemplo:"
 
 #. Tag: para
-#: xml.xml:125
 #, fuzzy, no-c-format
-msgid "The <literal>&lt;Name&gt;</literal> element declares a bean of scope <literal>@Dependent</literal> and class <literal>Name</literal>, with a set of initial field values. This bean has a special, container-generated qualifier and is therefore injectable only to the specific injection point at which it is declared."
-msgstr "O elemento <literal>&lt;Name&gt;</literal> declara um Web Bean simples de escopo <literal>@Dependent</literal> e classe <literal>Name</literal>, com um conjunto inicial de valores para os campos. Esse Web Bean possui a especial, container-generated binding and is therefore injectable only to the specific injection point at which it is declared."
+msgid ""
+"The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
+"<literal>@Dependent</literal> and class <literal>Name</literal>, with a set "
+"of initial field values. This bean has a special, container-generated "
+"qualifier and is therefore injectable only to the specific injection point "
+"at which it is declared."
+msgstr ""
+"O elemento <literal>&lt;Name&gt;</literal> declara um Web Bean simples de "
+"escopo <literal>@Dependent</literal> e classe <literal>Name</literal>, com "
+"um conjunto inicial de valores para os campos. Esse Web Bean possui a "
+"especial, container-generated binding and is therefore injectable only to "
+"the specific injection point at which it is declared."
 
 #. Tag: para
-#: xml.xml:131
 #, fuzzy, no-c-format
-msgid "This simple but powerful feature allows the Weld XML format to be used to specify whole graphs of Java objects. It's not quite a full databinding solution, but it's close!"
-msgstr "Esse simples - mas poderoso - recurso permite que o formato XML do Web Beans seja utilizado para especificar grafos completos de objetos Java. Não é uma solução de ligação de dados (databinding) completa, mas está bem próxima!"
+msgid ""
+"This simple but powerful feature allows the Weld XML format to be used to "
+"specify whole graphs of Java objects. It's not quite a full databinding "
+"solution, but it's close!"
+msgstr ""
+"Esse simples - mas poderoso - recurso permite que o formato XML do Web Beans "
+"seja utilizado para especificar grafos completos de objetos Java. Não é uma "
+"solução de ligação de dados (databinding) completa, mas está bem próxima!"
 
 #. Tag: title
-#: xml.xml:139
 #, no-c-format
 msgid "Using a schema"
 msgstr "Utilizando um esquema"
 
 #. Tag: para
-#: xml.xml:141
 #, fuzzy, no-c-format
-msgid "If we want our XML document format to be authored by people who aren't Java developers, or who don't have access to our code, we need to provide a schema. There's nothing specific to Weld about writing or using the schema."
-msgstr "Se desejamos que o formato do documento XML seja criado por pessoas que não são desenvolvedores Java, ou por pessoas que não têm acesso ao nosso código, precisamos fornecer um esquema (XML schema). Não há nada específico no Web Beans sobre escrever ou utilizar o esquema."
-
-#. Tag: programlisting
-#: xml.xml:147
-#, no-c-format
 msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/beans-1.0.xsd\n"
-"   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"   <myapp:System>\n"
-"      ...\n"
-"   </myapp:System>\n"
-"\n"
-"</beans>]]>"
+"If we want our XML document format to be authored by people who aren't Java "
+"developers, or who don't have access to our code, we need to provide a "
+"schema. There's nothing specific to Weld about writing or using the schema."
 msgstr ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/beans-1.0.xsd\n"
-"   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"   <myapp:System>\n"
-"      ...\n"
-"   </myapp:System>\n"
-"\n"
-"</beans>]]>"
+"Se desejamos que o formato do documento XML seja criado por pessoas que não "
+"são desenvolvedores Java, ou por pessoas que não têm acesso ao nosso código, "
+"precisamos fornecer um esquema (XML schema). Não há nada específico no Web "
+"Beans sobre escrever ou utilizar o esquema."
 
 #. Tag: para
-#: xml.xml:149
 #, fuzzy, no-c-format
-msgid "Writing an XML schema is quite tedious. Therefore, the Weld project will provide a tool which automatically generates the XML schema from compiled Java code."
-msgstr "Escrever um esquema XML (XML schema) é um tanto tedioso. Tod via, o projeto Web Beans RI  fornecerá uma ferramenta que automaticamente gera o esquema XML (XML schema), a partir do código da classe Java compilada."
+msgid ""
+"Writing an XML schema is quite tedious. Therefore, the Weld project will "
+"provide a tool which automatically generates the XML schema from compiled "
+"Java code."
+msgstr ""
+"Escrever um esquema XML (XML schema) é um tanto tedioso. Tod via, o projeto "
+"Web Beans RI  fornecerá uma ferramenta que automaticamente gera o esquema "
+"XML (XML schema), a partir do código da classe Java compilada."
 
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:util=\"urn:java:java.util\">\n"
+#~ "   <util:Date/>\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:util=\"urn:java:java.util\">\n"
+#~ "   <util:Date/>\n"
+#~ "</beans>]]>"
+
+#~ msgid "<![CDATA[private @Inject Date date;]]>"
+#~ msgstr "<![CDATA[private @Inject Date date;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "   <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "   <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "   <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myapp:Login/>\n"
+#~ "   <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:SystemStart/>\n"
+#~ "   <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "   <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myapp:Login/>\n"
+#~ "   <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:SystemStart/>\n"
+#~ "   <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[private @Inject Date currentTime;\n"
+#~ "private @Login Date loginTime;\n"
+#~ "private @SystemStart Date systemStartTime;]]>"
+#~ msgstr ""
+#~ "<![CDATA[private @Inject Date currentTime;\n"
+#~ "private @Login Date loginTime;\n"
+#~ "private @SystemStart Date systemStartTime;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "   <myapp:PayByCheque/>\n"
+#~ "   <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "   <myapp:PayByCheque/>\n"
+#~ "   <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "   <Interceptor/>\n"
+#~ "   <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "   <Interceptor/>\n"
+#~ "   <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:admin>\n"
+#~ "      <myapp:Name>\n"
+#~ "         <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "         <myapp:lastname>King</myapp:lastname>\n"
+#~ "         <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "      </myapp:Name>\n"
+#~ "   </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:admin>\n"
+#~ "      <myapp:Name>\n"
+#~ "         <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "         <myapp:lastname>King</myapp:lastname>\n"
+#~ "         <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "      </myapp:Name>\n"
+#~ "   </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/"
+#~ "beans-1.0.xsd\n"
+#~ "   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "   <myapp:System>\n"
+#~ "      ...\n"
+#~ "   </myapp:System>\n"
+#~ "\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/"
+#~ "beans-1.0.xsd\n"
+#~ "   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "   <myapp:System>\n"
+#~ "      ...\n"
+#~ "   </myapp:System>\n"
+#~ "\n"
+#~ "</beans>]]>"
+
 #~ msgid "In either of these cases, Web Beans gives us two options:"
 #~ msgstr "Em ambos os casos, We Beans nos dá duas opções:"
+
 #~ msgid "write a producer method, or"
 #~ msgstr "escrever um método produtor (producer method), ou"
+
 #~ msgid "declare the Web Bean using XML."
 #~ msgstr "declarar um Web Bean utilizando XML."
-

Modified: doc/trunk/reference/zh-CN/Author_Group.po
===================================================================
--- doc/trunk/reference/zh-CN/Author_Group.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/Author_Group.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-27 13:39+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -13,108 +13,123 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Tag: author
-#: Author_Group.xml:5
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Gavin</firstname> <surname>King</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+msgid "Gavin"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:8
 #, no-c-format
 msgid "JSR-299: Contexts and Dependency Injection Lead"
 msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:14
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+msgid "Pete"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:17
 #, no-c-format
 msgid "Weld (JSR-299 RI) Lead"
 msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:24
-#, fuzzy, no-c-format
-msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Dan"
+msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:31
-#, fuzzy, no-c-format
-msgid "<firstname>David</firstname> <surname>Allen</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "David"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:35
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
-msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+msgid "Nicola"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:38 Author_Group.xml:67
 #, no-c-format
 msgid "Italian Translation"
 msgstr "意大利文翻译"
 
-#. Tag: othercredit
-#: Author_Group.xml:40
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
-msgstr "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+msgid "Gladys"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:43
 #, no-c-format
 msgid "Spanish Translation"
 msgstr "西班牙文翻译"
 
-#. Tag: othercredit
-#: Author_Group.xml:48
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
-msgstr "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+msgid "Eun-Ju"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:51
 #, no-c-format
 msgid "Korean Translation"
 msgstr "韩文翻译"
 
-#. Tag: othercredit
-#: Author_Group.xml:56
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
-msgstr "<firstname>Terry</firstname> <surname>Chuang</surname>"
+msgid "Terry"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:59
 #, no-c-format
 msgid "Traditional Chinese Translation"
 msgstr "繁体中文翻译"
 
-#. Tag: othercredit
-#: Author_Group.xml:64
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
-msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+msgid "Francesco"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:69
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
-msgstr "<firstname>Sean</firstname> <surname>Wu</surname>"
+msgid "Sean"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:72
 #, no-c-format
 msgid "Simplified Chinese Translation"
 msgstr "简体中文翻译"
 
+#~ msgid "<firstname>Gavin</firstname> <surname>King</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#~ msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>David</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#~ msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+#~ msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+
+#~ msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+#~ msgstr "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+
+#~ msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+#~ msgstr "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+
+#~ msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
+#~ msgstr "<firstname>Terry</firstname> <surname>Chuang</surname>"
+
+#~ msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+#~ msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+
+#~ msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
+#~ msgstr "<firstname>Sean</firstname> <surname>Wu</surname>"
+
 #~ msgid ""
 #~ "<jobtitle>JSR-299 specification lead</jobtitle> <orgname>Red Hat "
 #~ "Middleware LLC</orgname>"

Modified: doc/trunk/reference/zh-CN/Book_Info.po
===================================================================
--- doc/trunk/reference/zh-CN/Book_Info.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/Book_Info.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-12 11:25+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: Book_Info.xml:4
 #, no-c-format
 msgid "Weld - JSR-299 Reference Implementation"
 msgstr ""
 
 #. Tag: subtitle
-#: Book_Info.xml:5
 #, fuzzy, no-c-format
 msgid ""
 "JSR-299: The new Java standard for dependency injection and contextual "

Modified: doc/trunk/reference/zh-CN/beans.po
===================================================================
--- doc/trunk/reference/zh-CN/beans.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/beans.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: beans.xml:4
 #, no-c-format
 msgid "More about beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:6
 #, no-c-format
 msgid ""
 "A bean is usually an application class that contains business logic. It may "
@@ -32,7 +30,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:13
 #, no-c-format
 msgid ""
 "Let's back up a second. What does it really mean to be <emphasis>contextual</"
@@ -45,7 +42,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:21
 #, no-c-format
 msgid ""
 "However, like a stateless or singleton model, but <emphasis>unlike</"
@@ -55,19 +51,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:29
 #, no-c-format
 msgid "the lifecycle of each instance of the bean and"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:32
 #, no-c-format
 msgid "which clients share a reference to a particular instance of the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:36
 #, no-c-format
 msgid ""
 "For a given thread in a CDI application, there may be an <emphasis>active "
@@ -78,7 +71,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:43
 #, no-c-format
 msgid ""
 "Clients (for example, other beans) executing in the same context will see "
@@ -87,7 +79,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:49
 #, no-c-format
 msgid ""
 "One great advantage of the contextual model is that it allows stateful beans "
@@ -99,46 +90,39 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:58
 #, no-c-format
 msgid "they interact via well-defined public APIs"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:61
 #, no-c-format
 msgid "their lifecycles are completely decoupled"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:65
 #, no-c-format
 msgid ""
 "We can replace one bean with another different bean that implements the same "
 "interface and has a different lifecycle (a different scope) without "
 "affecting the other bean implementation. In fact, CDI defines a simple "
 "facility for overriding bean implementations at deployment time, as we will "
-"see in <xref linkend=\"alternatives\"/>."
+"see in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:71
 #, no-c-format
 msgid ""
 "Note that not all clients of a bean are beans themselves. Other objects such "
-"as servlets or message-driven beans&#8212;which are by nature not "
-"injectable, contextual objects&#8212;may also obtain references to beans by "
-"injection."
+"as servlets or message-driven beans—which are by nature not injectable, "
+"contextual objects—may also obtain references to beans by injection."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:78
 #, no-c-format
 msgid "The anatomy of a bean"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:80
 #, no-c-format
 msgid ""
 "Enough hand-waving. More formally, the anatomy of a bean, according to the "
@@ -146,67 +130,56 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:84
 #, no-c-format
 msgid "A bean comprises the following attributes:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:87
 #, no-c-format
 msgid "A (nonempty) set of bean types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:88
 #, no-c-format
 msgid "A (nonempty) set of qualifiers"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:89
 #, no-c-format
 msgid "A scope"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:90
 #, no-c-format
 msgid "Optionally, a bean EL name"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:91
 #, no-c-format
 msgid "A set of interceptor bindings"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:92
 #, no-c-format
 msgid "A bean implementation"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:95
 #, no-c-format
 msgid "Furthermore, a bean may or may not be an alternative."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:99
 #, no-c-format
 msgid "Let's see what all this new terminology means."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:102
 #, no-c-format
 msgid "Bean types, qualifiers and dependency injection"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:104
 #, no-c-format
 msgid ""
 "Beans usually acquire references to other beans via dependency injection. "
@@ -215,19 +188,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:110
 #, no-c-format
 msgid "a bean type, together with"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:111
 #, no-c-format
 msgid "a set of qualifiers."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:114
 #, no-c-format
 msgid ""
 "A bean type is a user-defined class or interface; a type that is client-"
@@ -237,19 +207,7 @@
 "types:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:120
-#, no-c-format
-msgid ""
-"<![CDATA[public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:122
 #, no-c-format
 msgid ""
 "The bean types are <literal>BookShop</literal>, <literal>Business</literal> "
@@ -259,7 +217,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:128
 #, no-c-format
 msgid ""
 "Meanwhile, this session bean has only the local interfaces "
@@ -268,29 +225,17 @@
 "<literal>BookShopBean</literal> is not a client-visible type."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"public class BookShopBean \n"
-"      extends Business \n"
-"      implements BookShop, Auditable {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:137
 #, no-c-format
 msgid ""
-"Most bean types you can probably figure out. One gotcha is primitive types. "
-"All primitive types are assumed to be identical to their corresponding "
-"wrapper types in <literal>java.lang</literal>."
+"The bean types of a session bean include local interfaces and the bean class "
+"local view (if any). EJB remote interfaces are not considered bean types of "
+"a session bean. You can't inject an EJB using its remote interface unless "
+"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
+"linkend=\"resources\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:143
 #, no-c-format
 msgid ""
 "Bean types may be restricted to an explicit set by annotating the bean with "
@@ -300,20 +245,7 @@
 "<literal>java.lang.Object</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:149
-#, no-c-format
-msgid ""
-"<![CDATA[@Typed(Shop.class)\n"
-"public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:151
 #, no-c-format
 msgid ""
 "Sometimes, a bean type alone does not provide enough information for the "
@@ -328,7 +260,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:160
 #, no-c-format
 msgid ""
 "A qualifier is a user-defined annotation that is itself annotated "
@@ -337,18 +268,7 @@
 "string-based names. Here's an example of a qualifier annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:166
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface CreditCard {}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:168
 #, no-c-format
 msgid ""
 "You may not be used to seeing the definition of an annotation. In fact, this "
@@ -358,7 +278,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:175
 #, no-c-format
 msgid ""
 "Pay attention to the names of the built-in annotations in CDI and EJB. "
@@ -368,7 +287,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:182
 #, no-c-format
 msgid ""
 "Now that we have defined a qualifier annotation, we can use it to "
@@ -377,14 +295,7 @@
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:188
-#, no-c-format
-msgid "<![CDATA[@Inject @CreditCard PaymentProcessor paymentProcessor]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:191
 #, no-c-format
 msgid ""
 "If an injection point does not explicitly specify a qualifier, it has the "
@@ -392,7 +303,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:197
 #, no-c-format
 msgid ""
 "For each injection point, the container searches for a bean which satisfies "
@@ -402,7 +312,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:203
 #, no-c-format
 msgid ""
 "How do we specify that qualifiers of a bean? By annotating the bean class, "
@@ -411,17 +320,7 @@
 "Therefore, it satisfies our qualified injection point:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:209
-#, no-c-format
-msgid ""
-"<![CDATA[@CreditCard\n"
-"public class CreditCardPaymentProcessor \n"
-"    implements PaymentProcessor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:212
 #, no-c-format
 msgid ""
 "If a bean does not explicitly specify a qualifier, it has the default "
@@ -429,23 +328,20 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:225
 #, no-c-format
 msgid ""
 "That's not quite the end of the story. CDI also defines a simple "
 "<emphasis>resolution rule</emphasis> that helps the container decide what to "
 "do if there is more than one bean that satisfies a particular contract. "
-"We'll get into the details in <xref linkend=\"injection\"/>."
+"We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:245
 #, no-c-format
 msgid "Scope"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:248
 #, no-c-format
 msgid ""
 "The <emphasis>scope</emphasis> of a bean defines the lifecycle and "
@@ -456,23 +352,13 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:255
 #, no-c-format
 msgid ""
 "For example, any web application may have <emphasis>session scoped</"
 "emphasis> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:259
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:261
 #, no-c-format
 msgid ""
 "An instance of a session-scoped bean is bound to a user session and is "
@@ -480,7 +366,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:265
 #, no-c-format
 msgid ""
 "Keep in mind that once a bean is bound to a context, it remains in that "
@@ -491,7 +376,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:273
 #, no-c-format
 msgid ""
 "If a scope is not explicitly specified, then the bean belongs to a special "
@@ -501,19 +385,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:279
 #, no-c-format
-msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\"/>."
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:284
 #, no-c-format
 msgid "EL name"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:286
 #, no-c-format
 msgid ""
 "If you want to reference a bean in non-Java code that supports Unified EL "
@@ -522,38 +403,18 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:291
 #, no-c-format
 msgid ""
 "The EL name is specified using the <literal>@Named</literal> annotation, as "
 "shown here:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:295
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named(\"cart\")\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:297
 #, no-c-format
 msgid "Now we can easily use the bean in any JSF or JSP page:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:299
-#, no-c-format
-msgid ""
-"<![CDATA[<h:dataTable value=\"#{cart.lineItems}\" var=\"item\">\n"
-"   ...\n"
-"</h:dataTable>]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:302
 #, no-c-format
 msgid ""
 "The <literal>@Named</literal> annotation is not what makes the class a bean. "
@@ -563,23 +424,13 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:309
 #, no-c-format
 msgid ""
 "We can let CDI choose a name for us by leaving off the value of the "
 "<literal>@Named</literal> annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:313
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:315
 #, no-c-format
 msgid ""
 "The name defaults to the unqualified class name, decapitalized; in this "
@@ -587,13 +438,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:325
 #, no-c-format
 msgid "Alternatives"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:327
 #, no-c-format
 msgid ""
 "We've already seen how qualifiers let us choose between multiple "
@@ -605,42 +454,30 @@
 "literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:335
-#, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class MockPaymentProcessor extends PaymentProcessorImpl { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:337
 #, no-c-format
 msgid ""
 "We normally annotate a bean <literal>@Alternative</literal> only when there "
 "is some other implementation of an interface it implements (or of any of its "
 "bean types). We can choose between alternatives at deployment time by "
 "<emphasis>selecting</emphasis> an alternative in the CDI deployment "
-"descriptor <literal>META-INF/beans.xml</literal> of the JAR or Java EE "
+"descriptor <literal>META-INF/beans.xml</literal> of the jar or Java EE "
 "module that uses it. Different modules can specify that they use different "
 "alternatives."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:345
 #, no-c-format
 msgid ""
-"We cover alternatives in more detail in <xref linkend=\"alternatives\"/>."
+"We cover alternatives in more detail in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:352
 #, no-c-format
 msgid "Interceptor binding types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:354
 #, no-c-format
 msgid ""
 "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, "
@@ -651,7 +488,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:361
 #, no-c-format
 msgid ""
 "The way that interceptors were defined in Java EE 5 was counter-intuitive. "
@@ -668,7 +504,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:372
 #, no-c-format
 msgid ""
 "CDI provides a new approach to binding interceptors to beans that introduces "
@@ -678,7 +513,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:378
 #, no-c-format
 msgid ""
 "An interceptor binding type is a user-defined annotation that is itself "
@@ -687,51 +521,21 @@
 "two classes."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:383
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Inherited\n"
-"@Target( { TYPE, METHOD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:385
 #, no-c-format
 msgid ""
 "The interceptor that implements transaction management declares this "
 "annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[public @Transactional @Interceptor\n"
-"class TransactionInterceptor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:391
 #, no-c-format
 msgid ""
 "We can apply the interceptor to a bean by annotating the bean class with the "
 "same interceptor binding type:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:395
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Transactional\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:397
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
@@ -740,32 +544,28 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:402
 #, no-c-format
 msgid ""
 "Interceptors are deployment-specific. (We don't need a "
 "<literal>TransactionInterceptor</literal> in our unit tests!) By default, an "
 "interceptor is disabled. We can enable an interceptor using the CDI "
-"deployment descriptor <literal>META-INF/beans.xml</literal> of the JAR or "
+"deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or "
 "Java EE module. This is also where we specify the interceptor ordering."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:409
 #, no-c-format
 msgid ""
 "We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
-"\"interceptors\"/> and <xref linkend=\"decorators\"/>."
+"\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:419
 #, no-c-format
 msgid "What kinds of classes are beans?"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:421
 #, no-c-format
 msgid ""
 "We've already seen two types of beans: JavaBeans and EJB session beans. Is "
@@ -774,13 +574,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:428
 #, no-c-format
 msgid "Managed beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:430
 #, no-c-format
 msgid ""
 "A managed bean is a Java class. The basic lifecycle and semantics of a "
@@ -792,19 +590,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:441
 #, no-c-format
 msgid "It is not a non-static inner class."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:444
 #, no-c-format
 msgid "It is a concrete class, or is annotated <literal>@Decorator</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:447
 #, no-c-format
 msgid ""
 "It is not annotated with an EJB component-defining annotation or declared as "
@@ -812,7 +607,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:453
 #, no-c-format
 msgid ""
 "It does not implement <literal>javax.enterprise.inject.spi.Extension</"
@@ -820,34 +614,41 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:456
 #, no-c-format
-msgid "It has an appropriate constructor&#8212;either:"
+msgid "It has an appropriate constructor—either:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:461
 #, no-c-format
 msgid "the class has a constructor with no parameters, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:464
 #, no-c-format
 msgid "the class declares a constructor annotated <literal>@Inject</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:472
 #, no-c-format
 msgid ""
+"According to this definition, JPA entities are technically managed beans. "
+"However, entities have their own special lifecycle, state and identity model "
+"and are usually instantiated by JPA or using <literal>new</literal>. "
+"Therefore we don't recommend directly injecting an entity class. We "
+"especially recommend against assigning a scope other than "
+"<literal>@Dependent</literal> to an entity class, since JPA is not able to "
+"persist injected CDI proxies."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The unrestricted set of bean types for a managed bean contains the bean "
 "class, every superclass and all interfaces it implements directly or "
 "indirectly."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:475
 #, no-c-format
 msgid ""
 "If a managed bean has a public field, it must have the default scope "
@@ -855,7 +656,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:477
 #, no-c-format
 msgid ""
 "Managed beans support the <literal>@PostConstruct</literal> and "
@@ -863,7 +663,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:480
 #, no-c-format
 msgid ""
 "Session beans are also, technically, managed beans. However, since they have "
@@ -873,13 +672,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:489
 #, no-c-format
 msgid "Session beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:491
 #, no-c-format
 msgid ""
 "Session beans belong to the EJB specification. They have a special "
@@ -892,7 +689,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:500
 #, no-c-format
 msgid ""
 "Message-driven and entity beans are by nature non-contextual objects and may "
@@ -904,7 +700,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:508
 #, no-c-format
 msgid ""
 "The unrestricted set of bean types for a session bean contains all local "
@@ -916,7 +711,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:516
 #, no-c-format
 msgid ""
 "There's no reason to explicitly declare the scope of a stateless session "
@@ -927,20 +721,18 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:520
 #, no-c-format
 msgid ""
 "Stateful session beans may define a <emphasis>remove method</emphasis>, "
 "annotated <literal>@Remove</literal>, that is used by the application to "
 "indicate that an instance should be destroyed. However, for a contextual "
-"instance of the bean&#8212;an instance under the control of CDI&#8212;this "
-"method may only be called by the application if the bean has scope "
-"<literal>@Dependent</literal>. For beans with other scopes, the application "
-"must let the container destroy the bean."
+"instance of the bean—an instance under the control of CDI—this method may "
+"only be called by the application if the bean has scope <literal>@Dependent</"
+"literal>. For beans with other scopes, the application must let the "
+"container destroy the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:528
 #, no-c-format
 msgid ""
 "So, when should we use a session bean instead of a plain managed bean? "
@@ -948,19 +740,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:535
 #, no-c-format
 msgid "method-level transaction management and security,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:538
 #, no-c-format
 msgid "concurrency management,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:541
 #, no-c-format
 msgid ""
 "instance-level passivation for stateful session beans and instance-pooling "
@@ -968,19 +757,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:545
 #, no-c-format
 msgid "remote or web service invocation, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:548
 #, no-c-format
 msgid "timers and asynchronous methods,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:552
 #, no-c-format
 msgid ""
 "When we don't need any of these things, an ordinary managed bean will serve "
@@ -988,7 +774,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:554
 #, no-c-format
 msgid ""
 "Many beans (including any <literal>@SessionScoped</literal> or "
@@ -998,7 +783,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:560
 #, no-c-format
 msgid ""
 "Beans which hold references to heavy-weight resources, or hold a lot of "
@@ -1008,7 +792,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:566
 #, no-c-format
 msgid ""
 "Finally, it's usually obvious when method-level transaction management, "
@@ -1017,7 +800,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:571
 #, no-c-format
 msgid ""
 "The point we're trying to make is: use a session bean when you need the "
@@ -1030,7 +812,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:579
 #, no-c-format
 msgid ""
 "On the other hand, don't be scared to use session beans just because you've "
@@ -1043,13 +824,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:590
 #, no-c-format
 msgid "Producer methods"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:592
 #, no-c-format
 msgid ""
 "Not everything that needs to be injected can be boiled down to a bean class "
@@ -1061,7 +840,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:600
 #, no-c-format
 msgid ""
 "A <emphasis>producer method</emphasis> is a method that acts as a source of "
@@ -1072,64 +850,31 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:607
 #, no-c-format
 msgid ""
 "A producer method is declared by annotating a method of a bean class with "
 "the <literal>@Produces</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:612
-#, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class RandomNumberGenerator {\n"
-"   \n"
-"   private Random random = new Random(System.currentTimeMillis());\n"
-"       \n"
-"   @Produces @Named @Random int getRandomNumber() {\n"
-"      return random.nextInt(100);\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:614
 #, no-c-format
 msgid ""
 "We can't write a bean class that is itself a random number. But we can "
 "certainly write a method that returns a random number. By making the method "
-"a producer method, we allow the return value of the method&#8212;in this "
-"case an <literal>Integer</literal>&#8212;to be injected. We can even specify "
-"a qualifier&#8212;in this case <literal>@Random</literal>, a scope&#8212;"
-"which in this case defaults to <literal>@Dependent</literal>, and an EL "
-"name&#8212;which in this case defaults to <literal>randomNumber</literal> "
-"according to the JavaBeans property name convention. Now we can get a random "
-"number anywhere:"
+"a producer method, we allow the return value of the method—in this case an "
+"<literal>Integer</literal>—to be injected. We can even specify a qualifier—"
+"in this case <literal>@Random</literal>, a scope—which in this case defaults "
+"to <literal>@Dependent</literal>, and an EL name—which in this case defaults "
+"to <literal>randomNumber</literal> according to the JavaBeans property name "
+"convention. Now we can get a random number anywhere:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:623
-#, no-c-format
-msgid "<![CDATA[@Inject @Random int randomNumber;]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:625
 #, no-c-format
 msgid "Even in a Unified EL expression:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:629
-#, no-c-format
-msgid "<![CDATA[<p>Your raffle number is #{randomNumber}.</p>]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:631
 #, no-c-format
 msgid ""
 "A producer method must be a non-abstract method of a managed bean class or "
@@ -1139,13 +884,11 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:637
 #, no-c-format
 msgid "The bean types of a producer method depend upon the method return type:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:643
 #, no-c-format
 msgid ""
 "If the return type is an interface, the unrestricted set of bean types "
@@ -1154,7 +897,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:649
 #, no-c-format
 msgid ""
 "If a return type is primitive or is a Java array type, the unrestricted set "
@@ -1163,7 +905,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:655
 #, no-c-format
 msgid ""
 "If the return type is a class, the unrestricted set of bean types contains "
@@ -1172,59 +913,43 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:662
 #, no-c-format
 msgid ""
-"If the producer method has method parameters, the container will look for a "
-"bean that satisfies the type and qualifiers of each parameter and pass it to "
-"the method automatically&#8212;another form of dependency injection."
+"Producer methods and fields may have a primitive bean type. For the purpose "
+"of resolving dependencies, primitive types are considered to be identical to "
+"their corresponding wrapper types in <literal>java.lang</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:668
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Produces Set<Roles> getRoles(User user) {\n"
-"   return user.getRoles();\n"
-"}]]>"
+"If the producer method has method parameters, the container will look for a "
+"bean that satisfies the type and qualifiers of each parameter and pass it to "
+"the method automatically—another form of dependency injection."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:670
 #, no-c-format
 msgid ""
 "We'll talk much more about producer methods in <xref linkend="
-"\"producermethods\"/>."
+"\"producermethods\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:675
 #, no-c-format
 msgid "Producer fields"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:677
 #, no-c-format
 msgid ""
 "A <emphasis>producer field</emphasis> is a simpler alternative to a producer "
 "method. A producer field is declared by annotating a field of a bean class "
-"with the <literal>@Produces</literal> annotation&#8212;the same annotation "
-"used for producer methods."
+"with the <literal>@Produces</literal> annotation—the same annotation used "
+"for producer methods."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:683
-#, no-c-format
-msgid ""
-"<![CDATA[public class Shop {\n"
-"   @Produces PaymentProcessor paymentProcessor = ....;\n"
-"   @Produces @Catalog List<Product> products = ....;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:685
 #, no-c-format
 msgid ""
 "The rules for determining the bean types of a producer field parallel the "
@@ -1232,415 +957,12 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:689
 #, no-c-format
 msgid ""
 "A producer field is really just a shortcut that lets us avoid writing a "
 "useless getter method. However, in addition to convenience, producer fields "
 "serve a specific purpose as an adaptor for Java EE component environment "
 "injection, but to learn more about that, you'll have to wait until <xref "
-"linkend=\"resources\"/>. Because we can't wait to get to work on some "
+"linkend=\"resources\" />. Because we can't wait to get to work on some "
 "examples."
 msgstr ""
-
-#. Tag: title
-#: beans.xml:701
-#, no-c-format
-msgid "The (minimal) bean descriptor"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:703
-#, no-c-format
-msgid ""
-"First, it's important to understand that the XML bean descriptor in CDI "
-"(beans.xml) is not there to define beans in XML, like in other popular bean "
-"containers. Rather, you use this file to enable CDI services for the current "
-"bean archive that is difficult to define consistently in Java or which you "
-"don't want to define in Java (e.g., to accomodate testing)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:710
-#, no-c-format
-msgid ""
-"For example, the XML is used to enable interceptors (which are disabled by "
-"default) and define interceptor ordering. So the bean descriptor "
-"<emphasis>complements</emphasis> the metadata that is provided in the Java "
-"language syntax. (You may still want to define beans in XML for other "
-"reasons, but that is the concern of an extension)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:717
-#, no-c-format
-msgid ""
-"Let's first ask why the beans.xml is required, then look at what services it "
-"is used used to enable."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:722
-#, no-c-format
-msgid "Why is beans.xml required?"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:724
-#, no-c-format
-msgid ""
-"You may be wondering, if beans are not described using XML, why do we need "
-"beans.xml at all, particularly if you don't have anything that you would "
-"need the bean descriptor to enable (alternatives, interceptors or "
-"decorators)?"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:730
-#, no-c-format
-msgid "There are two things about CDI that we need to keep in mind:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:736
-#, no-c-format
-msgid ""
-"CDI does not require any special declaration for a Java class to be injected "
-"- that's right, no annotation or XML declaration at all!"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:742
-#, no-c-format
-msgid ""
-"CDI does not define any special kind of module - CDI beans can be deployed "
-"in a library JAR, EJB JAR, WAR, RAR, or JVM classpath directory."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:749
-#, no-c-format
-msgid ""
-"The CDI specification calls the process of identifying beans in modules "
-"<emphasis>bean discovery</emphasis>."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:753
-#, no-c-format
-msgid ""
-"So there are potentially a lot of classes in the classpath which might be "
-"beans! We don't want to force the container to scan every one of those "
-"classes at startup and build its internal metamodel for each of them. This "
-"really could make bean discovery very slow."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:759
-#, no-c-format
-msgid ""
-"But there's another reason we need to give the user some control over which "
-"classes are available for injection. We don't want every class in the "
-"classpath to potentially match an injection point, including classes that "
-"were never intended to be injected into things. This would force the "
-"developer to have to use qualifiers much more often to disambiguate "
-"injection points."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:766
-#, no-c-format
-msgid "So we have two choices. We could have the developer:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:772
-#, no-c-format
-msgid "explicitly exclude modules which do not contain beans, or"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:775
-#, no-c-format
-msgid "explicitly declare modules which do contain beans."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:779
-#, no-c-format
-msgid ""
-"It should be clear that the second option is a much better way to go. Thus, "
-"CDI has the notion of a bean archive. A bean archive is just a module that "
-"has a file named beans.xml in the META-INF directory. The container looks "
-"for beans in bean archives. It ignores other modules."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:785
-#, no-c-format
-msgid ""
-"Now, you might be wondering if we've got the granularity wrong here. Why "
-"should module be the right criteria to use for including/excluding a class. "
-"Why not consider:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:792
-#, no-c-format
-msgid "a class-level annotation,"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:795
-#, no-c-format
-msgid "the package,"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:798
-#, no-c-format
-msgid "some type it implements or extends, or"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:801
-#, no-c-format
-msgid "some naming convention."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:805
-#, no-c-format
-msgid ""
-"We've got the first option covered. Annotate a bean <literal>@Alternative</"
-"literal>, or with an alternative stereotype, and it will be considered "
-"disabled by CDI, as long as you don't explicitly enable it in beans.xml. "
-"That's not quite the same thing as excluding the class from scanning "
-"altogether, but it's close. (One difference is that a portable extension "
-"with still get a <literal>ProcessAnnotatedType</literal> event for that "
-"class)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:813
-#, no-c-format
-msgid ""
-"A future version of CDI might allow you to declare excluded packages in "
-"beans.xml. Excluding a bean by type or naming convention isn't really that "
-"appealing. In the world of CDI, we use stereotypes for identifying "
-"architectural roles. We don't use marker interfaces or naming conventions. "
-"Names really shouldn't affect functionality as it is too fragile."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:820
-#, no-c-format
-msgid "Enough theory, what elements are available in beans.xml?"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:826
-#, no-c-format
-msgid "Bean descriptor schema"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:828
-#, no-c-format
-msgid ""
-"If you don't need to activate any interceptors, decorators or alternatives "
-"(you just have plain beans that you need to use in an archive), the beans."
-"xml file can be <emphasis>empty</emphasis>. If you do have one of these "
-"requirements, then you need to start popularing the descriptor."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:834
-#, no-c-format
-msgid ""
-"The root element of a beans.xml file is <literal>beans</literal>, with the "
-"following <ulink url=\"http://anonsvn.jboss.org/repos/weld/api/trunk/cdi/src/"
-"main/resources/beans.xsd\">schema</ulink>:"
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:839
-#, no-c-format
-msgid ""
-"<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<beans xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee \n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"</beans>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:841
-#, no-c-format
-msgid ""
-"The <literal>beans</literal> element can have one or more of each of the "
-"following children:"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:847
-#, no-c-format
-msgid "interceptors"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:850
-#, no-c-format
-msgid "decorators"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:853
-#, no-c-format
-msgid "alternatives"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:857
-#, no-c-format
-msgid "Let's look at each element in detail."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:862
-#, no-c-format
-msgid "&lt;interceptors&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:864
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled interceptors bound via interceptor "
-"bindings. An interceptor must be explicitly enabled by listing the fully "
-"qualified class name in a child &lt;class&gt; element of &lt;"
-"interceptors&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:870
-#, no-c-format
-msgid ""
-"There may be zero or more interceptor class elements. The order of the class "
-"declarations determines the interceptor ordering. Interceptors which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an interceptor "
-"class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:877
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.intercept.SecurityInterceptor</class>\n"
-"   <class>com.acme.intercept.TransactionInterceptor</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:883
-#, no-c-format
-msgid "&lt;decorators&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:885
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled decorators. A decorator must be "
-"explicitly enabled by listing the fully qualified class name in a child &lt;"
-"class&gt; element of &lt;decorators&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:891
-#, no-c-format
-msgid ""
-"There may be zero or more decorator class elements. The order of the class "
-"declarations determines the decorator ordering. Decorators which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an decorator class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:898
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.decorate.BigAccountDecorator</class>\n"
-"   <class>com.acme.decorate.SpecialGiftDecorator</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:903
-#, no-c-format
-msgid "&lt;alternatives&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:905
-#, no-c-format
-msgid ""
-"An alternative is a bean that must be explicitly declared in the beans.xml "
-"file if it should be available for lookup, injection or EL resolution. By "
-"default, a bean archive has no active alternatives. An alternative must be "
-"explicitly declared using the fully qualified bean class name or stereotype "
-"class name in either a child &lt;class&gt; or &lt;stereotype&gt; element of "
-"&lt;alternatives&gt;, respectively."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:913
-#, no-c-format
-msgid ""
-"An alternative is selected for the bean archive if either: the alternative "
-"is a managed bean or session bean and the bean class of the bean is listed, "
-"or the alternative is a producer method, field or resource, and the bean "
-"class that declares the method or field is listed, or any "
-"<literal>@Alternative</literal> stereotype of the alternative is listed."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:920
-#, no-c-format
-msgid ""
-"There may be zero or more alternative bean class elements. The same class "
-"may not be listed twice. And of course, the class must exist and it must be "
-"an alternative bean class."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:925
-#, no-c-format
-msgid ""
-"There may also be zero or more <literal>@Alternative</literal> stereotype "
-"elements. The same stereotype may not be listed twice. And of course, the "
-"stereotype class must exist and it must be an stereotype annotation."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:931
-#, no-c-format
-msgid ""
-"<![CDATA[<stereotypes>\n"
-"   <class>com.acme.business.MockPaymentProcessor</class>\n"
-"   <stereotype>com.acme.stereotype.Mock</stereotype>\n"
-"</stereotypes>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:935
-#, no-c-format
-msgid ""
-"And that's it! A very simple schema, used only to activate and order CDI "
-"services."
-msgstr ""

Modified: doc/trunk/reference/zh-CN/decorators.po
===================================================================
--- doc/trunk/reference/zh-CN/decorators.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/decorators.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-10 11:18+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: decorators.xml:5
 #, no-c-format
 msgid "Decorators"
 msgstr "装饰器"
 
 #. Tag: para
-#: decorators.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors are a powerful way to capture and separate concerns which are "
@@ -37,7 +35,6 @@
 "此,拦截器并不是分离业务相关的关注点的好工具。"
 
 #. Tag: para
-#: decorators.xml:15
 #, fuzzy, no-c-format
 msgid ""
 "The reverse is true of <emphasis>decorators</emphasis>. A decorator "
@@ -56,31 +53,11 @@
 "注点。"
 
 #. Tag: para
-#: decorators.xml:24
 #, no-c-format
 msgid "Suppose we have an interface that represents accounts:"
 msgstr "假定我们有一个表现帐户的接口:"
 
-#. Tag: programlisting
-#: decorators.xml:26
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface Account {\n"
-"   public BigDecimal getBalance();\n"
-"   public User getOwner();\n"
-"   public void withdraw(BigDecimal amount);\n"
-"   public void deposit(BigDecimal amount);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface Account {\n"
-"    public BigDecimal getBalance();\n"
-"    public User getOwner();\n"
-"    public void withdraw(BigDecimal amount);\n"
-"    public void deposit(BigDecimal amount);\n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:28
 #, fuzzy, no-c-format
 msgid ""
 "Several different beans in our system implement the <literal>Account</"
@@ -93,7 +70,6 @@
 "中记录。装饰器非常适合处理这种工作。"
 
 #. Tag: para
-#: decorators.xml:34
 #, fuzzy, no-c-format
 msgid ""
 "A decorator is a bean (possibly even an abstract class) that implements the "
@@ -102,74 +78,14 @@
 "装饰器是一个简单的Web Bean,能够实现其装饰的类型。装饰器使用 "
 "<literal>@Decorator</literal> 注释。"
 
-#. Tag: programlisting
-#: decorators.xml:39
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[<Decorators>\n"
-"    <myapp:LargeTransactionDecorator/>\n"
-"</Decorators>]]>"
-
 #. Tag: para
-#: decorators.xml:41
 #, no-c-format
 msgid ""
 "The decorator implements the methods of the decorated type that it wants to "
 "intercept."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:45
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      ...\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator \n"
-"        implements Account {\n"
-"    \n"
-"    @Decorates Account account;\n"
-"    \n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    public void withdraw(BigDecimal amount) {\n"
-"        account.withdraw(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedWithdrawl(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"    public void deposit(BigDecimal amount);\n"
-"        account.deposit(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedDeposit(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "Unlike other beans, a decorator may be an abstract class. Therefore, if "
@@ -180,7 +96,6 @@
 "特殊方法对装饰器没有用处,那么装饰器可以不实现这个方法。"
 
 #. Tag: para
-#: decorators.xml:52
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors for a method are called before decorators that apply to the "
@@ -188,13 +103,11 @@
 msgstr "一个方法的拦截器在这个方法的装饰器调用之前调用。"
 
 #. Tag: title
-#: decorators.xml:57
 #, fuzzy, no-c-format
 msgid "Delegate object"
 msgstr "委托属性"
 
 #. Tag: para
-#: decorators.xml:59
 #, no-c-format
 msgid ""
 "Decorators have a special injection point, called the <emphasis>delegate "
@@ -204,38 +117,22 @@
 "method parameter or injected field."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:67
 #, fuzzy, no-c-format
 msgid "A decorator is bound to any bean which:"
 msgstr "一个装饰器可以绑定到任何符合下面条件的Web Bean上:"
 
 #. Tag: para
-#: decorators.xml:71
 #, fuzzy, no-c-format
 msgid "has the type of the delegate injection point as a bean type, and"
 msgstr "有一个作为API类型的委托属性类型,以及"
 
 #. Tag: para
-#: decorators.xml:74
 #, fuzzy, no-c-format
 msgid "has all qualifiers that are declared at the delegate injection point."
 msgstr "具备委托属性声明的说有绑定类型。"
 
 #. Tag: para
-#: decorators.xml:78
 #, fuzzy, no-c-format
 msgid ""
 "This delegate injection point specifies that the decorator is bound to all "
@@ -244,14 +141,7 @@
 "下面的委托属性指定了装饰器绑定到所有实现 <literal>Account</literal> 接口的"
 "Web Beans:"
 
-#. Tag: programlisting
-#: decorators.xml:83
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
-msgstr "<![CDATA[@Decorates Account account;]]>"
-
 #. Tag: para
-#: decorators.xml:85
 #, fuzzy, no-c-format
 msgid ""
 "A delegate injection point may specify any number of qualifier annotations. "
@@ -259,14 +149,7 @@
 msgstr ""
 "一个委托属性能够指定一个绑定注释。装饰器只能绑定具有相同绑定的Web Beans。"
 
-#. Tag: programlisting
-#: decorators.xml:90
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
-msgstr "<![CDATA[@Decorates @Foreign Account account;]]>"
-
 #. Tag: para
-#: decorators.xml:92
 #, fuzzy, no-c-format
 msgid ""
 "The decorator may invoke the delegate object, which has much the same effect "
@@ -277,64 +160,12 @@
 "装饰器可以调用委托属性,这和从一个拦截器中调用 <literal>InvocationContext."
 "proceed()</literal> 具有相同效果。"
 
-#. Tag: programlisting
-#: decorators.xml:98
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      account.withdraw(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedWithdrawl(amount) );\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      account.deposit(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedDeposit(amount) );\n"
-"      }\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator \n"
-"        implements Account {\n"
-"    \n"
-"    @Decorates Account account;\n"
-"    \n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    public void withdraw(BigDecimal amount) {\n"
-"        account.withdraw(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedWithdrawl(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"    public void deposit(BigDecimal amount);\n"
-"        account.deposit(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedDeposit(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: title
-#: decorators.xml:103
 #, no-c-format
 msgid "Enabling decorators"
 msgstr "激活装饰器"
 
 #. Tag: para
-#: decorators.xml:105
 #, no-c-format
 msgid ""
 "By default, all decorators are disabled. We need to <emphasis>enable</"
@@ -342,24 +173,7 @@
 "bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:111
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <decorators>\n"
-"         <class>org.mycompany.myapp.LargeTransactionDecorator</class>\n"
-"   </decorators>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:113
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
@@ -369,7 +183,6 @@
 "来说是一样的:"
 
 #. Tag: para
-#: decorators.xml:120
 #, no-c-format
 msgid ""
 "it enables us to specify a total ordering for all decorators in our system, "
@@ -377,12 +190,137 @@
 msgstr "它能让我们在系统中指定所有装饰器的排序,确保具有确定的行为,并且"
 
 #. Tag: para
-#: decorators.xml:126
 #, no-c-format
 msgid "it lets us enable or disable decorator classes at deployment time."
 msgstr "它能让我们在部署时期中激活或者关闭装饰器类。"
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "   public BigDecimal getBalance();\n"
+#~ "   public User getOwner();\n"
+#~ "   public void withdraw(BigDecimal amount);\n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "    public BigDecimal getBalance();\n"
+#~ "    public User getOwner();\n"
+#~ "    public void withdraw(BigDecimal amount);\n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[<Decorators>\n"
+#~ "    <myapp:LargeTransactionDecorator/>\n"
+#~ "</Decorators>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator \n"
+#~ "        implements Account {\n"
+#~ "    \n"
+#~ "    @Decorates Account account;\n"
+#~ "    \n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    public void withdraw(BigDecimal amount) {\n"
+#~ "        account.withdraw(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "        account.deposit(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedDeposit(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
+#~ msgstr "<![CDATA[@Decorates Account account;]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
+#~ msgstr "<![CDATA[@Decorates @Foreign Account account;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      account.withdraw(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      account.deposit(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedDeposit(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator \n"
+#~ "        implements Account {\n"
+#~ "    \n"
+#~ "    @Decorates Account account;\n"
+#~ "    \n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    public void withdraw(BigDecimal amount) {\n"
+#~ "        account.withdraw(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "        account.deposit(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedDeposit(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "All decorators have a <emphasis>delegate attribute</emphasis>. The type "
 #~ "and binding types of the delegate attribute determine which Web Beans the "
 #~ "decorator is bound to. The delegate attribute type must implement or "

Modified: doc/trunk/reference/zh-CN/dependencies.po
===================================================================
--- doc/trunk/reference/zh-CN/dependencies.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/dependencies.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: dependencies.xml:5
 #, no-c-format
 msgid "Weld project dependencies"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:7
 #, no-c-format
 msgid ""
 "This section lists compile-time and runtime dependencies for Weld. This list "
@@ -30,105 +28,88 @@
 msgstr ""
 
 #. Tag: title
-#: dependencies.xml:13
 #, no-c-format
 msgid "Artifacts coming from Sun"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:21 dependencies.xml:110
 #, no-c-format
 msgid "Artifact"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:24 dependencies.xml:113
 #, no-c-format
 msgid "Scope"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:33
+#. Tag: para
 #, no-c-format
-msgid "javax.ejb:ejb-api:3.1"
+msgid "<literal>javax.ejb:ejb-api:3.1</literal>"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:36 dependencies.xml:44 dependencies.xml:52
-#: dependencies.xml:60 dependencies.xml:68 dependencies.xml:76
-#: dependencies.xml:128
 #, no-c-format
 msgid "compile"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:41
+#. Tag: para
 #, no-c-format
-msgid "javax.faces:jsf-api:2.0"
+msgid "<literal>javax.faces:jsf-api:2.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:49
+#. Tag: para
 #, no-c-format
-msgid "javax.el:el-api:2.1"
+msgid "<literal>javax.el:el-api:2.1</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:57
+#. Tag: para
 #, no-c-format
-msgid "javax.persistence:persistence-api:2.0"
+msgid "<literal>javax.persistence:persistence-api:2.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:65
+#. Tag: para
 #, no-c-format
-msgid "javax.servlet:servlet-api:3.0"
+msgid "<literal>javax.servlet:servlet-api:3.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:73
+#. Tag: para
 #, no-c-format
-msgid "javax.interceptor:interceptor-api:1.1"
+msgid "<literal>javax.interceptor:interceptor-api:1.1</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:81
+#. Tag: para
 #, no-c-format
-msgid "org.glasfish.web:el-impl:2.1.2"
+msgid "<literal>org.glasfish.web:el-impl:2.1.2</literal>"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:84 dependencies.xml:92
 #, no-c-format
 msgid "runtime"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:89
+#. Tag: para
 #, no-c-format
-msgid "javax.faces:jsf-impl:2.0.x"
+msgid "<literal>javax.faces:jsf-impl:2.0.x</literal>"
 msgstr ""
 
 #. Tag: title
-#: dependencies.xml:101
 #, no-c-format
 msgid "Artifacts coming from Hibernate"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:116
 #, no-c-format
 msgid "Notes"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:125
+#. Tag: para
 #, no-c-format
-msgid "javax.validation:validation-api"
+msgid "<literal>javax.validation:validation-api</literal>"
 msgstr ""
 
-#. Tag: ulink
-#: dependencies.xml:131
+#. Tag: para
 #, no-c-format
-msgid "BVAL-193"
+msgid ""
+"<ulink url=\"http://opensource.atlassian.com/projects/hibernate/browse/BVAL-"
+"193\">BVAL-193</ulink>"
 msgstr ""

Modified: doc/trunk/reference/zh-CN/ee.po
===================================================================
--- doc/trunk/reference/zh-CN/ee.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/ee.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-11 13:00+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: ee.xml:4
 #, no-c-format
 msgid "Java EE integration"
 msgstr "Java EE整合"
 
 #. Tag: para
-#: ee.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "CDI is fully integrated into the Java EE environment. Beans have access to "
@@ -34,13 +32,11 @@
 "到一些对象中,例如Servlet和消息驱动Bean,而这些对象都不是Web Bean。"
 
 #. Tag: title
-#: ee.xml:13
 #, no-c-format
 msgid "Built-in beans"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:15
 #, no-c-format
 msgid ""
 "In the Java EE environment, the container provides the following built-in "
@@ -48,20 +44,17 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:22
 #, no-c-format
 msgid "the current JTA <literal>UserTransaction</literal>,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:27
 #, no-c-format
 msgid ""
 "a <literal>Principal</literal> representing the current caller identity,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:32
 #, no-c-format
 msgid ""
 "the default <ulink url=\"http://jcp.org/en/jsr/detail?id=303\">Bean "
@@ -69,7 +62,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:38
 #, no-c-format
 msgid ""
 "a <literal>Validator</literal> for the default <literal>ValidationFactory</"
@@ -77,7 +69,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:45
 #, no-c-format
 msgid ""
 "The CDI specification does not require the servlet context objects, "
@@ -93,32 +84,18 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:57
 #, no-c-format
 msgid ""
 "Oh, you <emphasis>really</emphasis> want to inject the "
 "<literal>FacesContext</literal>? Alright then, try this producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[class FacesContextProducer {\n"
-"   @Produces @RequestScoped FacesContext getFacesContext() {\n"
-"      return FacesContext.getCurrentInstance();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: ee.xml:67
 #, fuzzy, no-c-format
 msgid "Injecting Java EE resources into a bean"
 msgstr "将Java EE资源注入到一个Web Bean中"
 
 #. Tag: para
-#: ee.xml:69
 #, fuzzy, no-c-format
 msgid ""
 "All managed beans may take advantage of Java EE component environment "
@@ -131,51 +108,7 @@
 "<literal>@EJB</literal>和<literal>@PersistenceContext</literal>来使用Java EE"
 "的依赖注入。我们已经看过很多例子了,虽然我们没有在这上面耗费精力:"
 
-#. Tag: programlisting
-#: ee.xml:76
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @Resource UserTransaction transaction;\n"
-"\n"
-"   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"throws Exception { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource Transaction transaction;\n"
-"\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"    \n"
-"}]]>"
-
-#. Tag: programlisting
-#: ee.xml:78
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Login implements Serializable {\n"
-"   @Inject Credentials credentials;\n"
-"   @PersistenceContext EntityManager userDatabase;\n"
-"    ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped\n"
-"public class Login {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @PersistenceContext EntityManager userDatabase;\n"
-"    \n"
-"    ...\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: ee.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "The Java EE <literal>@PostConstruct</literal> and <literal>@PreDestroy</"
@@ -188,7 +121,6 @@
 "<emphasis>所有的</emphasis> 注入完成后被调用。"
 
 #. Tag: para
-#: ee.xml:86
 #, no-c-format
 msgid ""
 "Of course, we advise that component environment injection be used to define "
@@ -196,13 +128,11 @@
 msgstr ""
 
 #. Tag: title
-#: ee.xml:94
 #, fuzzy, no-c-format
 msgid "Calling a bean from a servlet"
 msgstr "从Servlet调用一个Web Bean"
 
 #. Tag: para
-#: ee.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
@@ -211,55 +141,7 @@
 "在Java EE 6中,从一个Servlet中调用一个Web Bean非常容易,只须使用Web Beans域注"
 "入一个Web Bean或者将初始方法注入即可。"
 
-#. Tag: programlisting
-#: ee.xml:101
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Login extends HttpServlet {\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject Login login;\n"
-"\n"
-"   @Override\n"
-"   public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"      throws ServletException, IOException {\n"
-"      credentials.setUsername(request.getParameter(\"username\")):\n"
-"      credentials.setPassword(request.getParameter(\"password\")):\n"
-"      login.login();\n"
-"      if ( login.isLoggedIn() ) {\n"
-"         response.sendRedirect(\"/home.jsp\");\n"
-"      }\n"
-"      else {\n"
-"         response.sendRedirect(\"/loginError.jsp\");\n"
-"      }\n"
-"   }\n"
-"            \n"
-"}]]>"
-msgstr ""
-"public class Login extends HttpServlet {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @Current Login login;\n"
-"\n"
-"    @Override\n"
-"    public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"        throws ServletException, IOException {\n"
-"        credentials.setUsername( request.getAttribute(\"username\") ):\n"
-"        credentials.setPassword( request.getAttribute(\"password\") ):\n"
-"        login.login();\n"
-"        if ( login.isLoggedIn() ) {\n"
-"            response.sendRedirect(\"/home.jsp\");\n"
-"        }\n"
-"        else {\n"
-"            response.sendRedirect(\"/loginError.jsp\");\n"
-"        }\n"
-"    }\n"
-"            \n"
-"}"
-
 #. Tag: para
-#: ee.xml:103
 #, fuzzy, no-c-format
 msgid ""
 "Since instances of servlets are shared across all incoming threads, the bean "
@@ -271,13 +153,11 @@
 "<literal>Credentials</literal> 和 <literal>Login</literal> 实例。"
 
 #. Tag: title
-#: ee.xml:112
 #, fuzzy, no-c-format
 msgid "Calling a bean from a message-driven bean"
 msgstr "从消息驱动Bean中调用一个Web Bean"
 
 #. Tag: para
-#: ee.xml:114
 #, no-c-format
 msgid ""
 "CDI injection applies to all EJBs, even when they aren't managed beans. In "
@@ -286,39 +166,11 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:119
 #, fuzzy, no-c-format
 msgid "You can even use CDI interceptor bindings for message-driven Beans."
 msgstr "你甚至可以将Web Beans拦截器绑定到消息驱动Bean上。"
 
-#. Tag: programlisting
-#: ee.xml:121
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"   @Inject Inventory inventory;\n"
-"   @PersistenceContext EntityManager em;\n"
-"\n"
-"   public void onMessage(Message message) {\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"\n"
-"    @Current Inventory inventory;\n"
-"    @PersistenceContext EntityManager em;\n"
-"\n"
-"    public void onMessage(Message message) {\n"
-"        ...\n"
-"    }\n"
-"            \n"
-"}"
-
 #. Tag: para
-#: ee.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "Please note that there is no session or conversation context available when "
@@ -332,19 +184,16 @@
 "literal> 注释的Web Beans。"
 
 #. Tag: para
-#: ee.xml:129
 #, no-c-format
 msgid "But how about beans which <emphasis>send</emphasis> JMS messages?"
 msgstr ""
 
 #. Tag: title
-#: ee.xml:136
 #, no-c-format
 msgid "JMS endpoints"
 msgstr "JMS端点"
 
 #. Tag: para
-#: ee.xml:138
 #, no-c-format
 msgid ""
 "Sending messages using JMS can be quite complex, because of the number of "
@@ -366,96 +215,20 @@
 "literal>。这些对象每个都有自己的生命周期和线程模型,我们都需要考虑这些问题。"
 
 #. Tag: para
-#: ee.xml:147
 #, no-c-format
 msgid ""
 "You can use producer fields and methods to prepare all of these resources "
 "for injection into a bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[public class OrderResources {\n"
-"   @Resource(name=\"jms/ConnectionFactory\")\n"
-"   private ConnectionFactory connectionFactory;\n"
-"  \n"
-"   @Resource(name=\"jms/OrderQueue\")\n"
-"   private Queue orderQueue;\n"
-"  \n"
-"   @Produces @OrderConnection\n"
-"   public Connection createOrderConnection() throws JMSException {\n"
-"    return connectionFactory.createConnection();\n"
-"   }\n"
-"  \n"
-"   public void closeOrderConnection(@Disposes @OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      connection.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderSession\n"
-"   public Session createOrderSession(@OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      return connection.createSession(true, Session.AUTO_ACKNOWLEDGE);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderSession(@Disposes @OrderSession Session session)\n"
-"         throws JMSException {\n"
-"      session.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderMessageProducer\n"
-"   public MessageProducer createOrderMessageProducer(@OrderSession Session "
-"session)\n"
-"         throws JMSException {\n"
-"      return session.createProducer(orderQueue);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderMessageProducer(@Disposes @OrderMessageProducer "
-"MessageProducer producer)\n"
-"         throws JMSException {\n"
-"      producer.close();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: ee.xml:153
 #, no-c-format
 msgid ""
 "In this example, we can just inject the prepared <literal>MessageProducer</"
 "literal>, <literal>Connection</literal> or <literal>QueueSession</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:158
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject Order order;\n"
-"@Inject @OrderMessageProducer MessageProducer producer;\n"
-"@Inject @OrderSession QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"   MapMessage msg = orderSession.createMapMessage();\n"
-"   msg.setLong(\"orderId\", order.getId());\n"
-"   ...\n"
-"   producer.send(msg);\n"
-"}]]>"
-msgstr ""
-"@OrderProcessor QueueSender orderSender;\n"
-"@OrderProcessor QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"    MapMessage msg = orderSession.createMapMessage();\n"
-"    ...\n"
-"    orderSender.send(msg);\n"
-"}"
-
 #. Tag: para
-#: ee.xml:164
 #, fuzzy, no-c-format
 msgid ""
 "The lifecycle of the injected JMS objects is completely controlled by the "
@@ -463,22 +236,20 @@
 msgstr "被注入的JMS对象的生命周期完全由Web Bean管理器控制。"
 
 #. Tag: title
-#: ee.xml:171
 #, no-c-format
 msgid "Packaging and deployment"
 msgstr "打包和部署"
 
 #. Tag: para
-#: ee.xml:173
 #, fuzzy, no-c-format
 msgid ""
 "CDI doesn't define any special deployment archive. You can package beans in "
-"JARs, EJB-JARs or WARs&#8212;any deployment location in the application "
-"classpath. However, the archive must be a \"bean archive\". That means each "
-"archive that contains beans <emphasis>must</emphasis> include a file named "
+"jars, ejb jars or wars—any deployment location in the application classpath. "
+"However, the archive must be a \"bean archive\". That means each archive "
+"that contains beans <emphasis>must</emphasis> include a file named "
 "<literal>beans.xml</literal> in the <literal>META-INF</literal> directory of "
 "the classpath or <literal>WEB-INF</literal> directory of the web root (for "
-"WAR archives). The file may be empty. Beans deployed in archives that do not "
+"war archives). The file may be empty. Beans deployed in archives that do not "
 "have a <literal>beans.xml</literal> file will not be available for use in "
 "the application."
 msgstr ""
@@ -489,7 +260,6 @@
 "<literal>web-beans.xml</literal> 配置文件,应用将无法使用Web Beans。"
 
 #. Tag: para
-#: ee.xml:182
 #, fuzzy, no-c-format
 msgid ""
 "In an embeddable EJB container, beans may be deployed in any location in "
@@ -499,7 +269,137 @@
 "对于Java SE,Web Beans可以被部署在由嵌入式EJB轻量容器支持的EJB中的任何位置。"
 "同样,该位置必须包含 <literal>web-beans.xml</literal> 配置文件。"
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "throws Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource Transaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login implements Serializable {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @PersistenceContext EntityManager userDatabase;\n"
+#~ "    ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @PersistenceContext EntityManager userDatabase;\n"
+#~ "    \n"
+#~ "    ...\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Login extends HttpServlet {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject Login login;\n"
+#~ "\n"
+#~ "   @Override\n"
+#~ "   public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "      throws ServletException, IOException {\n"
+#~ "      credentials.setUsername(request.getParameter(\"username\")):\n"
+#~ "      credentials.setPassword(request.getParameter(\"password\")):\n"
+#~ "      login.login();\n"
+#~ "      if ( login.isLoggedIn() ) {\n"
+#~ "         response.sendRedirect(\"/home.jsp\");\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "            \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "public class Login extends HttpServlet {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @Current Login login;\n"
+#~ "\n"
+#~ "    @Override\n"
+#~ "    public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "        throws ServletException, IOException {\n"
+#~ "        credentials.setUsername( request.getAttribute(\"username\") ):\n"
+#~ "        credentials.setPassword( request.getAttribute(\"password\") ):\n"
+#~ "        login.login();\n"
+#~ "        if ( login.isLoggedIn() ) {\n"
+#~ "            response.sendRedirect(\"/home.jsp\");\n"
+#~ "        }\n"
+#~ "        else {\n"
+#~ "            response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "            \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "   @Inject Inventory inventory;\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "   public void onMessage(Message message) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "\n"
+#~ "    @Current Inventory inventory;\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "    public void onMessage(Message message) {\n"
+#~ "        ...\n"
+#~ "    }\n"
+#~ "            \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Order order;\n"
+#~ "@Inject @OrderMessageProducer MessageProducer producer;\n"
+#~ "@Inject @OrderSession QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "   MapMessage msg = orderSession.createMapMessage();\n"
+#~ "   msg.setLong(\"orderId\", order.getId());\n"
+#~ "   ...\n"
+#~ "   producer.send(msg);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@OrderProcessor QueueSender orderSender;\n"
+#~ "@OrderProcessor QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "    MapMessage msg = orderSession.createMapMessage();\n"
+#~ "    ...\n"
+#~ "    orderSender.send(msg);\n"
+#~ "}"
+
+#~ msgid ""
 #~ "There is one restriction to be aware of here: <literal>@PersistenceContext"
 #~ "(type=EXTENDED)</literal> is not supported for simple Web Beans."
 #~ msgstr ""

Modified: doc/trunk/reference/zh-CN/environments.po
===================================================================
--- doc/trunk/reference/zh-CN/environments.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/environments.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,22 +15,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: environments.xml:4
 #, no-c-format
 msgid "Application servers and environments supported by Weld"
 msgstr ""
 
 #. Tag: title
-#: environments.xml:7
 #, no-c-format
 msgid "Using Weld with JBoss AS"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:9
 #, no-c-format
 msgid ""
-"If you are using JBoss AS 5.2, no additional configuration is required to "
+"If you are using JBoss AS 6.0, no additional configuration is required to "
 "use Weld (or CDI for that matter). All you need to do is make your "
 "application a bean bean archive by adding <literal>META-INF/beans.xml</"
 "literal> to the classpath or <literal>WEB-INF/beans.xml</literal> to the web "
@@ -38,50 +35,39 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:15
 #, no-c-format
 msgid ""
 "Unfortunately, you can't use Weld with earlier versions of JBoss AS since "
 "they are missing key libraries. If you want to learn how to upgrade the "
-"built-in support on JBoss AS 5.2, then read on."
+"built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:20
 #, no-c-format
 msgid ""
-"Upgrading the Weld add-on is easy. The Weld distribution has a build that "
-"can take care of this task for you in a single command. First, we need to "
-"tell Weld where JBoss AS is located. Create a new file named <literal>local."
-"build.properties</literal> in the examples directory of the Weld "
-"distribution and assign the path of your JBoss AS installation to the "
-"property key <literal>jboss.home</literal>, as follows:"
+"If there is a newer release of Weld than what is included in the latest "
+"JBoss AS 6 release, upgrading the Weld add-on is easy. The Weld distribution "
+"includes a build script that can take care of this task for you in a single "
+"command."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:27
+#. Tag: para
 #, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"
+msgid ""
+"First, we need to tell Weld where JBoss AS is located. This information is "
+"communicated by assigning the <literal>JBOSS_HOME</literal> environment "
+"variable. In a bash shell, you can assign the environment variable as "
+"follows:"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:29
 #, no-c-format
 msgid ""
 "Now we can install the Weld deployer from the <literal>jboss-as</literal> "
 "directory of the Weld distribution:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:33
-#, no-c-format
-msgid ""
-"$> cd jboss-as\n"
-"$> ant update"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:36
 #, no-c-format
 msgid ""
 "A new deployer, <literal>weld.deployer</literal> is added to JBoss AS. This "
@@ -92,13 +78,11 @@
 msgstr ""
 
 #. Tag: title
-#: environments.xml:46
 #, no-c-format
 msgid "GlassFish"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:48
 #, no-c-format
 msgid ""
 "Weld is also built into GlassFish from V3 onwards. Since GlassFish V3 is the "
@@ -109,13 +93,11 @@
 msgstr ""
 
 #. Tag: title
-#: environments.xml:56
 #, no-c-format
 msgid "Servlet containers (such as Tomcat or Jetty)"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:58
 #, no-c-format
 msgid ""
 "While JSR-299 does not require support for servlet environments, Weld can be "
@@ -123,7 +105,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:64
 #, no-c-format
 msgid ""
 "There is a major limitation to using a servlet container. Weld doesn't "
@@ -134,7 +115,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:72
 #, no-c-format
 msgid ""
 "Weld should be used as a web application library in a servlet container. You "
@@ -145,62 +125,52 @@
 "could use its component jars:"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:84
+#. Tag: para
 #, no-c-format
-msgid "jsr299-api.jar"
+msgid "<literal>jsr299-api.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:89
+#. Tag: para
 #, no-c-format
-msgid "weld-api.jar"
+msgid "<literal>weld-api.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:94
+#. Tag: para
 #, no-c-format
-msgid "weld-spi.jar"
+msgid "<literal>weld-spi.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:99
+#. Tag: para
 #, no-c-format
-msgid "weld-core.jar"
+msgid "<literal>weld-core.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:104
+#. Tag: para
 #, no-c-format
-msgid "weld-logging.jar"
+msgid "<literal>weld-logging.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:109
+#. Tag: para
 #, no-c-format
-msgid "weld-servlet-int.jar"
+msgid "<literal>weld-servlet-int.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:114
+#. Tag: para
 #, no-c-format
-msgid "javassist.jar"
+msgid "<literal>javassist.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:119
+#. Tag: para
 #, no-c-format
-msgid "dom4j.jar"
+msgid "<literal>dom4j.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:124
+#. Tag: para
 #, no-c-format
-msgid "google-collections.jar"
+msgid "<literal>google-collections.jar</literal>"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:129
 #, no-c-format
 msgid ""
 "You also need to explicitly specify the servlet listener (used to boot Weld, "
@@ -208,24 +178,12 @@
 "literal> in the web root:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:137
 #, no-c-format
 msgid "Tomcat"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:139
 #, no-c-format
 msgid ""
 "Tomcat has a read-only JNDI, so Weld can't automatically bind the "
@@ -234,40 +192,14 @@
 "following contents:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:145
-#, no-c-format
-msgid ""
-"<![CDATA[<Context>\n"
-"   <Resource name=\"BeanManager\" \n"
-"      auth=\"Container\"\n"
-"      type=\"javax.enterprise.inject.spi.BeanManager\"\n"
-"      factory=\"org.jboss.weld.resources.ManagerObjectFactory\"/>\n"
-"</Context>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:147
 #, no-c-format
 msgid ""
 "and make it available to your deployment by adding this to the bottom of "
 "<literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[<resource-env-ref>\n"
-"   <resource-env-ref-name>BeanManager</resource-env-ref-name>\n"
-"   <resource-env-ref-type>\n"
-"      javax.enterprise.inject.spi.BeanManager\n"
-"   </resource-env-ref-type>\n"
-"</resource-env-ref>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:153
 #, no-c-format
 msgid ""
 "Tomcat only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -276,7 +208,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:158
 #, no-c-format
 msgid ""
 "Weld also supports Servlet injection in Tomcat. To enable this, place the "
@@ -284,22 +215,12 @@
 "literal>, and add the following to <literal>META-INF/context.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:164
-#, no-c-format
-msgid ""
-"<![CDATA[<Listener className=\"org.jboss.weld.environment.tomcat."
-"WeldLifecycleListener\"/>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:169
 #, no-c-format
 msgid "Jetty"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:171
 #, no-c-format
 msgid ""
 "Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind "
@@ -307,32 +228,7 @@
 "INF/jetty-env.xml</literal> with the following contents:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:176
-#, no-c-format
-msgid ""
-"<![CDATA[<!DOCTYPE Configure PUBLIC \"-//Mort Bay Consulting//DTD Configure//"
-"EN\"\n"
-"   \"http://jetty.mortbay.org/configure.dtd\">\n"
-"<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext"
-"\">\n"
-"   <New id=\"BeanManager\" class=\"org.mortbay.jetty.plus.naming.Resource"
-"\">\n"
-"      <Arg><Ref id=\"webAppCtx\"/></Arg> \n"
-"      <Arg>BeanManager</Arg>\n"
-"      <Arg>\n"
-"         <New class=\"javax.naming.Reference\">\n"
-"            <Arg>javax.enterprise.inject.spi.BeanManager</Arg> \n"
-"            <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>\n"
-"            <Arg/>\n"
-"         </New>\n"
-"      </Arg>\n"
-"   </New>\n"
-"</Configure>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:178
 #, no-c-format
 msgid ""
 "Notice that Jetty doesn't not have built-in support for an <literal>javax."
@@ -342,7 +238,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:184
 #, no-c-format
 msgid ""
 "Jetty only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -351,19 +246,16 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:189
 #, no-c-format
 msgid "Weld does not currently support Servlet injection in Jetty."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:198
 #, no-c-format
 msgid "Java SE"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:200
 #, no-c-format
 msgid ""
 "In addition to improved integration of the Enterprise Java stack, the "
@@ -376,7 +268,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:208
 #, no-c-format
 msgid ""
 "When executing in the SE environment the following features of Weld are "
@@ -384,7 +275,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:214
 #, no-c-format
 msgid ""
 "Managed beans with <literal>@PostConstruct</literal> and "
@@ -392,13 +282,11 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:220
 #, no-c-format
 msgid "Dependency injection with qualifiers and alternatives"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:225
 #, no-c-format
 msgid ""
 "<literal>@Application</literal>, <literal>@Dependent</literal> and "
@@ -406,43 +294,36 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:231
 #, no-c-format
 msgid "Interceptors and decorators"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:236
 #, no-c-format
 msgid "Stereotypes"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:241
 #, no-c-format
 msgid "Events"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:246
 #, no-c-format
 msgid "Portable extension support"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:252
 #, no-c-format
 msgid "EJB beans are not supported."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:257
 #, no-c-format
 msgid "CDI SE Module"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:259
 #, no-c-format
 msgid ""
 "Weld provides an extension which will boot a CDI bean manager in Java SE, "
@@ -450,26 +331,12 @@
 "command line parameters can be injected using either of the following:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:264
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters List<String> params;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: environments.xml:266
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters String[] paramsArray;]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:268
 #, no-c-format
 msgid "The second form is useful for compatibility with existing classes."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:273
 #, no-c-format
 msgid ""
 "The command line parameters do not become available for injection until the "
@@ -480,45 +347,26 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:282
 #, no-c-format
 msgid "Here's an example of a simple CDI SE application:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:286
-#, no-c-format
-msgid ""
-"<![CDATA[@Singleton\n"
-"public class HelloWorld\n"
-"{\n"
-"   public void printHello(@Observes ContainerInitialized event, @Parameters "
-"List<String> parameters) {\n"
-"       System.out.println(\"Hello \" + parameters.get(0));\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:292
 #, no-c-format
 msgid "Bootstrapping CDI SE"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:294
 #, no-c-format
 msgid "CDI SE applications can be bootstrapped in the following ways."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:300
 #, no-c-format
 msgid "The ContainerInitialized Event"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:302
 #, no-c-format
 msgid ""
 "Thanks to the power of CDI's typesafe event model, application developers "
@@ -530,27 +378,18 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:310
 #, no-c-format
 msgid ""
 "In this case your application can be started by calling the provided main "
 "method like so:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:313
-#, no-c-format
-msgid "<![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:319
 #, no-c-format
 msgid "Programatic Bootstrap API"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:321
 #, no-c-format
 msgid ""
 "For added flexibility, CDI SE also comes with a bootstrap API which can be "
@@ -559,90 +398,65 @@
 "classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:327
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class Weld\n"
-"{\n"
-"\n"
-"   /** Boots Weld and creates and returns a WeldContainer instance, through "
-"which\n"
-"    * beans and events can be accesed. */\n"
-"   public WeldContainer initialize() {...}\n"
-"\n"
-"   /** Convenience method for shutting down the container. */\n"
-"   public void shutdown() {...}\n"
-"\n"
-"}]]>"
+"Here's an example application main method which uses this API to initialize "
+"a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:329
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class WeldContainer\n"
-"{\n"
-"\n"
-"   /** Provides access to all beans within the application. */\n"
-"   public Instance<Object> instance() {...}\n"
-"\n"
-"   /** Provides access to all events within the application. */\n"
-"   public Event<Object> event() {...}\n"
-"\n"
-"   /** Provides direct access to the BeanManager. */\n"
-"   public BeanManager getBeanManager() {...}\n"
-"\n"
-"}]]>"
+"Alternatively the application could be started by firing a custom event "
+"which would then be observed by another simple bean. The following example "
+"fires <literal>MyEvent</literal> on startup."
 msgstr ""
 
-#. Tag: para
-#: environments.xml:331
+#. Tag: title
 #, no-c-format
-msgid ""
-"Here's an example application main method which uses this API to initialize "
-"a bean of type <literal>MyApplicationBean</literal>."
+msgid "Thread Context"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:334
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.instance().select(MyApplicationBean.class).get();\n"
-"   weld.shutdown();\n"
-"}]]>"
+"In contrast to Java EE applications, Java SE applications place no "
+"restrictions on developers regarding the creation and usage of threads. "
+"Therefore Weld SE provides a custom scope annotation, "
+"<literal>@ThreadScoped</literal>, and corresponding context implementation "
+"which can be used to bind bean instances to the current thread. It is "
+"intended to be used in scenarios where you might otherwise use "
+"<literal>ThreadLocal</literal>, and does in fact use <literal>ThreadLocal</"
+"literal> under the hood."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:336
 #, no-c-format
 msgid ""
-"Alternatively the application could be started by firing a custom event "
-"which would then be observed by another simple bean. The following example "
-"fires <literal>MyEvent</literal> on startup."
+"To use the @ThreadScoped annotation you need to enable the "
+"<literal>RunnableDecorator</literal> which 'listens' for all executions of "
+"<literal>Runnable.run()</literal> and decorates them by setting up the "
+"thread context beforehand, bound to the current thread, and destroying the "
+"context afterwards."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:340
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.event().select(MyEvent.class).fire( new MyEvent() );\n"
-"   weld.shutdown();\n"
-"}]]>"
+"It is not necessary to use @ThreadScoped in all multithreaded applications. "
+"The thread context is not intended as a replacement for defining your own "
+"application-specific contexts. It is generally only useful in situtations "
+"where you would otherwise have used ThreadLocal directly, which are "
+"typically rare."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:348
 #, no-c-format
 msgid "Setting the Classpath"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:350
 #, no-c-format
 msgid ""
 "Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld "

Modified: doc/trunk/reference/zh-CN/events.po
===================================================================
--- doc/trunk/reference/zh-CN/events.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/events.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-16 11:17+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: events.xml:4
 #, no-c-format
 msgid "Events"
 msgstr "事件"
 
 #. Tag: para
-#: events.xml:6
 #, no-c-format
 msgid ""
 "Dependency injection enables loose-coupling by allowing the implementation "
@@ -31,7 +29,6 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:13
 #, no-c-format
 msgid ""
 "This basic schema might sound like the familiar observer/observable pattern, "
@@ -39,7 +36,6 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:18
 #, no-c-format
 msgid ""
 "not only are event producers decoupled from observers; observers are "
@@ -47,7 +43,6 @@
 msgstr "不仅是事件产生者和观察者解耦;观察者和产生者也完全解耦,"
 
 #. Tag: para
-#: events.xml:22
 #, no-c-format
 msgid ""
 "observers can specify a combination of \"selectors\" to narrow the set of "
@@ -55,7 +50,6 @@
 msgstr "观察者可以指定一个\"选择器\"组合来限定接受的事件通知,并且"
 
 #. Tag: para
-#: events.xml:28
 #, fuzzy, no-c-format
 msgid ""
 "observers can be notified immediately, or can specify that delivery of the "
@@ -63,7 +57,6 @@
 msgstr "观察者可以即刻被通知,也可以指定只有当前事务结束后再发送事件通知。"
 
 #. Tag: para
-#: events.xml:35
 #, no-c-format
 msgid ""
 "The CDI event notification facility uses more or less the same typesafe "
@@ -71,13 +64,11 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:39
 #, fuzzy, no-c-format
 msgid "Event payload"
 msgstr "事件生产者"
 
 #. Tag: para
-#: events.xml:41
 #, no-c-format
 msgid ""
 "The event object carries state from producer to consumer. The event object "
@@ -89,35 +80,18 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:48
 #, no-c-format
 msgid ""
 "An event qualifier is just a normal qualifier, defined using "
 "<literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({FIELD, PARAMETER})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated {}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated { ... }]]>"
-
 #. Tag: title
-#: events.xml:57
 #, no-c-format
 msgid "Event observers"
 msgstr "事件观察者"
 
 #. Tag: para
-#: events.xml:59
 #, fuzzy, no-c-format
 msgid ""
 "An <emphasis>observer method</emphasis> is a method of a bean with a "
@@ -126,18 +100,7 @@
 "一个 <emphasis>观察者方法</emphasis>是一个在Web Bean中的方法,该方法有一个用"
 "<literal>@Observes</literal>注释的参数。 "
 
-#. Tag: programlisting
-#: events.xml:64
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }]]>"
-
 #. Tag: para
-#: events.xml:66
 #, fuzzy, no-c-format
 msgid ""
 "The annotated parameter is called the <emphasis>event parameter</emphasis>. "
@@ -150,23 +113,12 @@
 "是Web Beans绑定类型的实例。当一个绑定类型作为事件选择器时,它也被称为一个"
 "<emphasis>事件绑定类型</emphasis>。"
 
-#. Tag: programlisting
-#: events.xml:72 events.xml:240
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:74
 #, fuzzy, no-c-format
 msgid ""
-"An observer method need not specify any event qualifiers&#8212;in this case "
-"it is interested in <emphasis>all</emphasis> events of a particular type. If "
-"it does specify qualifiers, it's only interested in events which have those "
+"An observer method need not specify any event qualifiers—in this case it is "
+"interested in <emphasis>all</emphasis> events of a particular type. If it "
+"does specify qualifiers, it's only interested in events which have those "
 "qualifiers."
 msgstr ""
 "一个观察者方法无须指定一个事件绑定 &#151; 在这种情况下,它对一个特定类型的 "
@@ -174,7 +126,6 @@
 "它只对那些有事件绑定的事件感兴趣(观察)。"
 
 #. Tag: para
-#: events.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "The observer method may have additional parameters, which are injection "
@@ -182,24 +133,12 @@
 msgstr ""
 "观察者方法可以有其他的参数,它们可以按照普通的Web Beans方法参数注入语法注入:"
 
-#. Tag: programlisting
-#: events.xml:84
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document, User user) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document, User user) { ... }]]>"
-
 #. Tag: title
-#: events.xml:89
 #, no-c-format
 msgid "Event producers"
 msgstr "事件生产者"
 
 #. Tag: para
-#: events.xml:91
 #, no-c-format
 msgid ""
 "Event producers fire events using an instance of the parameterized "
@@ -207,14 +146,7 @@
 "obtained by injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:96
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
-msgstr "<![CDATA[@Observable Event<Document> documentEvent]]>"
-
 #. Tag: para
-#: events.xml:98
 #, fuzzy, no-c-format
 msgid ""
 "A producer raises events by calling the <literal>fire()</literal> method of "
@@ -223,20 +155,12 @@
 "一个生产者通过调用 <literal>Event</literal> 接口的 <literal>fire()</literal> "
 "方法来触发事件,传递一个 <emphasis>事件对象</emphasis> :"
 
-#. Tag: programlisting
-#: events.xml:103
-#, no-c-format
-msgid "<![CDATA[documentEvent.fire(document);]]>"
-msgstr "<![CDATA[documentEvent.fire(document);]]>"
-
 #. Tag: para
-#: events.xml:105
 #, fuzzy, no-c-format
 msgid "This particular event will be delivered to every observer method that:"
 msgstr "事件将被发送给每个符合下面条件的观察者方法:"
 
 #. Tag: para
-#: events.xml:111
 #, fuzzy, no-c-format
 msgid ""
 "has an event parameter to which the event object (the <literal>Document</"
@@ -244,13 +168,11 @@
 msgstr "有一个事件参数可以赋给事件对象,并且"
 
 #. Tag: para
-#: events.xml:115
 #, fuzzy, no-c-format
 msgid "specifies no qualifiers."
 msgstr "没有指定事件绑定"
 
 #. Tag: para
-#: events.xml:119
 #, fuzzy, no-c-format
 msgid ""
 "The container simply calls all the observer methods, passing the event "
@@ -263,19 +185,16 @@
 "literal> 方法再次抛出这个异常。"
 
 #. Tag: para
-#: events.xml:125
 #, no-c-format
 msgid "Qualifiers can be applied to an event in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: events.xml:131
 #, no-c-format
 msgid "by annotating the <literal>Event</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: events.xml:134
 #, no-c-format
 msgid ""
 "by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
@@ -283,19 +202,11 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:138
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is far simpler:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:142
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
-msgstr "<![CDATA[@Observable @Updated Event<Document> documentUpdatedEvent]]>"
-
 #. Tag: para
-#: events.xml:144
 #, fuzzy, no-c-format
 msgid ""
 "Then, every event fired via this instance of <literal>Event</literal> has "
@@ -306,13 +217,11 @@
 "件将被发送给每个符合下面条件的观察者方法:"
 
 #. Tag: para
-#: events.xml:151
 #, no-c-format
 msgid "has an event parameter to which the event object is assignable, and"
 msgstr "有一个事件参数可以赋给事件对象,并且"
 
 #. Tag: para
-#: events.xml:154
 #, fuzzy, no-c-format
 msgid ""
 "does not have any event qualifier <emphasis>except</emphasis> for the event "
@@ -322,7 +231,6 @@
 "除了传递给<literal>fire()</literal>方法的事件绑定之外,没有指定任何事件绑定。"
 
 #. Tag: para
-#: events.xml:161
 #, no-c-format
 msgid ""
 "The downside of annotating the injection point is that we can't specify the "
@@ -332,18 +240,7 @@
 "<literal>Event</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:167
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
-"(document);]]>"
-msgstr ""
-"<![CDATA[documentEvent.fire( document, new AnnotationLiteral<Updated>()"
-"{} );]]>"
-
 #. Tag: para
-#: events.xml:169
 #, no-c-format
 msgid ""
 "Events can have multiple event qualifiers, assembled using any combination "
@@ -352,13 +249,11 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:178
 #, fuzzy, no-c-format
 msgid "Conditional observer methods"
 msgstr "事务性的观察者"
 
 #. Tag: para
-#: events.xml:180
 #, no-c-format
 msgid ""
 "By default, if there is no instance of an observer in the current context, "
@@ -368,25 +263,13 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:186
 #, no-c-format
 msgid ""
 "A conditional observer is specified by adding <literal>receive = IF_EXISTS</"
 "literal> to the <literal>@Observes</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = IF_EXISTS) "
-"@Updated Document d) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:193
 #, no-c-format
 msgid ""
 "A bean with scope <literal>@Dependent</literal> cannot be a conditional "
@@ -394,54 +277,22 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:200
 #, fuzzy, no-c-format
 msgid "Event qualifiers with members"
 msgstr "事件绑定成员"
 
 #. Tag: para
-#: events.xml:202
 #, fuzzy, no-c-format
 msgid "An event qualifier type may have annotation members:"
 msgstr "一个事件绑定类型可以有注释成员:"
 
-#. Tag: programlisting
-#: events.xml:204
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"   RoleType value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"    RoleType value();\n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:206
 #, no-c-format
 msgid ""
 "The member value is used to narrow the messages delivered to the observer:"
 msgstr "成员值用来限制发送给观察者的消息:"
 
-#. Tag: programlisting
-#: events.xml:208
-#, no-c-format
-msgid ""
-"<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
-"{ ... }]]>"
-
 #. Tag: para
-#: events.xml:210
 #, fuzzy, no-c-format
 msgid ""
 "Event qualifier type members may be specified statically by the event "
@@ -450,14 +301,7 @@
 "事件绑定类型成员可以通过事件产生者静态地指定,通过在事件通知者注入点使用注"
 "释:"
 
-#. Tag: programlisting
-#: events.xml:215
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
-msgstr "<![CDATA[@Observable @Role(ADMIN) Event<LoggedIn> LoggedInEvent;}}]]>"
-
 #. Tag: para
-#: events.xml:217
 #, fuzzy, no-c-format
 msgid ""
 "Alternatively, the value of the event qualifier type member may be "
@@ -467,109 +311,36 @@
 "或者事件绑定类型成员的值也可以由事件产生者动态地决定。我们先写一个 "
 "<literal>AnnotationLiteral</literal> 的抽象子类:"
 
-#. Tag: programlisting
-#: events.xml:222
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[abstract class RoleBinding \n"
-"   extends AnnotationLiteral<Role> \n"
-"   implements Role {}]]>"
-msgstr ""
-"<![CDATA[abstract class RoleBinding \n"
-"    extends AnnotationLiteral<Role> \n"
-"    implements Role {}]]>"
-
 #. Tag: para
-#: events.xml:224
 #, fuzzy, no-c-format
 msgid ""
 "The event producer passes an instance of this class to <literal>select()</"
 "literal>:"
 msgstr "事件产生者将一个这个类的实例传递给 <literal>fire()</literal> :"
 
-#. Tag: programlisting
-#: events.xml:226
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[documentEvent.select(new RoleBinding() {\n"
-"   public void value() { return user.getRole(); }\n"
-"}).fire(document);]]>"
-msgstr ""
-"<![CDATA[documentEvent.fire( document, new RoleBinding() { public void value"
-"() { return user.getRole(); } } );]]>"
-
 #. Tag: title
-#: events.xml:231
 #, fuzzy, no-c-format
 msgid "Multiple event qualifiers"
 msgstr "多个事件绑定"
 
 #. Tag: para
-#: events.xml:233
 #, fuzzy, no-c-format
 msgid "Event qualifier types may be combined, for example:"
 msgstr "事件绑定类型可以组合,例如:"
 
-#. Tag: programlisting
-#: events.xml:235
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>(){})."
-"fire(document);]]>"
-msgstr ""
-"<![CDATA[@Observable @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.fire(document, new "
-"AnnotationLiteral<Updated>(){});]]>"
-
 #. Tag: para
-#: events.xml:237
 #, no-c-format
 msgid ""
 "When this event occurs, all of the following observer methods will be "
 "notified:"
 msgstr "当这个事件发生时,下列所有观察者方法都会被通知:"
 
-#. Tag: programlisting
-#: events.xml:239
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
-"document) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
-"document) { ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:241
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
-"{ ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:242
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }}}]]>"
-msgstr ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }}}]]>"
-
 #. Tag: title
-#: events.xml:247
 #, no-c-format
 msgid "Transactional observers"
 msgstr "事务性的观察者"
 
 #. Tag: para
-#: events.xml:249
 #, no-c-format
 msgid ""
 "Transactional observers receive their event notifications during the before "
@@ -582,31 +353,18 @@
 "观察者方法需要刷新在应用上下文中缓存的查询结果集,但只有在事务成果地更新了 "
 "<literal>Category</literal> 树之后才能发生:"
 
-#. Tag: programlisting
-#: events.xml:256
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public void refreshCategoryTree(@Observes(during = AFTER_SUCCESS) "
-"CategoryUpdateEvent event) { ... }]]>"
-msgstr ""
-"<![CDATA[public void refreshCategoryTree(@AfterTransactionSuccess @Observes "
-"CategoryUpdateEvent event) { ... }]]>"
-
 #. Tag: para
-#: events.xml:258
 #, fuzzy, no-c-format
 msgid "There are five kinds of transactional observers:"
 msgstr "我们有三种事务性观察者:"
 
 #. Tag: para
-#: events.xml:262
 #, no-c-format
 msgid ""
 "<literal>IN_PROGESS</literal> observers are called immediately (default)"
 msgstr ""
 
 #. Tag: para
-#: events.xml:265
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_SUCCESS</literal> observers are called during the after "
@@ -617,7 +375,6 @@
 "用。"
 
 #. Tag: para
-#: events.xml:271
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_FAILURE</literal> observers are called during the after "
@@ -627,7 +384,6 @@
 "<literal>@AfterTransactionFailure</literal> 观察者仅仅在事务失败之后被调用。"
 
 #. Tag: para
-#: events.xml:277
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_COMPLETION</literal> observers are called during the after "
@@ -637,7 +393,6 @@
 "用。"
 
 #. Tag: para
-#: events.xml:283
 #, fuzzy, no-c-format
 msgid ""
 "<literal>BEFORE_COMPLETION</literal> observers are called during the before "
@@ -647,7 +402,6 @@
 "用。"
 
 #. Tag: para
-#: events.xml:290
 #, fuzzy, no-c-format
 msgid ""
 "Transactional observers are very important in a stateful object model "
@@ -657,56 +411,12 @@
 "一个单一的原子事务所保留的时间更长。"
 
 #. Tag: para
-#: events.xml:295
 #, no-c-format
 msgid ""
 "Imagine that we have cached a JPA query result set in the application scope:"
 msgstr "设想一下我们已经在应用范围内缓存了一个JPA的查询结果集:"
 
-#. Tag: programlisting
-#: events.xml:297
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   List<Product> products;\n"
-"\n"
-"   @Produces @Catalog \n"
-"   List<Product> getCatalog() {\n"
-"      if (products==null) {\n"
-"         products = em.createQuery(\"select p from Product p where p.deleted "
-"= false\")\n"
-"            .getResultList();\n"
-"      }\n"
-"      return products;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    List<Product> products;\n"
-"\n"
-"    @Produces @Catalog \n"
-"    List<Product> getCatalog() {\n"
-"        if (products==null) {\n"
-"            products = em.createQuery(\"select p from Product p where p."
-"deleted = false\")\n"
-"                .getResultList();\n"
-"        }\n"
-"        return products;\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:299
 #, no-c-format
 msgid ""
 "From time to time, a <literal>Product</literal> is created or deleted. When "
@@ -719,100 +429,283 @@
 "之后</emphasis>才能处理刷新。"
 
 #. Tag: para
-#: events.xml:305
 #, fuzzy, no-c-format
 msgid ""
 "The bean that creates and deletes <literal>Product</literal>s could raise "
 "events, for example:"
 msgstr "创建或者删除 <literal>Product</literal> 的Web Bean应该触发事件,例如:"
 
-#. Tag: programlisting
-#: events.xml:309
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"   @PersistenceContext EntityManager em;\n"
-"   @Inject @Any Event<Product> productEvent;\n"
-"\n"
-"   public void delete(Product product) {\n"
-"      em.delete(product);\n"
-"      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
-"(product);\n"
-"   }\n"
-"    \n"
-"   public void persist(Product product) {\n"
-"      em.persist(product);\n"
-"      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
-"(product);\n"
-"   }\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"\n"
-"    @PersistenceContext EntityManager em;\n"
-"    @Observable Event<Product> productEvent;\n"
-"\n"
-"    public void delete(Product product) {\n"
-"        em.delete(product);\n"
-"        productEvent.fire(product, new AnnotationLiteral<Deleted>(){});\n"
-"    }\n"
-"    \n"
-"    public void persist(Product product) {\n"
-"        em.persist(product);\n"
-"        productEvent.fire(product, new AnnotationLiteral<Created>(){});\n"
-"    }\n"
-"    \n"
-"    ...\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:311
 #, no-c-format
 msgid ""
 "And now <literal>Catalog</literal> can observe the events after successful "
 "completion of the transaction:"
 msgstr "现在 <literal>Catalog</literal> 能够观察到事务成功完成之后触发的事件:"
 
-#. Tag: programlisting
-#: events.xml:315
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"   ...\n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
-"product) {\n"
-"      products.add(product);\n"
-"   }\n"
-"    \n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
-"product) {\n"
-"      products.remove(product);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"    ...\n"
-"    \n"
-"    void addProduct(@AfterTransactionSuccess @Observes @Created Product "
-"product) {\n"
-"        products.add(product);\n"
-"    }\n"
-"    \n"
-"    void addProduct(@AfterTransactionSuccess @Observes @Deleted Product "
-"product) {\n"
-"        products.remove(product);\n"
-"    }\n"
-"    \n"
-"}]]>"
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({FIELD, PARAMETER})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated { ... }]]>"
 
 #~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
+#~ msgstr "<![CDATA[@Observable Event<Document> documentEvent]]>"
+
+#~ msgid "<![CDATA[documentEvent.fire(document);]]>"
+#~ msgstr "<![CDATA[documentEvent.fire(document);]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Updated Event<Document> documentUpdatedEvent]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
+#~ "(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.fire( document, new AnnotationLiteral<Updated>()"
+#~ "{} );]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = "
+#~ "IF_EXISTS) @Updated Document d) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "   RoleType value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "    RoleType value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Role(ADMIN) Event<LoggedIn> LoggedInEvent;}}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "   extends AnnotationLiteral<Role> \n"
+#~ "   implements Role {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "    extends AnnotationLiteral<Role> \n"
+#~ "    implements Role {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new RoleBinding() {\n"
+#~ "   public void value() { return user.getRole(); }\n"
+#~ "}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.fire( document, new RoleBinding() { public void "
+#~ "value() { return user.getRole(); } } );]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>()"
+#~ "{}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.fire(document, new "
+#~ "AnnotationLiteral<Updated>(){});]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public void refreshCategoryTree(@Observes(during = "
+#~ "AFTER_SUCCESS) CategoryUpdateEvent event) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void refreshCategoryTree(@AfterTransactionSuccess "
+#~ "@Observes CategoryUpdateEvent event) { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   List<Product> products;\n"
+#~ "\n"
+#~ "   @Produces @Catalog \n"
+#~ "   List<Product> getCatalog() {\n"
+#~ "      if (products==null) {\n"
+#~ "         products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "            .getResultList();\n"
+#~ "      }\n"
+#~ "      return products;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    List<Product> products;\n"
+#~ "\n"
+#~ "    @Produces @Catalog \n"
+#~ "    List<Product> getCatalog() {\n"
+#~ "        if (products==null) {\n"
+#~ "            products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "                .getResultList();\n"
+#~ "        }\n"
+#~ "        return products;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "   @Inject @Any Event<Product> productEvent;\n"
+#~ "\n"
+#~ "   public void delete(Product product) {\n"
+#~ "      em.delete(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void persist(Product product) {\n"
+#~ "      em.persist(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    @Observable Event<Product> productEvent;\n"
+#~ "\n"
+#~ "    public void delete(Product product) {\n"
+#~ "        em.delete(product);\n"
+#~ "        productEvent.fire(product, new AnnotationLiteral<Deleted>(){});\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void persist(Product product) {\n"
+#~ "        em.persist(product);\n"
+#~ "        productEvent.fire(product, new AnnotationLiteral<Created>(){});\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    ...\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "   ...\n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
+#~ "product) {\n"
+#~ "      products.add(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
+#~ "product) {\n"
+#~ "      products.remove(product);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "    ...\n"
+#~ "    \n"
+#~ "    void addProduct(@AfterTransactionSuccess @Observes @Created Product "
+#~ "product) {\n"
+#~ "        products.add(product);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    void addProduct(@AfterTransactionSuccess @Observes @Deleted Product "
+#~ "product) {\n"
+#~ "        products.remove(product);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "The Web Beans event notification facility allows Web Beans to interact in "
 #~ "a totally decoupled manner. Event <emphasis>producers</emphasis> raise "
 #~ "events that are then delivered to event <emphasis>observers</emphasis> by "

Modified: doc/trunk/reference/zh-CN/example.po
===================================================================
--- doc/trunk/reference/zh-CN/example.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/example.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-12 11:27+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: example.xml:4
 #, no-c-format
 msgid "JSF web application example"
 msgstr "JSF Web应用例子"
 
 #. Tag: para
-#: example.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "Let's illustrate these ideas with a full example. We're going to implement "
@@ -32,112 +30,17 @@
 "让我们通过一个完整的例子来演示这些想法。我们将是使用JSF来实现一个应用的用户登"
 "录/退出功能。首先,我们定一个Web Bean来持有登录过程中用户输入的用户名和密码:"
 
-#. Tag: programlisting
-#: example.xml:12
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    @NotNull @Length(min=3, max=25)\n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    @NotNull @Length(min=6, max=20)\n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"        \n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:14
 #, fuzzy, no-c-format
 msgid "This bean is bound to the login prompt in the following JSF form:"
 msgstr "这个Web Bean和下面的JSF表单的login绑定:"
 
-#. Tag: programlisting
-#: example.xml:16
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<h:form>\n"
-"   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"      <f:validateBean>\n"
-"         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"         <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"         <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"      </f:validateBean>\n"
-"   </h:panelGrid>\n"
-"   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-msgstr ""
-"<![CDATA[<h:form>\n"
-"    <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"        <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"        <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"        <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"        <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"    </h:panelGrid>\n"
-"    <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"    <h:commandButton value=\"Logout\" acion=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-
 #. Tag: para
-#: example.xml:18
 #, no-c-format
 msgid "Users are represented by a JPA entity:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:22
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Entity\n"
-"public class User {\n"
-"   private @NotNull @Length(min=3, max=25) @Id String username;\n"
-"   private @NotNull @Length(min=6, max=20) String password;\n"
-"   \n"
-"   public String getUsername() { return username; }\n"
-"   public void setUsername(String username) { this.username = username; }\n"
-"   public String setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"        \n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:24
 #, no-c-format
 msgid ""
 "(Note that we're also going to need a <literal>persistence.xml</literal> "
@@ -146,7 +49,6 @@
 msgstr ""
 
 #. Tag: para
-#: example.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "The actual work is done by a session-scoped bean that maintains information "
@@ -156,192 +58,33 @@
 "实际的工作由一个会话范围的Web Bean完成。这个会话范围的Web Bean维护当前登录用"
 "户的信息,并且将<literal>User</literal>实体暴露给其他Web Bean:"
 
-#. Tag: programlisting
-#: example.xml:34
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login implements Serializable {\n"
-"\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject @UserDatabase EntityManager userDatabase;\n"
-"\n"
-"   private User user;\n"
-"    \n"
-"   public void login() {\n"
-"      List<User> results = userDatabase.createQuery(\n"
-"         \"select u from User u where u.username = :username and u.password "
-"= :password\")\n"
-"         .setParameter(\"username\", credentials.getUsername())\n"
-"         .setParameter(\"password\", credentials.getPassword())\n"
-"         .getResultList();\n"
-"        \n"
-"      if (!results.isEmpty()) {\n"
-"         user = results.get(0);\n"
-"      }\n"
-"      else {\n"
-"         // perhaps add code here to report a failed login\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void logout() {\n"
-"      user = null;\n"
-"   }\n"
-"    \n"
-"   public boolean isLoggedIn() {\n"
-"      return user != null;\n"
-"   }\n"
-"    \n"
-"   @Produces @LoggedIn User getCurrentUser() {\n"
-"      return user;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @PersistenceContext EntityManager userDatabase;\n"
-"\n"
-"    private User user;\n"
-"    \n"
-"    public void login() {\n"
-"            \n"
-"        List<User> results = userDatabase.createQuery(\n"
-"           \"select u from User u where u.username=:username and u.password=:"
-"password\")\n"
-"           .setParameter(\"username\", credentials.getUsername())\n"
-"           .setParameter(\"password\", credentials.getPassword())\n"
-"           .getResultList();\n"
-"        \n"
-"        if ( !results.isEmpty() ) {\n"
-"           user = results.get(0);\n"
-"        }\n"
-"        \n"
-"    }\n"
-"    \n"
-"    public void logout() {\n"
-"        user = null;\n"
-"    }\n"
-"    \n"
-"    public boolean isLoggedIn() {\n"
-"       return user!=null;\n"
-"    }\n"
-"    \n"
-"    @Produces @LoggedIn User getCurrentUser() {\n"
-"        return user;\n"
-"    }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:36
 #, no-c-format
 msgid ""
 "<literal>@LoggedIn</literal> and <literal>@UserDatabase</literal> are custom "
 "qualifier annotations:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:38
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"public @interface LoggedIn {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD})\n"
-"@BindingType\n"
-"public @interface LoggedIn {}]]>"
-
-#. Tag: programlisting
-#: example.xml:40
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, PARAMETER, FIELD})\n"
-"public @interface UserDatabase {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD})\n"
-"@BindingType\n"
-"public @interface LoggedIn {}]]>"
-
 #. Tag: para
-#: example.xml:42
 #, no-c-format
 msgid ""
 "We need an adaptor bean to expose our typesafe <literal>EntityManager</"
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:46
-#, no-c-format
-msgid ""
-"<![CDATA[class UserDatabaseProducer {\n"
-"   @Produces @UserDatabase @PersistenceContext \n"
-"   static EntityManager userDatabase;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "Now <literal>DocumentEditor</literal>, or any other bean, can easily inject "
 "the current user:"
 msgstr "现在,任何其他的Web Bean可以轻松地将当前用户注入:"
 
-#. Tag: programlisting
-#: example.xml:50
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DocumentEditor {\n"
-"   @Inject Document document;\n"
-"   @Inject @LoggedIn User currentUser;\n"
-"   @Inject @DocumentDatabase EntityManager docDatabase;\n"
-"    \n"
-"   public void save() {\n"
-"      document.setCreatedBy(currentUser);\n"
-"      docDatabase.persist(document);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class DocumentEditor {\n"
-"\n"
-"    @Current Document document;\n"
-"    @LoggedIn User currentUser;\n"
-"    @PersistenceContext EntityManager docDatabase;\n"
-"    \n"
-"    public void save() {\n"
-"        document.setCreatedBy(currentUser);\n"
-"        docDatabase.persist(document);\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:52
 #, no-c-format
 msgid "Or we can reference the current user in a JSF view:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:54
-#, no-c-format
-msgid ""
-"<![CDATA[<h:panelGroup rendered=\"#{login.loggedIn}\">\n"
-"   signed in as #{currentUser.username}\n"
-"</h:panelGroup>]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:56
 #, fuzzy, no-c-format
 msgid ""
 "Hopefully, this example gave you a taste of the CDI programming model. In "
@@ -350,5 +93,228 @@
 "希望这个例子能够让你尝试了Web Bean的编程模型。在下一章中,我们将更加深入的研"
 "究Web Bean的依赖注入。"
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=3, max=25)\n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=6, max=20)\n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "        \n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<h:form>\n"
+#~ "   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "      <f:validateBean>\n"
+#~ "         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"username\" value=\"#{credentials.username}\"/"
+#~ ">\n"
+#~ "         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"password\" value=\"#{credentials.password}\"/"
+#~ ">\n"
+#~ "      </f:validateBean>\n"
+#~ "   </h:panelGrid>\n"
+#~ "   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#"
+#~ "{!login.loggedIn}\"/>\n"
+#~ "   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</h:form>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<h:form>\n"
+#~ "    <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "        <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "        <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
+#~ "        <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "        <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
+#~ "    </h:panelGrid>\n"
+#~ "    <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered="
+#~ "\"#{!login.loggedIn}\"/>\n"
+#~ "    <h:commandButton value=\"Logout\" acion=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</h:form>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Entity\n"
+#~ "public class User {\n"
+#~ "   private @NotNull @Length(min=3, max=25) @Id String username;\n"
+#~ "   private @NotNull @Length(min=6, max=20) String password;\n"
+#~ "   \n"
+#~ "   public String getUsername() { return username; }\n"
+#~ "   public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "   public String setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "        \n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login implements Serializable {\n"
+#~ "\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject @UserDatabase EntityManager userDatabase;\n"
+#~ "\n"
+#~ "   private User user;\n"
+#~ "    \n"
+#~ "   public void login() {\n"
+#~ "      List<User> results = userDatabase.createQuery(\n"
+#~ "         \"select u from User u where u.username = :username and u."
+#~ "password = :password\")\n"
+#~ "         .setParameter(\"username\", credentials.getUsername())\n"
+#~ "         .setParameter(\"password\", credentials.getPassword())\n"
+#~ "         .getResultList();\n"
+#~ "        \n"
+#~ "      if (!results.isEmpty()) {\n"
+#~ "         user = results.get(0);\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         // perhaps add code here to report a failed login\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void logout() {\n"
+#~ "      user = null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public boolean isLoggedIn() {\n"
+#~ "      return user != null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "      return user;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @PersistenceContext EntityManager userDatabase;\n"
+#~ "\n"
+#~ "    private User user;\n"
+#~ "    \n"
+#~ "    public void login() {\n"
+#~ "            \n"
+#~ "        List<User> results = userDatabase.createQuery(\n"
+#~ "           \"select u from User u where u.username=:username and u."
+#~ "password=:password\")\n"
+#~ "           .setParameter(\"username\", credentials.getUsername())\n"
+#~ "           .setParameter(\"password\", credentials.getPassword())\n"
+#~ "           .getResultList();\n"
+#~ "        \n"
+#~ "        if ( !results.isEmpty() ) {\n"
+#~ "           user = results.get(0);\n"
+#~ "        }\n"
+#~ "        \n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void logout() {\n"
+#~ "        user = null;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public boolean isLoggedIn() {\n"
+#~ "       return user!=null;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "        return user;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface LoggedIn {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD})\n"
+#~ "@BindingType\n"
+#~ "public @interface LoggedIn {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface UserDatabase {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD})\n"
+#~ "@BindingType\n"
+#~ "public @interface LoggedIn {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "   @Inject Document document;\n"
+#~ "   @Inject @LoggedIn User currentUser;\n"
+#~ "   @Inject @DocumentDatabase EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "   public void save() {\n"
+#~ "      document.setCreatedBy(currentUser);\n"
+#~ "      docDatabase.persist(document);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "\n"
+#~ "    @Current Document document;\n"
+#~ "    @LoggedIn User currentUser;\n"
+#~ "    @PersistenceContext EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "    public void save() {\n"
+#~ "        document.setCreatedBy(currentUser);\n"
+#~ "        docDatabase.persist(document);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
 #~ msgid "Of course, <literal>@LoggedIn</literal> is a binding annotation:"
 #~ msgstr "当然, <literal>@LoggedIn</literal>是一个绑定注释:"

Modified: doc/trunk/reference/zh-CN/extend.po
===================================================================
--- doc/trunk/reference/zh-CN/extend.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/extend.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-02-16 14:16+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: extend.xml:5
 #, no-c-format
 msgid "Portable extensions"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "CDI is intended to be a foundation for frameworks, extensions and "
@@ -33,13 +31,11 @@
 "Web Bean设计者设想的扩展类型:"
 
 #. Tag: para
-#: extend.xml:15
 #, no-c-format
 msgid "integration with Business Process Management engines,"
 msgstr "整合业务流程管理引擎,"
 
 #. Tag: para
-#: extend.xml:18
 #, no-c-format
 msgid ""
 "integration with third-party frameworks such as Spring, Seam, GWT or Wicket, "
@@ -47,31 +43,26 @@
 msgstr "整合第三方框架,例如Spring, Seam, GWT或者Wicket,和"
 
 #. Tag: para
-#: extend.xml:23
 #, fuzzy, no-c-format
 msgid "new technology based upon the CDI programming model."
 msgstr "基于Web Bean编程模型的新技术。"
 
 #. Tag: para
-#: extend.xml:27
 #, no-c-format
 msgid "More formally, according to the spec:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:32
 #, no-c-format
 msgid "A portable extension may integrate with the container by:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:35
 #, no-c-format
 msgid "Providing its own beans, interceptors and decorators to the container"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:40
 #, no-c-format
 msgid ""
 "Injecting dependencies into its own objects using the dependency injection "
@@ -79,13 +70,11 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:45
 #, no-c-format
 msgid "Providing a context implementation for a custom scope"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:50
 #, no-c-format
 msgid ""
 "Augmenting or overriding the annotation-based metadata with metadata from "
@@ -93,13 +82,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:58
 #, fuzzy, no-c-format
 msgid "Creating an <literal>Extension</literal>"
 msgstr " <literal>Bean</literal> 类"
 
 #. Tag: para
-#: extend.xml:60
 #, no-c-format
 msgid ""
 "The first step in creating a portable extension is to write a class that "
@@ -108,14 +95,7 @@
 "service provider architecture."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:66
-#, no-c-format
-msgid "class MyExtension implements Extension { ... }"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:68
 #, no-c-format
 msgid ""
 "Next, we need to register our extension as a service provider by creating a "
@@ -123,14 +103,7 @@
 "literal>, which contains the name of our extension class:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:74
-#, no-c-format
-msgid "org.mydomain.extension.MyExtension"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:76
 #, no-c-format
 msgid ""
 "An extension is not a bean, exactly, since it is instantiated by the "
@@ -139,18 +112,7 @@
 "process is complete."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:82
-#, no-c-format
-msgid ""
-"@Inject \n"
-"MyBean(MyExtension myExtension) {\n"
-"   myExtension.doSomething();\n"
-"}"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:84
 #, no-c-format
 msgid ""
 "And, like beans, extensions can have observer methods. Usually, the observer "
@@ -158,33 +120,28 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:92
 #, no-c-format
 msgid "Container lifecycle events"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:94
 #, no-c-format
 msgid ""
 "During the initialization process, the container fires a series of events, "
 "including:"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:101
-#, no-c-format
-msgid "BeforeBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>BeforeBeanDiscovery</literal>"
+msgstr " <literal>Manager</literal> 对象"
 
-#. Tag: literal
-#: extend.xml:106
-#, no-c-format
-msgid "ProcessAnnotatedType"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>ProcessAnnotatedType</literal>"
+msgstr " <literal>Manager</literal> 对象"
 
 #. Tag: para
-#: extend.xml:110
 #, no-c-format
 msgid ""
 "<literal>ProcessInjectionTarget</literal> and <literal>ProcessProducer</"
@@ -192,54 +149,27 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:115
 #, no-c-format
 msgid ""
 "<literal>ProcessBean</literal> and <literal>ProcessObserverMethod</literal>"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:121
-#, no-c-format
-msgid "AfterBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>AfterBeanDiscovery</literal>"
+msgstr " <literal>Manager</literal> 对象"
 
-#. Tag: literal
-#: extend.xml:126
+#. Tag: para
 #, no-c-format
-msgid "AfterDeploymentValidation"
+msgid "<literal>AfterDeploymentValidation</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:131
 #, no-c-format
 msgid "Extensions may observe these events:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:135
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"   \n"
-"   void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bbd) {\n"
-"      Logger.global.debug(\"beginning the scanning process\");\n"
-"   }\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      Logger.global.debug(\"scanning type: \" + pat.getAnnotatedType()."
-"getJavaClass().getName());\n"
-"   } \n"
-"\n"
-"   void afterBeanDiscovery(@Observes AfterBeanDiscovery abd) {\n"
-"      Logger.global.debug(\"finished the scanning process\");\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:137
 #, no-c-format
 msgid ""
 "In fact, the extension can do a lot more than just observe. The extension is "
@@ -247,43 +177,17 @@
 "example:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:142
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      //tell the container to ignore the type if it is annotated @Ignore\n"
-"      if ( pat.getAnnotatedType().isAnnotionPresent(Ignore.class) ) pat.veto"
-"();   \n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:144
 #, fuzzy, no-c-format
 msgid "The observer method may inject a <literal>BeanManager</literal>"
 msgstr "扩展Web Bean的神经中枢是 <literal>Manager</literal> 对象。"
 
-#. Tag: programlisting
-#: extend.xml:148
-#, no-c-format
-msgid ""
-"<![CDATA[<T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> "
-"pat, BeanManager beanManager) { ... }]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:153
 #, fuzzy, no-c-format
 msgid "The <literal>BeanManager</literal> object"
 msgstr " <literal>Manager</literal> 对象"
 
 #. Tag: para
-#: extend.xml:155
 #, fuzzy, no-c-format
 msgid ""
 "The nerve center for extending CDI is the <literal>BeanManager</literal> "
@@ -293,68 +197,14 @@
 " <literal>Manager</literal> 接口能够让我们通过编程来注册和获得Web Bean,拦截"
 "器,装饰器,观察者和上下文。"
 
-#. Tag: programlisting
-#: extend.xml:161
-#, no-c-format
-msgid ""
-"<![CDATA[public interface BeanManager {\n"
-"   public Object getReference(Bean<?> bean, Type beanType, "
-"CreationalContext<?> ctx);\n"
-"   public Object getInjectableReference(InjectionPoint ij, "
-"CreationalContext<?> ctx);\n"
-"   public <T> CreationalContext<T> createCreationalContext(Contextual<T> "
-"contextual);\n"
-"   public Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers);\n"
-"   public Set<Bean<?>> getBeans(String name);\n"
-"   public Bean<?> getPassivationCapableBean(String id);\n"
-"   public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);\n"
-"   public void validate(InjectionPoint injectionPoint);\n"
-"   public void fireEvent(Object event, Annotation... qualifiers);\n"
-"   public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, "
-"Annotation... qualifiers);\n"
-"   public List<Decorator<?>> resolveDecorators(Set<Type> types, "
-"Annotation... qualifiers);\n"
-"   public List<Interceptor<?>> resolveInterceptors(InterceptionType type, "
-"Annotation... interceptorBindings);\n"
-"   public boolean isScope(Class<? extends Annotation> annotationType);\n"
-"   public boolean isNormalScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isPassivatingScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isQualifier(Class<? extends Annotation> annotationType);\n"
-"   public boolean isInterceptorBinding(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isStereotype(Class<? extends Annotation> annotationType);\n"
-"   public Set<Annotation> getInterceptorBindingDefinition(Class<? extends "
-"Annotation> bindingType);\n"
-"   public Set<Annotation> getStereotypeDefinition(Class<? extends "
-"Annotation> stereotype);\n"
-"   public Context getContext(Class<? extends Annotation> scopeType);\n"
-"   public ELResolver getELResolver();\n"
-"   public ExpressionFactory wrapExpressionFactory(ExpressionFactory "
-"expressionFactory);\n"
-"   public <T> AnnotatedType<T> createAnnotatedType(Class<T> type);\n"
-"   public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> "
-"type);\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:163
 #, fuzzy, no-c-format
 msgid ""
 "Any bean or other Java EE component which supports injection can obtain an "
 "instance of <literal>BeanManager</literal> via injection:"
 msgstr "我们可以通过注入来获得一个 <literal>Manager</literal> 实例:"
 
-#. Tag: programlisting
-#: extend.xml:166
-#, fuzzy, no-c-format
-msgid "@Inject BeanManager beanManager;"
-msgstr "@Current Manager manager"
-
 #. Tag: para
-#: extend.xml:168
 #, no-c-format
 msgid ""
 "Java EE components may obtain an instance of <literal>BeanManager</literal> "
@@ -364,7 +214,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:174
 #, fuzzy, no-c-format
 msgid ""
 "Let's study some of the interfaces exposed by the <literal>BeanManager</"
@@ -372,13 +221,11 @@
 msgstr "扩展Web Bean的神经中枢是 <literal>Manager</literal> 对象。"
 
 #. Tag: title
-#: extend.xml:179
 #, fuzzy, no-c-format
 msgid "The <literal>InjectionTarget</literal> interface"
 msgstr " <literal>Context</literal> 接口"
 
 #. Tag: para
-#: extend.xml:181
 #, no-c-format
 msgid ""
 "The first thing that a framework developer is going to look for in the "
@@ -388,7 +235,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:188
 #, no-c-format
 msgid ""
 "We recommend that frameworks let CDI take over the job of actually "
@@ -399,50 +245,12 @@
 "field injection will be supported."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:196
-#, no-c-format
-msgid ""
-"<![CDATA[//get the BeanManager from JNDI\n"
-"BeanManager beanManager = (BeanManager) new InitialContext().lookup(\"java:"
-"comp/BeanManager\");\n"
-"\n"
-"//CDI uses an AnnotatedType object to read the annotations of a class\n"
-"AnnotatedType<SomeFrameworkComponent> type = beanManager.createAnnotatedType"
-"(SomeFrameworkComponent.class);\n"
-"\n"
-"//The extension uses an InjectionTarget to delegate instantiation, "
-"dependency injection \n"
-"//and lifecycle callbacks to the CDI container\n"
-"InjectionTarget<SomeFrameworkComponent> it = beanManager."
-"createInjectionTarget(type);\n"
-"\n"
-"//each instance needs its own CDI CreationalContext\n"
-"CreationalContext ctx = beanManager.createCreationalContext(null);\n"
-"\n"
-"//instantiate the framework component and inject its dependencies\n"
-"SomeFrameworkComponent instance = it.produce(ctx);  //call the constructor\n"
-"it.inject(instance, ctx);  //call initializer methods and perform field "
-"injection\n"
-"it.postConstruct(instance);  //call the @PostConstruct method\n"
-"\n"
-"...\n"
-"\n"
-"//destroy the framework component instance and clean up dependent objects\n"
-"it.preDestroy(instance);  //call the @PreDestroy method\n"
-"it.dispose(instance);  //it is now safe to discard the instance\n"
-"ctx.release();  //clean up dependent objects\n"
-"]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:201
 #, fuzzy, no-c-format
 msgid "The <literal>Bean</literal> interface"
 msgstr " <literal>Context</literal> 接口"
 
 #. Tag: para
-#: extend.xml:203
 #, fuzzy, no-c-format
 msgid ""
 "Instances of the interface <literal>Bean</literal> represent beans. There is "
@@ -455,46 +263,18 @@
 "个在 <literal>Manager</literal> 注册的  <literal>Bean</literal> 实例。"
 
 #. Tag: para
-#: extend.xml:210
 #, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface exposes all the interesting things we "
-"dicussed in <xref linkend=\"bean-anatomy\"/>."
+"dicussed in <xref linkend=\"bean-anatomy\" />."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:215
-#, no-c-format
-msgid ""
-"<![CDATA[public interface Bean<T> extends Contextual<T> {\n"
-"   public Set<Type> getTypes();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public String getName();\n"
-"   public Set<Class<? extends Annotation>> getStereotypes();\n"
-"   public Class<?> getBeanClass();\n"
-"   public boolean isAlternative();\n"
-"   public boolean isNullable();\n"
-"   public Set<InjectionPoint> getInjectionPoints();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:217
 #, no-c-format
 msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:221
-#, no-c-format
-msgid ""
-"<![CDATA[Set<Bean<?>> allBeans = beanManager.getBeans(Obect.class, new "
-"AnnotationLiteral<Any>() {});]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:223
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface makes it possible for a portable "
@@ -509,13 +289,11 @@
 "<literal>Bean</literal> 类来允许其他框架管理的对象能够注入到Web Bean中。"
 
 #. Tag: title
-#: extend.xml:233
 #, fuzzy, no-c-format
 msgid "Registering a <literal>Bean</literal>"
 msgstr " <literal>Bean</literal> 类"
 
 #. Tag: para
-#: extend.xml:235
 #, no-c-format
 msgid ""
 "The most common kind of CDI portable extension registers a bean (or beans) "
@@ -523,7 +301,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:239
 #, no-c-format
 msgid ""
 "In this example, we make a framework class, <literal>SecurityManager</"
@@ -533,101 +310,7 @@
 "<literal>SecurityManager</literal> instance."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[public class SecurityManagerExtension implements Extension {\n"
-"    \n"
-"    void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager "
-"bm) {\n"
-"            \n"
-"        //use this to read annotations of the class\n"
-"        AnnotatedType<SecurityManager> at = bm.createAnnotatedType"
-"(SecurityManager.class); \n"
-"\n"
-"        //use this to instantiate the class and inject dependencies\n"
-"        final InjectionTarget<SecurityManager> it = bm.createInjectionTarget"
-"(at); \n"
-"\n"
-"        abd.addBean( new Bean<SecurityManager>() {\n"
-"\n"
-"            @Override\n"
-"            public Class<?> getBeanClass() {\n"
-"                return SecurityManager.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public String getName() {\n"
-"                return \"securityManager\";\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getQualifiers() {\n"
-"                Set<Annotation> qualifiers = new HashSet<Annotation>();\n"
-"                qualifiers.add( new AnnotationLiteral<Default>() {} );\n"
-"                qualifiers.add( new AnnotationLiteral<Any>() {} );\n"
-"                return qualifiers;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<? extends Annotation> getScope() {\n"
-"                return SessionScoped.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Class<? extends Annotation>> getStereotypes() {\n"
-"                return Collections.emptySet();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypes() {\n"
-"                Set<Type> types = new HashSet<Type>();\n"
-"                types.add(SecurityManager.class);\n"
-"                types.add(Object.class);\n"
-"                return types;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAlternative() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isNullable() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public SecurityManager create(CreationalContext<SecurityManager> "
-"ctx) {\n"
-"                SecurityManager instance = it.produce(ctx);\n"
-"                it.inject(instance, ctx);\n"
-"                it.postConstruct(instance);\n"
-"                return instance;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void destroy(SecurityManager instance, \n"
-"                                CreationalContext<SecurityManager> ctx) {\n"
-"                it.preDestroy(instance);\n"
-"                it.dispose(instance);\n"
-"                ctx.release();\n"
-"            }\n"
-"            \n"
-"        } );\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:248
 #, no-c-format
 msgid ""
 "But a portable extension can also mess with beans that are discovered "
@@ -635,13 +318,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:255
 #, no-c-format
 msgid "Wrapping an <literal>AnnotatedType</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:257
 #, no-c-format
 msgid ""
 "One of the most interesting things that an extension class can do is process "
@@ -650,7 +331,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:262
 #, no-c-format
 msgid ""
 "Let's start with an example of an extension that provides support for the "
@@ -661,101 +341,7 @@
 "<literal>value()</literal> of the <literal>@Named</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:270
-#, no-c-format
-msgid ""
-"<![CDATA[public class QualifiedNameExtension implements Extension {\n"
-"\n"
-"    <X> void processAnnotatedType(@Observes ProcessAnnotatedType<X> pat) {\n"
-"\n"
-"        //wrap this to override the annotations of the class\n"
-"        final AnnotatedType<X> at = pat.getAnnotatedType();\n"
-"        \n"
-"        AnnotatedType<X> wrapped = new AnnotatedType<X>() {\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedConstructor<X>> getConstructors() {\n"
-"                return at.getConstructors();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedField<? super X>> getFields() {\n"
-"                return at.getFields();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<X> getJavaClass() {\n"
-"                return at.getJavaClass();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedMethod<? super X>> getMethods() {\n"
-"                return at.getMethods();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public <T extends Annotation> T getAnnotation(final Class<T> "
-"annType) {\n"
-"                if ( Named.class.equals(annType) ) {\n"
-"                    class NamedLiteral \n"
-"                            extends AnnotationLiteral<Named> \n"
-"                            implements Named {\n"
-"                        @Override\n"
-"                        public String value() {\n"
-"                            Package pkg = at.getClass().getPackage();\n"
-"                            String unqualifiedName = at.getAnnotation(Named."
-"class).value();\n"
-"                            final String qualifiedName;\n"
-"                            if ( pkg.isAnnotationPresent(Named.class) ) {\n"
-"                                qualifiedName = pkg.getAnnotation(Named."
-"class).value() \n"
-"                                      + '.' + unqualifiedName;\n"
-"                            }\n"
-"                            else {\n"
-"                                qualifiedName = unqualifiedName;\n"
-"                            }\n"
-"                            return qualifiedName;\n"
-"                        }\n"
-"                    }\n"
-"                    return (T) new NamedLiteral();\n"
-"                }\n"
-"                else {\n"
-"                    return at.getAnnotation(annType);\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getAnnotations() {\n"
-"                return at.getAnnotations();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Type getBaseType() {\n"
-"                return at.getBaseType();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypeClosure() {\n"
-"                return at.getTypeClosure();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annType) {\n"
-"                return at.isAnnotationPresent(annType);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pat.setAnnotatedType(wrapped);\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:272
 #, no-c-format
 msgid ""
 "Here's a second example, which adds the <literal>@Alternative</literal> "
@@ -763,41 +349,7 @@
 "literal> interface."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:277
-#, no-c-format
-msgid ""
-"<![CDATA[class ServiceAlternativeExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"   \n"
-"      final AnnotatedType<T> type = pat.getAnnotatedType();\n"
-"      \n"
-"      if ( Service.class.isAssignableFrom( type.getJavaClass() ) ) {\n"
-"      \n"
-"         //if the class implements Service, make it an @Alternative\n"
-"         AnnotatedType<T> wrapped = new AnnotatedType<T>() {\n"
-"         \n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annotationType) {\n"
-"               return annotationType.equals(Alternative.class) ? \n"
-"                  true : type.isAnnotationPresent(annotationType);\n"
-"            }\n"
-"            \n"
-"            //remaining methods of AnnotatedType\n"
-"            ...\n"
-"         }\n"
-"         \n"
-"         pat.setAnnotatedType(wrapped);\n"
-"      }\n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:283
 #, no-c-format
 msgid ""
 "The <literal>AnnotatedType</literal> is not the only thing that can be "
@@ -805,13 +357,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:288
 #, no-c-format
 msgid "Wrapping an <literal>InjectionTarget</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:290
 #, no-c-format
 msgid ""
 "The <literal>InjectionTarget</literal> interface exposes operations for "
@@ -823,7 +373,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:297
 #, no-c-format
 msgid ""
 "Here's a CDI portable extension that reads values from properties files and "
@@ -835,16 +384,7 @@
 "<literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:305
-#, no-c-format
-msgid ""
-"firstName=Gavin\n"
-"lastName=King"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:307
 #, no-c-format
 msgid ""
 "The portable extension works by wrapping the containers "
@@ -852,121 +392,7 @@
 "<literal>inject()</literal> method."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:310
-#, no-c-format
-msgid ""
-"<![CDATA[public class ConfigExtension implements Extension {\n"
-"\n"
-"        <X> void processInjectionTarget(@Observes ProcessInjectionTarget<X> "
-"pit) {\n"
-"                \n"
-"                //wrap this to intercept the component lifecycle\n"
-"            final InjectionTarget<X> it = pit.getInjectionTarget();\n"
-"            \n"
-"        final Map<Field, Object> configuredValues = new HashMap<Field, "
-"Object>();\n"
-"        \n"
-"        //use this to read annotations of the class and its members\n"
-"        AnnotatedType<X> at = pit.getAnnotatedType();\n"
-"        \n"
-"        //read the properties file\n"
-"        String propsFileName = at.getClass().getSimpleName() + \".properties"
-"\";\n"
-"        InputStream stream = at.getJavaClass().getResourceAsStream"
-"(propsFileName);\n"
-"        if (stream!=null) {\n"
-"            \n"
-"            try {\n"
-"                Properties props = new Properties();\n"
-"                props.load(stream);\n"
-"                for (Map.Entry<Object, Object> property : props.entrySet()) "
-"{\n"
-"                    String fieldName = property.getKey().toString();\n"
-"                    Object value = property.getValue();\n"
-"                    try {\n"
-"                        Field field = at.getJavaClass().getField"
-"(fieldName);\n"
-"                        field.setAccessible(true);\n"
-"                        if ( field.getType().isAssignableFrom( value.getClass"
-"() ) ) {\n"
-"                            configuredValues.put(field, value);\n"
-"                        }\n"
-"                        else {\n"
-"                            //TODO: do type conversion automatically\n"
-"                            pit.addDefinitionError( new InjectionException(\n"
-"                                   \"field is not of type String: \" + "
-"field ) );\n"
-"                        }\n"
-"                    }\n"
-"                    catch (NoSuchFieldException nsfe) {\n"
-"                        pit.addDefinitionError(nsfe);\n"
-"                    }\n"
-"                    finally {\n"
-"                        stream.close();\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"            catch (IOException ioe) {\n"
-"                pit.addDefinitionError(ioe);\n"
-"            }\n"
-"        }\n"
-"        \n"
-"        InjectionTarget<X> wrapped = new InjectionTarget<X>() {\n"
-"\n"
-"            @Override\n"
-"            public void inject(X instance, CreationalContext<X> ctx) {\n"
-"                it.inject(instance, ctx);\n"
-"                \n"
-"                //set the values onto the new instance of the component\n"
-"                for (Map.Entry<Field, Object> configuredValue: "
-"configuredValues.entrySet()) {\n"
-"                    try {\n"
-"                        configuredValue.getKey().set(instance, "
-"configuredValue.getValue());\n"
-"                    }\n"
-"                    catch (Exception e) {\n"
-"                        throw new InjectionException(e);\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void postConstruct(X instance) {\n"
-"                it.postConstruct(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void preDestroy(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void dispose(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public X produce(CreationalContext<X> ctx) {\n"
-"                return it.produce(ctx);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pit.setInjectionTarget(wrapped);\n"
-"        \n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:312
 #, no-c-format
 msgid ""
 "There's a lot more to the portable extension SPI than what we've discussed "
@@ -975,13 +401,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:320
 #, no-c-format
 msgid "The <literal>Context</literal> interface"
 msgstr " <literal>Context</literal> 接口"
 
 #. Tag: para
-#: extend.xml:322
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Context</literal> interface supports addition of new scopes to "
@@ -990,30 +414,7 @@
 " <literal>Context</literal> 接口支持向Web Bean中添加新的范围,或者在新的环境"
 "中扩展内置的范围。"
 
-#. Tag: programlisting
-#: extend.xml:327
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface Context {\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
-"creationalContext);\n"
-"   public <T> T get(Contextual<T> contextual);\n"
-"   boolean isActive();\n"
-"}]]>"
-msgstr ""
-"public interface Context {\n"
-"    \n"
-"    public Class&lt;? extends Annotation&gt; getScopeType();\n"
-"    \n"
-"    public &lt;T&gt; T get(Bean&lt;T&gt; bean, boolean create);\n"
-"    \n"
-"    boolean isActive();\n"
-"    \n"
-"}"
-
 #. Tag: para
-#: extend.xml:329
 #, fuzzy, no-c-format
 msgid ""
 "For example, we might implement <literal>Context</literal> to add a business "
@@ -1024,7 +425,31 @@
 "围,或者向使用Wicket框架的应用添加对对话的支持。"
 
 #, fuzzy
+#~ msgid "@Inject BeanManager beanManager;"
+#~ msgstr "@Current Manager manager"
+
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public interface Context {\n"
+#~ "   public Class<? extends Annotation> getScope();\n"
+#~ "   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
+#~ "creationalContext);\n"
+#~ "   public <T> T get(Contextual<T> contextual);\n"
+#~ "   boolean isActive();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "public interface Context {\n"
+#~ "    \n"
+#~ "    public Class&lt;? extends Annotation&gt; getScopeType();\n"
+#~ "    \n"
+#~ "    public &lt;T&gt; T get(Bean&lt;T&gt; bean, boolean create);\n"
+#~ "    \n"
+#~ "    boolean isActive();\n"
+#~ "    \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
 #~ "There are two subinterfaces of <literal>Bean</literal> defined by the CDI "
 #~ "specification: <literal>Interceptor</literal> and <literal>Decorator</"
 #~ "literal>."

Modified: doc/trunk/reference/zh-CN/extensions.po
===================================================================
--- doc/trunk/reference/zh-CN/extensions.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/extensions.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,25 +15,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: extensions.xml:8
 #, no-c-format
 msgid "CDI extensions available as part of Weld"
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:11
 #, no-c-format
 msgid "These modules are usable on any JSR-299 implementation, not just Weld!"
 msgstr ""
 
 #. Tag: title
-#: extensions.xml:17
 #, no-c-format
 msgid "Weld Logger"
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:19
 #, no-c-format
 msgid ""
 "Adding logging to your application is now even easier with simple injection "
@@ -42,26 +38,7 @@
 "will be injected into any instance of the bean."
 msgstr ""
 
-#. Tag: programlisting
-#: extensions.xml:25
-#, no-c-format
-msgid ""
-"<![CDATA[import org.slf4j.Logger;\n"
-"import javax.inject.Inject;\n"
-"\n"
-"public class Checkout {\n"
-"   private @Inject Logger log;\n"
-"\n"
-"   public void invoiceItems() {\n"
-"      ShoppingCart cart;\n"
-"      ...\n"
-"      log.debug(\"Items invoiced for {}\", cart);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extensions.xml:27
 #, no-c-format
 msgid ""
 "The example shows how objects can be interpolated into a message. If you use "
@@ -71,7 +48,6 @@
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:34
 #, no-c-format
 msgid ""
 "You can add Weld logging to your project by including weld-logger.jar, sl4j-"
@@ -81,7 +57,6 @@
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:39
 #, no-c-format
 msgid ""
 "If you are using Weld as your JSR-299 implementation, there's no need to "

Modified: doc/trunk/reference/zh-CN/gettingstarted.po
===================================================================
--- doc/trunk/reference/zh-CN/gettingstarted.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/gettingstarted.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-03-28 17:09+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-30 09:39+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,1247 +14,1885 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: ri.xml:4
 #, no-c-format
-msgid "Web Beans, the Reference Implementation of JSR-299"
-msgstr "使用Web Beans的参考实现"
+msgid "Getting started with Weld"
+msgstr ""
 
 #. Tag: para
-#: ri.xml:6
 #, no-c-format
-msgid "The Web Beans is being developed at <ulink url=\"http://seamframework.org/WebBeans\">the Seam project</ulink>. You can download the latest developer release of Web Beans from the <ulink url=\"http://seamframework.org/Download\">the downloads page</ulink>."
-msgstr "Web Bean参考实现由<ulink url=\"http://seamframework.org/WebBeans\">Seam项目</ulink>开发。你可以从<ulink url=\"http://seamframework.org/Download\">the downloads page</ulink>下载最新的开发者版本。"
+msgid ""
+"Weld comes with two starter example applications, in addition to more "
+"specialized examples. The first, <literal>weld-numberguess</literal>, is a "
+"web (war) example containing only non-transactional managed beans. This "
+"example can be run on a wide range of servers, including JBoss AS, "
+"GlassFish, Apache Tomcat, Jetty, Google App Engine, and any compliant Java "
+"EE 6 container. The second example, <literal>weld-translator</literal>, is "
+"an enterprise (ear) example that contains session beans. This example must "
+"be run on JBoss AS 6.0, Glassfish 3.0 or any compliant Java EE 6 container."
+msgstr ""
 
 #. Tag: para
-#: ri.xml:13
 #, no-c-format
-msgid "Web Beans comes with a two deployable example applications: <literal>webbeans-numberguess</literal>, a war example, containing only simple beans, and <literal>webbeans-translator</literal> an ear example, containing enterprise beans. There are also two variations on the numberguess example, the tomcat example (suitable for deployment to Tomcat) and the jsf2 example, which you can use if you are running JSF2. To run the examples you'll need the following:"
-msgstr "Web Beans RI自带了两个例子:<literal>webbeans-numberguess</literal> (一个仅包含一个简单Bean的WAR应用例子)和<literal>webbeans-translator</literal> (一个包含企业Bean的EAR应用例子)。为了运行例子,你需要:"
+msgid ""
+"Both examples use JSF 2.0 as the web framework and, as such, can be found in "
+"the <literal>examples/jsf</literal> directory of the Weld distribution."
+msgstr ""
 
+#. Tag: title
+#, no-c-format
+msgid "Prerequisites"
+msgstr ""
+
 #. Tag: para
-#: ri.xml:25
 #, no-c-format
-msgid "the latest release of Web Beans,"
+msgid ""
+"To run the examples with the provided build scripts, you'll need the "
+"following:"
+msgstr ""
+
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "the latest release of Weld, which contains the examples"
 msgstr "最新的Web Bean参考实现版本,"
 
 #. Tag: para
-#: ri.xml:28
 #, no-c-format
-msgid "JBoss AS 5.0.1.GA, or"
-msgstr "JBoss AS 5.0.0.GA, 和"
+msgid "Ant 1.7.0, to build and deploy the examples"
+msgstr ""
 
 #. Tag: para
-#: ri.xml:31
 #, no-c-format
-msgid "Apache Tomcat 6.0.x, and"
-msgstr "Apache Tomcat 6.0.X,和"
+msgid "a supported runtime environment (minimum versions shown)"
+msgstr ""
 
 #. Tag: para
-#: ri.xml:34
-#, no-c-format
-msgid "Ant 1.7.0."
-msgstr "Ant 1.7.0."
+#, fuzzy, no-c-format
+msgid "JBoss AS 6.0.0,"
+msgstr "JBoss AS 5.0.0.GA, 和"
 
-#. Tag: title
-#: ri.xml:39
-#, no-c-format
-msgid "Using JBoss AS 5"
-msgstr "使用JBoss AS 5"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "GlassFish 3.0,"
+msgstr "使用Glassfish"
 
 #. Tag: para
-#: ri.xml:41
+#, fuzzy, no-c-format
+msgid "Apache Tomcat 6.0.x (war example only), or"
+msgstr "Apache Tomcat 6.0.X,和"
+
+#. Tag: para
 #, no-c-format
-msgid "You'll need to download JBoss AS 5.0.1.GA from <ulink url=\"http://www.jboss.org/jbossas/downloads/\">jboss.org</ulink>, and unzip it. For example:"
-msgstr "当前,Web Beans参考实现只能运行在JBoss AS 5之上。你需要从<ulink url=\"http://www.jboss.org/jbossas/downloads/\">jboss.org</ulink>下载JBoss AS 5.0.0.GA, 然后解压。例如:"
+msgid "Jetty 6.1.x (war example only)"
+msgstr ""
 
-#. Tag: programlisting
-#: ri.xml:47
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[$ cd /Applications\n"
-"$ unzip ~/jboss-5.0.1.GA.zip]]>"
+"(optionally) Maven 2.x, to run the examples in an embedded servlet container"
 msgstr ""
-"<![CDATA[$ cd /Applications\n"
-"$ unzip ~/jboss-5.0.0.GA.zip]]>"
 
 #. Tag: para
-#: ri.xml:49
-#: ri.xml:170
 #, no-c-format
-msgid "Next, download Web Beans from <ulink url=\"http://seamframework.org/Download\">seamframework.org</ulink>, and unzip it. For example"
-msgstr "然后从<ulink url=\"http://seamframework.org/WebBeans\">seamframework.org</ulink>下载Web Beans的参考实现,然后解压。例如:"
+msgid ""
+"You'll need a full install of Ant 1.7.0. Some linux distributions only "
+"supply a partial installation of Ant which cause the build to fail. If you "
+"encounter problems, verify that ant-nodeps.jar is on the classpath."
+msgstr ""
 
-#. Tag: programlisting
-#: ri.xml:55
-#: ri.xml:176
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[$ cd ~/\n"
-"$ unzip ~/webbeans-$VERSION.zip]]>"
+"In the next few sections, you'll be using the Ant command (<literal>ant</"
+"literal>) to invoke the Ant build script in each example to compile, "
+"assemble and deploy the example to JBoss AS and, for the war example, Apache "
+"Tomcat. You can also deploy the generated artifact (war or ear) to any other "
+"container that supports Java EE 6, such as GlassFish 3."
 msgstr ""
-"<![CDATA[$ cd ~/\n"
-"$ unzip ~/webbeans-1.0.0.ALPHA1.zip]]>"
 
 #. Tag: para
-#: ri.xml:58
 #, no-c-format
-msgid "Next, we need to tell Web Beans where JBoss is located. Edit <literal>jboss-as/build.properties</literal> and set the <literal>jboss.home</literal> property. For example:"
-msgstr "然后,我们需要告诉Web Beans JBoss的位置。编辑<literal>jboss-as/build.properties</literal>,设置<literal>jboss.home</literal>属性。例如:"
+msgid ""
+"If you have Maven installed, you can use the Maven command (<literal>mvn</"
+"literal>) to compile and assemble the standalone artifact (war or ear) and, "
+"for the war example, run it in an embedded container."
+msgstr ""
 
-#. Tag: programlisting
-#: ri.xml:64
-#, no-c-format
-msgid "jboss.home=/Applications/jboss-5.0.1.GA"
-msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
-
 #. Tag: para
-#: ri.xml:66
 #, no-c-format
-msgid "To install Web Beans, you'll need Ant 1.7.0 installed, and the <literal>ANT_HOME</literal> environment variable set. For example:"
-msgstr "为了安装更新,你需要安装Ant 1.7.0,设置<literal>ANT_HOME</literal>环境变量。例如:"
+msgid ""
+"The sections below cover the steps for deploying with both Ant and Maven in "
+"detail. Let's start with JBoss AS."
+msgstr ""
 
+#. Tag: title
+#, fuzzy, no-c-format
+msgid "Deploying to JBoss AS"
+msgstr "使用JBoss AS 5"
+
 #. Tag: para
-#: ri.xml:67
 #, no-c-format
-msgid "Web Beans is bundled with JBoss AS 5.1 and above."
-msgstr "JBoss AS 5.1版本及以上捆绑了Web Bean。"
+msgid ""
+"To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss."
+"org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS "
+"6.0 line isn't yet available, you can download a <ulink url=\"http://hudson."
+"jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</"
+"ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the "
+"first release that has both CDI and Bean Validation support built-in, making "
+"it close enough to Java EE 6 to run the examples. The good news is that "
+"there are no additional modifications you have to make to the server. It's "
+"ready to go!"
+msgstr ""
 
 #. Tag: para
-#: ri.xml:72
 #, no-c-format
-msgid "To install Web Beans, you'll need Ant 1.7.0 installed, and the <literal>ANT_HOME</literal> environment variable set. For example:"
-msgstr "为了安装更新,你需要安装Ant 1.7.0,设置<literal>ANT_HOME</literal>环境变量。例如:"
-
-#. Tag: programlisting
-#: ri.xml:71
-#, no-c-format
 msgid ""
-"$ unzip apache-ant-1.7.0.zip\n"
-"$ export ANT_HOME=~/apache-ant-1.7.0"
+"After you have downloaded JBoss AS, extract it. (We recommended renaming the "
+"folder to include the <literal>as</literal> qualifier so it's clear that "
+"it's the application server). You can move the extracted folder anywhere you "
+"like. Wherever it lays to rest, that's what we'll call the JBoss AS "
+"installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
-"$ unzip apache-ant-1.7.0.zip\n"
-"$ export ANT_HOME=~/apache-ant-1.7.0"
 
 #. Tag: para
-#: ri.xml:73
 #, no-c-format
-msgid "Then, you can install the update. The update script will use Maven to download Web Beans automatically."
-msgstr "然后,你需要安装更新,更新脚本使用Maven来自动下载Web Beans和EJB3。"
-
-#. Tag: programlisting
-#: ri.xml:78
-#, no-c-format
 msgid ""
-"$ cd webbeans-$VERSION/jboss-as\n"
-"$ ant update"
+"In order for the build scripts to know where to deploy the example, you have "
+"to tell them where to find your JBoss AS installation (i.e., "
+"<literal>JBOSS_HOME</literal>). Create a new file named <literal>local.build."
+"properties</literal> in the examples directory of the Weld distribution and "
+"assign the path of your JBoss AS installation to the property key "
+"<literal>jboss.home</literal>, as follows:"
 msgstr ""
-"$ cd webbeans-1.0.0.ALPHA1/jboss-as\n"
-"$ ant update"
 
 #. Tag: para
-#: ri.xml:80
-#, no-c-format
-msgid "Now, you're ready to deploy your first example!"
+#, fuzzy, no-c-format
+msgid "You're now ready to deploy your first example!"
 msgstr "现在,你可以部署你的第一个例子了!"
 
 #. Tag: para
-#: ri.xml:85
 #, no-c-format
-msgid "The build scripts for the examples offer a number of targets for JBoss AS, these are:"
-msgstr "例子的构建脚本包含多个目标:"
+msgid ""
+"Switch to the <literal>examples/jsf/numberguess</literal> directory and "
+"execute the Ant <literal>deploy</literal> target:"
+msgstr ""
 
 #. Tag: para
-#: ri.xml:91
 #, no-c-format
-msgid "<literal>ant restart</literal> - deploy the example in exploded format"
-msgstr "<literal>ant restart</literal> - 以exploded形式部署例子"
+msgid ""
+"If you haven't already, start JBoss AS. You can either start JBoss AS from a "
+"Linux shell:"
+msgstr ""
 
 #. Tag: para
-#: ri.xml:97
 #, no-c-format
-msgid "<literal>ant explode</literal> - update an exploded example, without restarting the deployment"
-msgstr "<literal>ant explode</literal> - 无需重新部署,更新一个exploded形式部署的例子"
+msgid "a Windows command window:"
+msgstr ""
 
 #. Tag: para
-#: ri.xml:103
 #, no-c-format
-msgid "<literal>ant deploy</literal> - deploy the example in compressed jar format"
-msgstr "<literal>ant deploy</literal> - 以压缩jar包形式部署例子"
+msgid "or you can start the server using an IDE, like Eclipse."
+msgstr ""
 
 #. Tag: para
-#: ri.xml:108
 #, no-c-format
-msgid "<literal>ant undeploy</literal> - remove the example from the server"
-msgstr "<literal>ant undeploy</literal> - 将例子从服务器中移除"
+msgid ""
+"If you are using Eclipse, you should seriously consider installing the "
+"<ulink url=\"http://www.jboss.org/tools\">JBoss Tools</ulink> add-ons, which "
+"include a wide variety of tooling for JSR-299 and Java EE development, as "
+"well as an enhanced JBoss AS server view."
+msgstr ""
 
 #. Tag: para
-#: ri.xml:113
 #, no-c-format
-msgid "<literal>ant clean</literal> - clean the example"
-msgstr "<literal>ant clean</literal> - 清除例子"
+msgid ""
+"Wait a few seconds for the application to deploy (or the application server "
+"to start) and see if you can determine the most efficient approach to "
+"pinpoint the random number at the local URL <ulink url=\"http://"
+"localhost:8080/weld-numberguess\">http://localhost:8080/weld-numberguess</"
+"ulink>."
+msgstr ""
 
 #. Tag: para
-#: ri.xml:120
 #, no-c-format
-msgid "To deploy the numberguess example:"
-msgstr "部署猜数字(numberguess)例子:"
-
-#. Tag: programlisting
-#: ri.xml:124
-#, no-c-format
 msgid ""
-"$ cd examples/numberguess\n"
-"ant deploy"
+"The Ant build script includes additional targets for JBoss AS to deploy and "
+"undeploy the archive in either exploded or packaged format and to tidy "
+"things up."
 msgstr ""
-"$ cd examples/numberguess\n"
-"ant deploy"
 
 #. Tag: para
-#: ri.xml:126
-#, no-c-format
-msgid "Start JBoss AS:"
-msgstr "启动 JBoss AS:"
+#, fuzzy, no-c-format
+msgid ""
+"<literal>ant restart</literal> - deploy the example in exploded format to "
+"JBoss AS"
+msgstr "<literal>ant restart</literal> - 以exploded形式部署例子"
 
-#. Tag: programlisting
-#: ri.xml:130
+#. Tag: para
 #, no-c-format
-msgid "$ /Application/jboss-5.0.0.GA/bin/run.sh"
-msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
+msgid ""
+"<literal>ant explode</literal> - update an exploded example, without "
+"restarting the deployment"
+msgstr ""
+"<literal>ant explode</literal> - 无需重新部署,更新一个exploded形式部署的例子"
 
 #. Tag: para
-#: ri.xml:133
-#, no-c-format
-msgid "If you use Windows, use the <literal>run.bat</literal>script."
-msgstr "如果你使用Windows操作系统,则使用<literal>run.bat</literal> 脚本。"
+#, fuzzy, no-c-format
+msgid ""
+"<literal>ant deploy</literal> - deploy the example in compressed jar format "
+"to JBoss AS"
+msgstr "<literal>ant deploy</literal> - 以压缩jar包形式部署例子"
 
 #. Tag: para
-#: ri.xml:138
-#: ri.xml:240
-#, no-c-format
-msgid "Wait for the application to deploy, and enjoy hours of fun at <ulink url=\"http://localhost:8080/webbeans-numberguess\"></ulink>!"
-msgstr "等待应用部署完毕,好好体验一下<ulink url=\"http://localhost:8080/webbeans-numberguess\"></ulink>!"
+#, fuzzy, no-c-format
+msgid "<literal>ant undeploy</literal> - remove the example from JBoss AS"
+msgstr "<literal>ant undeploy</literal> - 将例子从服务器中移除"
 
 #. Tag: para
-#: ri.xml:143
 #, no-c-format
-msgid "Web Beans includes a second simple example that will translate your text into Latin. The numberguess example is a war example, and uses only simple beans; the translator example is an ear example, and includes enterprise beans, packaged in an EJB module. To try it out:"
-msgstr "Web Bean参考实现的第二个简单例子能够将你的文本翻译为拉丁文。猜数字例子是一个WAR应用,仅仅使用了一个简单Beans;翻译器例子是一个EAR应用,包含了打包在EJB模块中的企业Beans。试一下:"
+msgid "<literal>ant clean</literal> - clean the example"
+msgstr "<literal>ant clean</literal> - 清除例子"
 
-#. Tag: programlisting
-#: ri.xml:150
+#. Tag: para
 #, no-c-format
 msgid ""
-"$ cd examples/translator\n"
-"ant deploy"
+"The second starter example, <literal>weld-translator</literal>, will "
+"translate your text into Latin. (Well, not really, but the stub is there for "
+"you to implement, at least. Good luck!) To try it out, switch to the "
+"translator example directory and execute the deploy target:"
 msgstr ""
-"$ cd examples/traslator\n"
-"ant deploy"
 
 #. Tag: para
-#: ri.xml:152
 #, no-c-format
-msgid "Wait for the application to deploy, and visit <ulink url=\"http://localhost:8080/webbeans-translator\"></ulink>!"
-msgstr "等待应用部署,试一下<ulink url=\"http://localhost:8080/webbeans-translator\"></ulink>!"
+msgid ""
+"The translator uses session beans, which are packaged in an EJB module "
+"within an ear. Java EE 6 will allow session beans to be deployed in war "
+"modules, but that's a topic for a later chapter."
+msgstr ""
 
-#. Tag: title
-#: ri.xml:160
-#, no-c-format
-msgid "Using Apache Tomcat 6.0"
-msgstr "使用Apache Tomcat 6.0"
-
 #. Tag: para
-#: ri.xml:162
-#, no-c-format
-msgid "You'll need to download Tomcat 6.0.18 or later from <ulink url=\"http://tomcat.apache.org/download-60.cgi\">tomcat.apache.org</ulink>, and unzip it. For example:"
-msgstr "然后从<ulink url=\"http://seamframework.org/WebBeans\">seamframework.org</ulink>下载Web Beans的参考实现,然后解压。例如:"
-
-#. Tag: programlisting
-#: ri.xml:168
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[$ cd /Applications\n"
-"$ unzip ~/apache-tomcat-6.0.18.zip]]>"
+"Again, wait a few seconds for the application to deploy (if you're really "
+"bored, read the log messages), and visit <ulink url=\"http://localhost:8080/"
+"weld-translator\">http://localhost:8080/weld-translator</ulink> to begin "
+"pseudo-translating."
 msgstr ""
-"<![CDATA[$ cd /Applications\n"
-"$ unzip ~/jboss-5.0.0.GA.zip]]>"
+"我们需要在这里做些事情-首先我们需要设置上下文路径为一个不错的URL(<ulink url="
+"\"http://localhost:8080/webbeans-translator\">http://localhost:8080/webbeans-"
+"translator</ulink>),我们还需要将JBoss AS的类加载器隔离配置激活。"
 
-#. Tag: para
-#: ri.xml:178
-#, no-c-format
-msgid "Next, we need to tell Web Beans where Tomcat is located. Edit <literal>jboss-as/build.properties</literal> and set the <literal>tomcat.home</literal> property. For example:"
-msgstr "然后,我们需要告诉Web Beans JBoss的位置。编辑<literal>jboss-as/build.properties</literal>,设置<literal>jboss.home</literal>属性。例如:"
+#. Tag: title
+#, fuzzy, no-c-format
+msgid "Deploying to GlassFish"
+msgstr "使用Glassfish"
 
-#. Tag: programlisting
-#: ri.xml:184
-#, no-c-format
-msgid "tomcat.home=/Applications/apache-tomcat-6.0.18"
-msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
-
 #. Tag: para
-#: ri.xml:187
 #, no-c-format
-msgid "The build scripts for the examples offer a number of targets for Tomcat, these are:"
-msgstr "例子的构建脚本包含多个目标:"
+msgid ""
+"Deploying to GlassFish should be easy and familiar, right? After all, it's "
+"the Java EE 6 reference implementation and Weld is the JSR-299 reference "
+"implementation, meaning Weld gets bundled with GlassFish. So yes, it's all "
+"quite easy and familiar."
+msgstr ""
 
 #. Tag: para
-#: ri.xml:193
 #, no-c-format
-msgid "<literal>ant tomcat.restart</literal> - deploy the example in exploded format"
-msgstr "<literal>ant restart</literal> - 以exploded形式部署例子"
+msgid ""
+"To deploy the examples to GlassFish, you'll need the final <ulink url="
+"\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</"
+"ulink> release. Select the release that ends in either <literal>-unix.sh</"
+"literal> or <literal>-windows.exe</literal> depending on your platform. "
+"After the download is complete, execute the installer. On Linux/Unix, you'll "
+"need to first make the script executable."
+msgstr ""
 
 #. Tag: para
-#: ri.xml:199
 #, no-c-format
-msgid "<literal>ant tomcat.explode</literal> - update an exploded example, without restarting the deployment"
-msgstr "<literal>ant explode</literal> - 无需重新部署,更新一个exploded形式部署的例子"
+msgid ""
+"On Windows you can just click on the executable. Follow the instructions in "
+"the installer. It will create a single domain named <literal>domain1</"
+"literal>. You'll use that domain to deploy the example. We recommend that "
+"you choose <literal>7070</literal> as the main HTTP port to avoid conflicts "
+"with a running instance of JBoss AS (or Apache Tomcat)."
+msgstr ""
 
 #. Tag: para
-#: ri.xml:205
 #, no-c-format
-msgid "<literal>ant tomcat.deploy</literal> - deploy the example in compressed jar format"
-msgstr "<literal>ant deploy</literal> - 以压缩jar包形式部署例子"
+msgid ""
+"If you've deployed either of the starter examples, <literal>weld-"
+"numberguess</literal> or <literal>weld-translator</literal>, to JBoss AS, "
+"then you already have the deployable artifact you need. If not, switch to "
+"either of the two directories and build it."
+msgstr ""
 
 #. Tag: para
-#: ri.xml:210
 #, no-c-format
-msgid "<literal>ant tomcat.undeploy</literal> - remove the example from the server"
-msgstr "<literal>ant undeploy</literal> - 将例子从服务器中移除"
+msgid ""
+"The deployable archive for the <literal>weld-numberguess</literal>, named "
+"<literal>weld-numberguess.war</literal>, ends up in the example's "
+"<literal>target</literal> directory. The archive for the <literal>weld-"
+"translator</literal> example, named <literal>weld-translator.ear</literal>, "
+"ends up in the example's <literal>ear/target</literal> directory. All you "
+"need to do now is deploy them to GlassFish."
+msgstr ""
 
 #. Tag: para
-#: ri.xml:215
 #, no-c-format
-msgid "<literal>ant tomcat.clean</literal> - clean the example"
-msgstr "<literal>ant clean</literal> - 清除例子"
+msgid ""
+"One way to deploy applications to GlassFish is by using the <ulink url="
+"\"http://localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin "
+"Console running, you need to start a GlassFish domain, in our case "
+"<literal>domain1</literal>. Switch to the <literal>bin</literal> folder in "
+"the directory where you installed GlassFish and execute the following "
+"command:"
+msgstr ""
 
 #. Tag: para
-#: ri.xml:222
 #, no-c-format
-msgid "To deploy the numberguess example for tomcat:"
-msgstr "部署猜数字(numberguess)例子:"
-
-#. Tag: programlisting
-#: ri.xml:226
-#, no-c-format
 msgid ""
-"$ cd examples/tomcat\n"
-"ant tomcat.deploy"
+"After a few seconds you can visit the Admin Console in the browser at the "
+"URL <ulink url=\"http://localhost:4848\">http://localhost:4848</ulink>. In "
+"the tree on the left-hand side of the page, click on \"Applications\", then "
+"click on the \"Deploy...\" button under the heading \"Applications\" and "
+"select the deployable artifact for either of the two examples. The deployer "
+"should recognize that you have selected a Java EE artifact and allow you to "
+"start it. You can see the examples running at either <ulink url=\"http://"
+"localhost:7070/weld-numberguess\">http://localhost:7070/weld-numberguess</"
+"ulink> or <ulink url=\"http://localhost:7070/weld-translator\">http://"
+"localhost:7070/weld-translator</ulink>, depending on which example you "
+"deployed."
 msgstr ""
-"$ cd examples/traslator\n"
-"ant deploy"
 
 #. Tag: para
-#: ri.xml:228
 #, no-c-format
-msgid "Start Tomcat:"
-msgstr "启动Tomcat:"
+msgid ""
+"Alternatively, you can deploy the application to GlassFish using the asadmin "
+"command:"
+msgstr ""
 
-#. Tag: programlisting
-#: ri.xml:232
-#, no-c-format
-msgid "$ /Applications/apache-tomcat-6.0.18/bin/startup.sh"
-msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
-
 #. Tag: para
-#: ri.xml:235
 #, no-c-format
-msgid "If you use Windows, use the <literal>startup.bat</literal>script."
-msgstr "如果你使用Windows操作系统,则使用<literal>run.bat</literal> 脚本。"
+msgid ""
+"The reason the same artifact can be deployed to both JBoss AS and GlassFish, "
+"without any modifications, is because all of the features being used are "
+"part of the standard platform. And what a capable platform it has become!"
+msgstr ""
 
 #. Tag: title
-#: ri.xml:248
-#, no-c-format
-msgid "Using GlassFish"
-msgstr "使用Glassfish"
+#, fuzzy, no-c-format
+msgid "Deploying to Apache Tomcat"
+msgstr "使用Apache Tomcat 6.0"
 
 #. Tag: para
-#: ri.xml:250
 #, no-c-format
-msgid "TODO"
-msgstr "待办"
+msgid ""
+"Servlet containers are not required to support Java EE services like CDI. "
+"However, you can use CDI in a servlet container like Tomcat by embedding a "
+"standalone CDI implementation such as Weld."
+msgstr ""
 
-#. Tag: title
-#: ri.xml:254
-#, no-c-format
-msgid "The numberguess example"
-msgstr "猜数字例子"
-
 #. Tag: para
-#: ri.xml:256
 #, no-c-format
-msgid "In the numberguess application you get given 10 attempts to guess a number between 1 and 100. After each attempt, you will be told whether you are too high, or too low."
-msgstr "在猜数字应用中,你有十次机会来猜一个1到100之间的数字。每次猜测之后,应用都会告诉你你猜的数字是高了还是低了。"
+msgid ""
+"Weld comes with a servlet listener which bootstraps the CDI environment, "
+"registers the <literal>BeanManager</literal> in JNDI and provides injection "
+"into servlets. Basically, it emulates some of the work done by the Java EE "
+"container. (But you don't get enterprise features such as session beans and "
+"container-managed transactions.)"
+msgstr ""
 
 #. Tag: para
-#: ri.xml:262
-#, no-c-format
-msgid "The numberguess example is comprised of a number of Web Beans, configuration files, and Facelet JSF pages, packaged as a war. Let's start with the configuration files."
-msgstr "猜数字应用由Web Beans,配置文件,Facelete JSF页面组成,打包为一个WAR。我们先看一下配置文件。"
+#, fuzzy, no-c-format
+msgid ""
+"Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll "
+"need to download Tomcat 6.0.18 or later from <ulink url=\"http://tomcat."
+"apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
+msgstr ""
+"然后从<ulink url=\"http://seamframework.org/WebBeans\">seamframework.org</"
+"ulink>下载Web Beans的参考实现,然后解压。例如:"
 
 #. Tag: para
-#: ri.xml:268
 #, no-c-format
-msgid "All the configuration files for this example are located in <literal>WEB-INF/</literal>, which is stored in <literal>WebContent</literal> in the source tree. First, we have <literal>faces-config.xml</literal>, in which we tell JSF to use Facelets:"
-msgstr "猜数字应用的所有的配置文件位于<literal>WEB-INF/</literal>,这个目录位于源码树的<literal>WebContent</literal>中。首先,我们在faces-config.xml文件中告诉JSF使用Faceletes:"
-
-#. Tag: programlisting
-#: ri.xml:276
-#, no-c-format
 msgid ""
-"<![CDATA[<?xml version='1.0' encoding='UTF-8'?>\n"
-"<faces-config version=\"1.2\"\n"
-"              xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"              xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"              xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd\">\n"
-"    \n"
-"    <application>\n"
-"        <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>\n"
-"    </application>\n"
-"\n"
-"</faces-config>]]>"
+"You have two choices for how you can deploy the application to Tomcat. You "
+"can deploy it by pushing the artifact to the hot deploy directory using Ant "
+"or you can deploy to the server across HTTP using a Maven plugin. The Ant "
+"approach doesn't require that you have Maven installed, so we'll start "
+"there. If you want to use Maven, you can just skip ahead."
 msgstr ""
-"<![CDATA[<?xml version='1.0' encoding='UTF-8'?>\n"
-"<faces-config version=\"1.2\"\n"
-"              xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"              xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"              xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd\">\n"
-"    \n"
-"    <application>\n"
-"        <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>\n"
-"    </application>\n"
-"\n"
-"</faces-config>]]>"
 
-#. Tag: para
-#: ri.xml:278
+#. Tag: title
 #, no-c-format
-msgid "There is an empty <literal>web-beans.xml</literal> file, which marks this application as a Web Beans application."
-msgstr "这有一个空的<literal>web-beans.xml</literal>文件,标识这个应用是一个Web Beans应用。"
+msgid "Deploying with Ant"
+msgstr ""
 
 #. Tag: para
-#: ri.xml:283
 #, no-c-format
-msgid "Finally there is <literal>web.xml</literal>:"
-msgstr "最后,这有一个 <literal>web.xml</literal>:"
-
-#. Tag: section
-#: ri.xml:285
-#, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"faces.servlet\" coords=\"12\"/> <area id=\"faces.servlet.mapping\" coords=\"18\"/> <area id=\"faces.default.suffix\" coords=\"23\"/> <area id=\"session.timeout\" coords=\"28\"/> <area id=\"webbeans.listener\" coords=\"32\"/> </areaspec> <programlisting><![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"\n"
-"<web-app version=\"2.5\"\n"
-"    xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"    xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n"
-"   \n"
-"   <display-name>Web Beans Numbergues example</display-name>\n"
-"\n"
-"   <!-- JSF -->\n"
-"\n"
-"   <servlet>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>\n"
-"      <load-on-startup>1</load-on-startup>\n"
-"   </servlet>\n"
-"\n"
-"   <servlet-mapping>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <url-pattern>*.jsf</url-pattern>\n"
-"   </servlet-mapping>\n"
-"   \n"
-"   <context-param>\n"
-"      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>\n"
-"      <param-value>.xhtml</param-value>\n"
-"   </context-param>\n"
-"\n"
-"   <session-config>\n"
-"      <session-timeout>10</session-timeout>\n"
-"   </session-config>\n"
-"\n"
-"</web-app>]]></programlisting> <calloutlist> <callout arearefs=\"faces.servlet\"> <para> Enable and load the JSF servlet </para> </callout> <callout arearefs=\"faces.servlet.mapping\"> <para> Configure requests to <literal>.jsf</literal> pages to be handled by JSF </para> </callout> <callout arearefs=\"faces.default.suffix\"> <para> Tell JSF that we will be giving our source files (facelets) an extension of <literal>.jsf</literal> </para> </callout> <callout arearefs=\"session.timeout\"> <para> Configure a session timeout of 10 minutes </para> </callout> </calloutlist> </programlistingco> <note> <para> Whilst this demo is a JSF demo, you can use Web Beans with any Servlet based web framework. </para> </note> <para> Let's take a look at the Facelet view: </para> <programlistingco> <areaspec> <area id=\"template\" coords=\"8\"/> <area id=\"messages\" coords=\"12\"/> <area id=\"instructions\" coords=\"19\"/> <area id=\"guess\" coords=\"25\"/> <area id=\"validator\" coords=\"3!
 0\"/> <area id=\"submit\" coords=\"33\"/> </areaspec> <programlisting><![CDATA[<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
-"<html xmlns=\"http://www.w3.org/1999/xhtml\"\n"
-"    xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n"
-"    xmlns:h=\"http://java.sun.com/jsf/html\"\n"
-"    xmlns:f=\"http://java.sun.com/jsf/core\"\n"
-"    xmlns:s=\"http://jboss.com/products/seam/taglib\">\n"
-"\n"
-"  <ui:composition template=\"template.xhtml\">\n"
-"    <ui:define name=\"content\">\n"
-"       <h1>Guess a number...</h1>\n"
-"       <h:form id=\"NumberGuessMain\">\n"
-"          <div style=\"color: red\">\n"
-"             <h:messages id=\"messages\" globalOnly=\"false\"/>\n"
-"             <h:outputText id=\"Higher\" value=\"Higher!\" rendered=\"#{game.number gt game.guess and game.guess ne 0}\"/>\n"
-"             <h:outputText id=\"Lower\" value=\"Lower!\" rendered=\"#{game.number lt game.guess and game.guess ne 0}\"/>\n"
-"          </div>\n"
-"   \n"
-"          <div>\n"
-"             I'm thinking of a number between #{game.smallest} and #{game.biggest}.\n"
-"             You have #{game.remainingGuesses} guesses.\n"
-"          </div>\n"
-"     \n"
-"          <div>\n"
-"             Your guess: \n"
-"             <h:inputText id=\"inputGuess\" \n"
-"                          value=\"#{game.guess}\" \n"
-"                          required=\"true\" \n"
-"                          size=\"3\" \n"
-"                          disabled=\"#{game.number eq game.guess}\">\n"
-"                <f:validateLongRange maximum=\"#{game.biggest}\" \n"
-"                                     minimum=\"#{game.smallest}\"/>\n"
-"             </h:inputText>\n"
-"            <h:commandButton id=\"GuessButton\"  \n"
-"                             value=\"Guess\" \n"
-"                             action=\"#{game.check}\" \n"
-"                             disabled=\"#{game.number eq game.guess}\"/>\n"
-"          </div>\n"
-"          <div>\n"
-"            <h:commandButton id=\"RestartButton\" value=\"Reset\" action=\"#{game.reset}\" immediate=\"true\" />\n"
-"          </div>\n"
-"       </h:form>\n"
-"    </ui:define>\n"
-"  </ui:composition>\n"
-"</html>]]></programlisting> <calloutlist> <callout arearefs=\"template\"> <para> Facelets is a templating language for JSF, here we are wrapping our page in a template which defines the header. </para> </callout> <callout arearefs=\"messages\"> <para> There are a number of messages which can be sent to the user, \"Higher!\", \"Lower!\" and \"Correct!\" </para> </callout> <callout arearefs=\"instructions\"> <para> As the user guesses, the range of numbers they can guess gets smaller - this sentance changes to make sure they know what range to guess in. </para> </callout> <callout arearefs=\"guess\"> <para> This input field is bound to a Web Bean, using the value expression. </para> </callout> <callout arearefs=\"validator\"> <para> A range validator is used to make sure the user doesn't accidentally input a number outside of the range in which they can guess - if the validator wasn't here, the user might use up a guess on an out of range number. </para> </callout> <callout !
 arearefs=\"submit\"> <para> And, of course, there must be a way for the user to send their guess to the server. Here we bind to an action method on the Web Bean. </para> </callout> </calloutlist> </programlistingco>"
+"In order for Ant to push the artifact to the Tomcat hot deploy directory, it "
+"needs to know where the Tomcat installation is located. Again, we need to "
+"set a property in the <literal>local.build.properties</literal> file in the "
+"examples directory of the Weld distribution. If you haven't yet created this "
+"file, do so now. Then assign the path of your Tomcat installation to the "
+"property key <literal>tomcat.home</literal>."
 msgstr ""
-"<programlistingco> <areaspec> <area id=\"faces.servlet\" coords=\"12\"/> <area id=\"faces.servlet.mapping\" coords=\"18\"/> <area id=\"faces.default.suffix\" coords=\"23\"/> <area id=\"session.timeout\" coords=\"28\"/> <area id=\"webbeans.listener\" coords=\"32\"/> </areaspec> <programlisting><![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"\n"
-"<web-app version=\"2.5\"\n"
-"    xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"    xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n"
-"   \n"
-"   <display-name>Web Beans Numbergues example</display-name>\n"
-"\n"
-"   <!-- JSF -->\n"
-"\n"
-"   <servlet>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>\n"
-"      <load-on-startup>1</load-on-startup>\n"
-"   </servlet>\n"
-"\n"
-"   <servlet-mapping>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <url-pattern>*.jsf</url-pattern>\n"
-"   </servlet-mapping>\n"
-"   \n"
-"   <context-param>\n"
-"      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>\n"
-"      <param-value>.xhtml</param-value>\n"
-"   </context-param>\n"
-"\n"
-"   <session-config>\n"
-"      <session-timeout>10</session-timeout>\n"
-"   </session-config>\n"
-"   \n"
-"    <listener>\n"
-"       <listener-class>org.jboss.webbeans.servlet.WebBeansListener</listener-class>\n"
-"    </listener>\n"
-"\n"
-"</web-app>]]></programlisting> <calloutlist> <callout arearefs=\"faces.servlet\"> <para> Enable and load the JSF servlet </para> </callout> <callout arearefs=\"faces.servlet.mapping\"> <para> Configure requests to <literal>.jsf</literal> pages to be handled by JSF </para> </callout> <callout arearefs=\"faces.default.suffix\"> <para> Tell JSF that we will be giving our source files (facelets) an extension of <literal>.jsf</literal> </para> </callout> <callout arearefs=\"session.timeout\"> <para> Configure a session timeout of 10 minutes </para> </callout> <callout arearefs=\"webbeans.listener\"> <para> Configure the Web Beans listener, so that Web Beans services can be used in the servlet request </para> </callout> </calloutlist> </programlistingco> <note> <para> The only configuration required by the Web Beans RI in <literal>web.xml</literal> is to add the Web Beans listener. </para> <para> Whilst this demo is a JSF demo, you can use the Web Beans RI with any Servlet based!
  web framework; just configure the Web Beans listener. </para> </note> <para> Let's take a look at the Facelet view: </para> <programlistingco> <areaspec> <area id=\"template\" coords=\"8\"/> <area id=\"messages\" coords=\"12\"/> <area id=\"instructions\" coords=\"19\"/> <area id=\"guess\" coords=\"25\"/> <area id=\"validator\" coords=\"29\"/> <area id=\"submit\" coords=\"32\"/> </areaspec> <programlisting><![CDATA[<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
-"<html xmlns=\"http://www.w3.org/1999/xhtml\"\n"
-"    xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n"
-"    xmlns:h=\"http://java.sun.com/jsf/html\"\n"
-"    xmlns:f=\"http://java.sun.com/jsf/core\"\n"
-"    xmlns:s=\"http://jboss.com/products/seam/taglib\">\n"
-"\n"
-"  <ui:composition template=\"template.xhtml\">\n"
-"    <ui:define name=\"content\">\n"
-"       <h1>Guess a number...</h1>\n"
-"       <h:form id=\"NumberGuessMain\">\n"
-"          <div style=\"color: red\">\n"
-"             <h:messages id=\"messages\" globalOnly=\"false\"/>\n"
-"             <h:outputText id=\"Higher\" value=\"Higher!\" rendered=\"#{game.number gt game.guess}\"/>\n"
-"             <h:outputText id=\"Lower\" value=\"Lower!\" rendered=\"#{game.number lt game.guess}\"/>\n"
-"          </div>\n"
-"   \n"
-"          <div>\n"
-"             I'm thinking of a number between #{game.smallest} and #{game.biggest}.\n"
-"             You have #{game.remainingGuesses} guesses.\n"
-"          </div>\n"
-"     \n"
-"          <div>\n"
-"             Your guess: \n"
-"             <h:inputText id=\"inputGuess\" \n"
-"                          value=\"#{game.guess}\" \n"
-"                          required=\"true\" \n"
-"                          size=\"3\">\n"
-"                <f:validateLongRange maximum=\"#{game.biggest}\" \n"
-"                                     minimum=\"#{game.smallest}\"/>\n"
-"             </h:inputText>\n"
-"            <h:commandButton id=\"GuessButton\" \n"
-"                             value=\"Guess\" \n"
-"                             action=\"#{game.check}\"/>\n"
-"          </div>\n"
-"   \n"
-"       </h:form>\n"
-"    </ui:define>\n"
-"  </ui:composition>\n"
-"</html>]]></programlisting> <calloutlist> <callout arearefs=\"template\"> <para> Facelets is a templating language for JSF, here we are wrapping our page in a template which defines the header. </para> </callout> <callout arearefs=\"messages\"> <para> There are a number of messages which can be sent to the user, \"Higher!\", \"Lower!\" and \"Correct!\" </para> </callout> <callout arearefs=\"instructions\"> <para> As the user guesses, the range of numbers they can guess gets smaller - this sentance changes to make sure they know what range to guess in. </para> </callout> <callout arearefs=\"guess\"> <para> This input field is bound to a Web Bean, using the value expression. </para> </callout> <callout arearefs=\"validator\"> <para> A range validator is used to make sure the user doesn't accidentally input a number outside of the range in which they can guess - if the validator wasn't here, the user might use up a guess on an out of range number. </para> </callout> <callout !
 arearefs=\"submit\"> <para> And, of course, there must be a way for the user to send their guess to the server. Here we bind to an action method on the Web Bean. </para> </callout> </calloutlist> </programlistingco>"
 
 #. Tag: para
-#: ri.xml:387
-#, no-c-format
-msgid "The example exists of 4 classes, the first two of which are binding types. First, there is the <literal>@Random</literal> binding type, used for injecting a random number:"
-msgstr "这个例子包括4个类,前面两个是绑定类型。首先,这有一个<literal>@Random</literal>绑定类型,用来注入一个随机数:"
+#, fuzzy, no-c-format
+msgid "Now you're ready to deploy the numberguess example to Tomcat!"
+msgstr "部署猜数字(numberguess)例子:"
 
-#. Tag: programlisting
-#: ri.xml:393
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"@Documented\n"
-"@BindingType\n"
-"public @interface Random {}]]>"
+"Change to the <literal>examples/jsf/numberguess</literal> directory again "
+"and run the Ant <literal>deploy</literal> target for Tomcat:"
 msgstr ""
-"<![CDATA[@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"@Documented\n"
-"@BindingType\n"
-"public @interface Random {}]]>"
 
 #. Tag: para
-#: ri.xml:395
 #, no-c-format
-msgid "There is also the <literal>@MaxNumber</literal> binding type, used for injecting the maximum number that can be injected:"
-msgstr "这还有一个<literal>@MaxNumber</literal>绑定类型,用来注入一个最大值:"
-
-#. Tag: programlisting
-#: ri.xml:400
-#, no-c-format
 msgid ""
-"<![CDATA[@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"@Documented\n"
-"@BindingType\n"
-"public @interface MaxNumber {}\n"
-"]]>"
+"The Ant build script includes additional targets for Tomcat to deploy and "
+"undeploy the archive in either exploded or packaged format. They are the "
+"same target names used for JBoss AS, prefixed with \"tomcat.\"."
 msgstr ""
-"<![CDATA[@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"@Documented\n"
-"@BindingType\n"
-"public @interface MaxNumber {}\n"
-"]]>"
 
 #. Tag: para
-#: ri.xml:402
-#, no-c-format
-msgid "The <literal>Generator</literal> class is responsible for creating the random number, via a producer method. It also exposes the maximum possible number via a producer method:"
-msgstr "<literal>Generator</literal>类通过一个生产者(producer)方法创建一个随机数。它也通过一个生产者方法暴露可能的最大值:"
+#, fuzzy, no-c-format
+msgid ""
+"<literal>ant tomcat.restart</literal> - deploy the example in exploded "
+"format to Tomcat"
+msgstr "<literal>ant restart</literal> - 以exploded形式部署例子"
 
-#. Tag: programlisting
-#: ri.xml:408
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class Generator {\n"
-"   \n"
-"   private java.util.Random random = new java.util.Random( System.currentTimeMillis() );\n"
-"   \n"
-"   private int maxNumber = 100;\n"
-"   \n"
-"   java.util.Random getRandom()\n"
-"   {\n"
-"      return random;\n"
-"   }\n"
-"   \n"
-"   @Produces @Random int next() { \n"
-"      return getRandom().nextInt(maxNumber); \n"
-"   }\n"
-"   \n"
-"   @Produces @MaxNumber int getMaxNumber()\n"
-"   {\n"
-"      return maxNumber;\n"
-"   }\n"
-"\n"
-"}]]>"
+"<literal>ant tomcat.explode</literal> - update an exploded example, without "
+"restarting the deployment"
 msgstr ""
-"<![CDATA[@ApplicationScoped\n"
-"public class Generator {\n"
-"   \n"
-"   private java.util.Random random = new java.util.Random( System.currentTimeMillis() );\n"
-"   \n"
-"   private int maxNumber = 100;\n"
-"   \n"
-"   java.util.Random getRandom()\n"
-"   {\n"
-"      return random;\n"
-"   }\n"
-"   \n"
-"   @Produces @Random int next() { \n"
-"      return getRandom().nextInt(maxNumber); \n"
-"   }\n"
-"   \n"
-"   @Produces @MaxNumber int getMaxNumber()\n"
-"   {\n"
-"      return maxNumber;\n"
-"   }\n"
-"\n"
-"}]]>"
+"<literal>ant explode</literal> - 无需重新部署,更新一个exploded形式部署的例子"
 
 #. Tag: para
-#: ri.xml:410
-#, no-c-format
-msgid "You'll notice that the <literal>Generator</literal> is application scoped; therefore we don't get a different random each time."
-msgstr "你会注意到<literal>Generator</literal>是应用范围的;因此我们不会每次都得到一个不同的随机对象。"
+#, fuzzy, no-c-format
+msgid ""
+"<literal>ant tomcat.deploy</literal> - deploy the example in compressed jar "
+"format to Tomcat"
+msgstr "<literal>ant deploy</literal> - 以压缩jar包形式部署例子"
 
 #. Tag: para
-#: ri.xml:415
-#, no-c-format
-msgid "The final Web Bean in the application is the session scoped <literal>Game</literal>."
-msgstr "最终的应用中的Web Bean是会话范围的 <literal>Game</literal> 。"
+#, fuzzy, no-c-format
+msgid "<literal>ant tomcat.undeploy</literal> - remove the example from Tomcat"
+msgstr "<literal>ant undeploy</literal> - 将例子从服务器中移除"
 
 #. Tag: para
-#: ri.xml:420
 #, no-c-format
-msgid "You'll note that we've used the <literal>@Named</literal> annotation, so that we can use the bean through EL in the JSF page. Finally, we've used constructor injection to initialize the game with a random number. And of course, we need to tell the player when they've won, so we give feedback with a <literal>FacesMessage</literal>."
-msgstr "你也许注意到我们使用了 <literal>@Named</literal>注释,以便我们能够通过EL(表达式语言)在JSF页面中使用Bean。最后,我们通过构造器注入来初始化猜数字游戏并给它设一个随机数。当然,在玩家猜对数字后,我们需要告诉玩家他赢了,所以我们通过<literal>FacesMessage</literal>反馈给玩家一条信息。"
+msgid ""
+"If you haven't already, start Tomcat. You can either start Tomcat from a "
+"Linux shell:"
+msgstr ""
 
-#. Tag: programlisting
-#: ri.xml:428
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[package org.jboss.webbeans.examples.numberguess;\n"
-"\n"
-"\n"
-"import javax.annotation.PostConstruct;\n"
-"import javax.faces.application.FacesMessage;\n"
-"import javax.faces.context.FacesContext;\n"
-"import javax.webbeans.AnnotationLiteral;\n"
-"import javax.webbeans.Current;\n"
-"import javax.webbeans.Initializer;\n"
-"import javax.webbeans.Named;\n"
-"import javax.webbeans.SessionScoped;\n"
-"import javax.webbeans.manager.Manager;\n"
-"\n"
-"@Named\n"
-"@SessionScoped\n"
-"public class Game\n"
-"{\n"
-"   private int number;\n"
-"   \n"
-"   private int guess;\n"
-"   private int smallest;\n"
-"   private int biggest;\n"
-"   private int remainingGuesses;\n"
-"   \n"
-"   @Current Manager manager;\n"
-"   \n"
-"   public Game()\n"
-"   {\n"
-"   }\n"
-"   \n"
-"   @Initializer\n"
-"   Game(@MaxNumber int maxNumber)\n"
-"   {      \n"
-"      this.biggest = maxNumber;\n"
-"   }\n"
-"\n"
-"   public int getNumber()\n"
-"   {\n"
-"      return number;\n"
-"   }\n"
-"   \n"
-"   public int getGuess()\n"
-"   {\n"
-"      return guess;\n"
-"   }\n"
-"   \n"
-"   public void setGuess(int guess)\n"
-"   {\n"
-"      this.guess = guess;\n"
-"   }\n"
-"   \n"
-"   public int getSmallest()\n"
-"   {\n"
-"      return smallest;\n"
-"   }\n"
-"   \n"
-"   public int getBiggest()\n"
-"   {\n"
-"      return biggest;\n"
-"   }\n"
-"   \n"
-"   public int getRemainingGuesses()\n"
-"   {\n"
-"      return remainingGuesses;\n"
-"   }\n"
-"   \n"
-"   public String check()\n"
-"   {\n"
-"      if (guess>number)\n"
-"      {\n"
-"         biggest = guess - 1;\n"
-"      }\n"
-"      if (guess<number)\n"
-"      {\n"
-"         smallest = guess + 1;\n"
-"      }\n"
-"      if (guess == number)\n"
-"      {\n"
-"         FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(\"Correct!\"));\n"
-"      }\n"
-"      remainingGuesses--;\n"
-"      return null;\n"
-"   }\n"
-"   \n"
-"   @PostConstruct\n"
-"   public void reset()\n"
-"   {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.number = manager.getInstanceByType(Integer.class, new AnnotationLiteral<Random>(){});\n"
-"   }\n"
-"   \n"
-"}]]>"
+"Wait a few seconds for the application to deploy (or the application server "
+"to start) and see if you can figure out the most efficient approach to "
+"pinpoint the random number at the local URL <ulink url=\"http://"
+"localhost:8080/weld-numberguess\">http://localhost:8080/weld-numberguess</"
+"ulink>!"
 msgstr ""
-"<![CDATA[package org.jboss.webbeans.examples.numberguess;\n"
-"\n"
-"\n"
-"import javax.annotation.PostConstruct;\n"
-"import javax.faces.application.FacesMessage;\n"
-"import javax.faces.context.FacesContext;\n"
-"import javax.webbeans.AnnotationLiteral;\n"
-"import javax.webbeans.Current;\n"
-"import javax.webbeans.Initializer;\n"
-"import javax.webbeans.Named;\n"
-"import javax.webbeans.SessionScoped;\n"
-"import javax.webbeans.manager.Manager;\n"
-"\n"
-"@Named\n"
-"@SessionScoped\n"
-"public class Game\n"
-"{\n"
-"   private int number;\n"
-"   \n"
-"   private int guess;\n"
-"   private int smallest;\n"
-"   private int biggest;\n"
-"   private int remainingGuesses;\n"
-"   \n"
-"   @Current Manager manager;\n"
-"   \n"
-"   public Game()\n"
-"   {\n"
-"   }\n"
-"   \n"
-"   @Initializer\n"
-"   Game(@MaxNumber int maxNumber)\n"
-"   {      \n"
-"      this.biggest = maxNumber;\n"
-"   }\n"
-"\n"
-"   public int getNumber()\n"
-"   {\n"
-"      return number;\n"
-"   }\n"
-"   \n"
-"   public int getGuess()\n"
-"   {\n"
-"      return guess;\n"
-"   }\n"
-"   \n"
-"   public void setGuess(int guess)\n"
-"   {\n"
-"      this.guess = guess;\n"
-"   }\n"
-"   \n"
-"   public int getSmallest()\n"
-"   {\n"
-"      return smallest;\n"
-"   }\n"
-"   \n"
-"   public int getBiggest()\n"
-"   {\n"
-"      return biggest;\n"
-"   }\n"
-"   \n"
-"   public int getRemainingGuesses()\n"
-"   {\n"
-"      return remainingGuesses;\n"
-"   }\n"
-"   \n"
-"   public String check()\n"
-"   {\n"
-"      if (guess>number)\n"
-"      {\n"
-"         biggest = guess - 1;\n"
-"      }\n"
-"      if (guess<number)\n"
-"      {\n"
-"         smallest = guess + 1;\n"
-"      }\n"
-"      if (guess == number)\n"
-"      {\n"
-"         FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(\"Correct!\"));\n"
-"      }\n"
-"      remainingGuesses--;\n"
-"      return null;\n"
-"   }\n"
-"   \n"
-"   @PostConstruct\n"
-"   public void reset()\n"
-"   {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.number = manager.getInstanceByType(Integer.class, new AnnotationLiteral<Random>(){});\n"
-"   }\n"
-"   \n"
-"}]]>"
 
 #. Tag: title
-#: ri.xml:431
 #, no-c-format
-msgid "The numberguess example for Tomcat"
-msgstr "猜数字例子"
+msgid "Deploying with Maven"
+msgstr ""
 
 #. Tag: para
-#: ri.xml:433
 #, no-c-format
-msgid "The numberguess for Tomcat differs in a couple of ways. Firstly, Web Beans should be deployed as a Web Application library in <literal>WEB-INF/lib</literal>. For your convenience we provide a single jar suitable for running Web Beans on Tomcat <literal>webbeans-tomcat.jar</literal>."
-msgstr "在Tomcat中部署猜数字应用有很多地方不同。首先,WebBean应该作为一个Web应用库文件,部署在<literal>WEB-INF/lib</literal>目录中。为方便起见,我们提供了一个单一的jar库 <literal>webbeans-tomcat.jar</literal>,能够让我们在Tomcat中运行Web Bean。"
+msgid ""
+"You can also deploy the application to Tomcat using Maven. This section is a "
+"bit more advanced, so skip it unless you're itching to use Maven natively. "
+"Of course, you'll first need to make sure that you have Maven installed on "
+"your path, similar to how you setup Ant."
+msgstr ""
 
 #. Tag: para
-#: ri.xml:442
 #, no-c-format
-msgid "Of course, you must also include JSF and EL, as well common annotations (<literal>jsr250-api.jar</literal>) which a JEE server includes by default."
-msgstr "当然,你必须也要包含JSF和EL, 以及通用的注释(<literal>jsr250-api.jar</literal>),这些都是一个Java EE服务器默认应该包含的。 "
+msgid ""
+"The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
+"where you have installed Tomcat. However, the plugin configuration assumes "
+"you are running Tomcat in its default configuration, with a hostname of "
+"localhost and port <literal>8080</literal>. The <literal>readme.txt</"
+"literal> file in the example directory has information about how to modify "
+"the Maven settings to accommodate a different setup."
+msgstr ""
 
 #. Tag: para
-#: ri.xml:449
 #, no-c-format
-msgid "Secondly, we need to explicitly specify the Tomcat servlet listener (used to boot Web Beans, and control it's interaction with requests) in <literal>web.xml</literal>:"
-msgstr "第二,我们需要在<literal>web.xml</literal>中显式地指定Tomcat的Servlet监听器(用来启动Web Bean,并且控制其与请求的交互):"
-
-#. Tag: programlisting
-#: ri.xml:455
-#, no-c-format
 msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.webbeans.environment.tomcat.Listener</listener-class>\n"
-"</listener>]]>"
+"To allow Maven to communicate with Tomcat over HTTP, edit the <literal>conf/"
+"tomcat-users.xml</literal> file in your Tomcat installation and add the "
+"following line:"
 msgstr ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.webbeans.environment.tomcat.Listener</listener-class>\n"
-"</listener>]]>"
 
-#. Tag: title
-#: ri.xml:461
-#, no-c-format
-msgid "The translator example"
-msgstr "翻译器例子"
-
 #. Tag: para
-#: ri.xml:463
 #, no-c-format
-msgid "The translator example will take any sentences you enter, and translate them to Latin."
-msgstr "翻译器例子能够将你输入的句子翻译为拉丁文。"
+msgid ""
+"Restart Tomcat. You can now deploy the application to Tomcat with Maven "
+"using this command:"
+msgstr ""
 
 #. Tag: para
-#: ri.xml:468
 #, no-c-format
-msgid "The translator example is built as an ear, and contains EJBs. As a result, it's structure is more complex than the numberguess example."
-msgstr "翻译器例子是一个EAR应用,包含EJBs和企业Beans。因此,它的结构比猜数字例子复杂。"
+msgid ""
+"Once the application is deployed, you can redeploy it using this command:"
+msgstr ""
 
 #. Tag: para
-#: ri.xml:474
 #, no-c-format
-msgid "EJB 3.1 and Jave EE 6 allow you to package EJBs in a war, which will make this structure much simpler!"
-msgstr "EJB3.1和Java EE 6允许你在WAR包中打包EJBs, 这将让这个结构更加简单!"
+msgid ""
+"The <literal>-Ptomcat</literal> argument activates the <literal>tomcat</"
+"literal> profile defined in the Maven POM (<literal>pom.xml</literal>). "
+"Among other things, this profile activates the Tomcat plugin."
+msgstr ""
 
 #. Tag: para
-#: ri.xml:480
 #, no-c-format
-msgid "First, let's take a look at the ear aggregator, which is located in <literal>webbeans-translator-ear</literal> module. Maven automatically generates the <literal>application.xml</literal> for us:"
-msgstr "首先,让我们看一下EAR聚合器,它位于<literal>webbeans-translator-ear</literal>模块下。Maven将为我们自动生成<literal>application.xml</literal>和<literal>jboss-app.xml</literal>文件:"
-
-#. Tag: programlisting
-#: ri.xml:486
-#, no-c-format
 msgid ""
-"<![CDATA[<plugin>\n"
-"   <groupId>org.apache.maven.plugins</groupId>\n"
-"   <artifactId>maven-ear-plugin</artifactId>\n"
-"   <configuration>\n"
-"      <modules>\n"
-"         <webModule>\n"
-"            <groupId>org.jboss.webbeans.examples.translator</groupId>\n"
-"            <artifactId>webbeans-translator-war</artifactId>\n"
-"            <contextRoot>/webbeans-translator</contextRoot>\n"
-"         </webModule>\n"
-"      </modules>\n"
-"   </configuration>\n"
-"</plugin>]]>"
+"Rather than shipping the container off to a standalone Tomcat installation, "
+"you can also execute the application in an embedded Tomcat 6 container:"
 msgstr ""
-"<![CDATA[<plugin>\n"
-"   <groupId>org.apache.maven.plugins</groupId>\n"
-"   <artifactId>maven-ear-plugin</artifactId>\n"
-"   <configuration>\n"
-"      <modules>\n"
-"         <webModule>\n"
-"            <groupId>org.jboss.webbeans.examples.translator</groupId>\n"
-"            <artifactId>webbeans-translator-war</artifactId>\n"
-"            <contextRoot>/webbeans-translator</contextRoot>\n"
-"         </webModule>\n"
-"      </modules>\n"
-"      <jboss>\n"
-"         <loader-repository>webbeans.jboss.org:loader=webbeans-translator</loader-repository>\n"
-"      </jboss>\n"
-"   </configuration>\n"
-"</plugin>]]>"
 
 #. Tag: para
-#: ri.xml:488
 #, no-c-format
-msgid "Here we set the context path, which gives us a nice url (<ulink url=\"http://localhost:8080/webbeans-translator\">http://localhost:8080/webbeans-translator</ulink>)."
-msgstr "我们需要在这里做些事情-首先我们需要设置上下文路径为一个不错的URL(<ulink url=\"http://localhost:8080/webbeans-translator\">http://localhost:8080/webbeans-translator</ulink>),我们还需要将JBoss AS的类加载器隔离配置激活。"
+msgid ""
+"The advantage of using the embedded server is that changes to assets in "
+"<literal>src/main/webapp</literal> take effect immediately. If a change to a "
+"webapp configuration file is made, the application may automatically "
+"redeploy (depending on the plugin configuration). If you make a change to a "
+"classpath resource, you need to execute a build:"
+msgstr ""
 
 #. Tag: para
-#: ri.xml:494
 #, no-c-format
-msgid "If you aren't using Maven to generate these files, you would need <literal>META-INF/application.xml</literal>:"
-msgstr "如果你不使用Maven来生成这些文件,你将需要<literal>META-INF/jboss-app.xml</literal>:"
+msgid ""
+"There are several other Maven goals that you can use if you are hacking on "
+"the example, which are documented in the example's <literal>readme.txt</"
+"literal> file."
+msgstr ""
 
-#. Tag: programlisting
-#: ri.xml:499
+#. Tag: title
 #, no-c-format
-msgid ""
-"<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<application xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
-"             xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"             xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd\"\n"
-"             version=\"5\">\n"
-"  <display-name>webbeans-translator-ear</display-name>\n"
-"  <description>Ear Example for the reference implementation of JSR 299: Web Beans</description>\n"
-"  \n"
-"  <module>\n"
-"    <web>\n"
-"      <web-uri>webbeans-translator.war</web-uri>\n"
-"      <context-root>/webbeans-translator</context-root>\n"
-"    </web>\n"
-"  </module>\n"
-"  <module>\n"
-"    <ejb>webbeans-translator.jar</ejb>\n"
-"  </module>\n"
-"</application>]]>"
+msgid "Deploying to Jetty"
 msgstr ""
-"<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<application xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
-"             xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"             xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd\"\n"
-"             version=\"5\">\n"
-"  <display-name>webbeans-translator-ear</display-name>\n"
-"  <description>Ear Example for the reference implementation of JSR 299: Web Beans</description>\n"
-"  \n"
-"  <module>\n"
-"    <web>\n"
-"      <web-uri>webbeans-translator.war</web-uri>\n"
-"      <context-root>/webbeans-translator</context-root>\n"
-"    </web>\n"
-"  </module>\n"
-"  <module>\n"
-"    <ejb>webbeans-translator.jar</ejb>\n"
-"  </module>\n"
-"</application>]]>"
 
 #. Tag: para
-#: ri.xml:502
 #, no-c-format
-msgid "Next, lets look at the war. Just as in the numberguess example, we have a <literal>faces-config.xml</literal> (to enable Facelets) and a <literal>web.xml</literal> (to enable JSF) in <literal>WebContent/WEB-INF</literal>."
-msgstr "然后,我们看一下WAR包。在猜数字例子中,我们需要<literal>faces-config.xml</literal>(配置Facelets)和一个位于<literal>WebContent/WEB-INF</literal>下的<literal>web.xml</literal>(配置JSF并将Web Beans服务加入Servlet容器中)。"
+msgid ""
+"Support for Jetty in the examples is a more recent addition. Since Jetty is "
+"traditionally used with Maven, there are no Ant targets. You must invoke the "
+"Maven build directly to deploy the examples to Jetty out of the box. Also, "
+"only the <literal>weld-numberguess</literal> example is configured for Jetty "
+"support at the time of writing."
+msgstr ""
 
 #. Tag: para
-#: ri.xml:509
 #, no-c-format
-msgid "More intersting is the facelet used to translate text. Just as in the numberguess example we have a template, which surrounds the form (ommitted here for brevity):"
-msgstr "更有意思的是用来翻译文本的facelet。在猜数字应用中我们有一个模板,这个模板套着表单(省略了表单):"
-
-#. Tag: programlisting
-#: ri.xml:515
-#, no-c-format
 msgid ""
-"<![CDATA[<h:form id=\"NumberGuessMain\">\n"
-"            \n"
-"   <table>\n"
-"      <tr align=\"center\" style=\"font-weight: bold\" >\n"
-"         <td>\n"
-"            Your text\n"
-"         </td>\n"
-"         <td>\n"
-"            Translation\n"
-"         </td>\n"
-"      </tr>\n"
-"      <tr>\n"
-"         <td>\n"
-"            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" required=\"true\" rows=\"5\" cols=\"80\" />\n"
-"         </td>\n"
-"         <td>\n"
-"            <h:outputText value=\"#{translator.translatedText}\" />\n"
-"         </td>\n"
-"      </tr>\n"
-"   </table>\n"
-"   <div>\n"
-"      <h:commandButton id=\"button\" value=\"Translate\" action=\"#{translator.translate}\"/>\n"
-"   </div>\n"
-"   \n"
-"</h:form>]]>"
+"If you've read through the entire Tomcat section, then you're all ready to "
+"go. The Maven build parallels the embedded Tomcat deployment. If not, don't "
+"worry. We'll still go over everything that you need to know again in this "
+"section."
 msgstr ""
-"<![CDATA[<h:form id=\"NumberGuessMain\">\n"
-"            \n"
-"   <table>\n"
-"      <tr align=\"center\" style=\"font-weight: bold\" >\n"
-"         <td>\n"
-"            Your text\n"
-"         </td>\n"
-"         <td>\n"
-"            Translation\n"
-"         </td>\n"
-"      </tr>\n"
-"      <tr>\n"
-"         <td>\n"
-"            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" required=\"true\" rows=\"5\" cols=\"80\" />\n"
-"         </td>\n"
-"         <td>\n"
-"            <h:outputText value=\"#{translator.translatedText}\" />\n"
-"         </td>\n"
-"      </tr>\n"
-"   </table>\n"
-"   <div>\n"
-"      <h:commandButton id=\"button\" value=\"Translate\" action=\"#{translator.translate}\"/>\n"
-"   </div>\n"
-"   \n"
-"</h:form>]]>"
 
 #. Tag: para
-#: ri.xml:517
 #, no-c-format
-msgid "The user can enter some text in the lefthand textarea, and hit the translate button to see the result to the right."
-msgstr "用户可以在左手边的文本区输入一些文本,点击翻译按钮查看右边的翻译结果。"
+msgid ""
+"The Maven POM (<literal>pom.xml</literal>) includes a profile named "
+"<literal>jetty</literal> that activates the Maven Jetty plugin, which you "
+"can use to start Jetty in embedded mode and deploy the application in place. "
+"You don't need anything else installed except to have the Maven command "
+"(<literal>mvn</literal>) on your path. The rest will be downloaded from the "
+"internet when the build is run."
+msgstr ""
 
 #. Tag: para
-#: ri.xml:522
 #, no-c-format
-msgid "Finally, let's look at the ejb module, <literal>webbeans-translator-ejb</literal>. In <literal>src/main/resources/META-INF</literal> there is just an empty <literal>web-beans.xml</literal>, used to mark the archive as containing Web Beans."
-msgstr "最后,我们看一下EJB模块,<literal>webbeans-translator-ejb</literal>。在<literal>src/main/resources/META-INF</literal>下有两个配置文件,一个是空的<literal>web-beans.xml</literal>,用来标识这个档案包包含Web Beans,一个是<literal>ejb-jar.xml</literal>。Web Beans为所有的EJB提供注入和初始化服务,使用<literal>ejb-jar.xml</literal>文件来配置。你将在使用Web Beans的EJB项目中需要这些配置:"
+msgid ""
+"To run the <literal>weld-numberguess</literal> example on Jetty, switch to "
+"the example directory and execute the <literal>inplace</literal> goal of the "
+"Maven war plugin followed by the <literal>run</literal> goal of the Maven "
+"Jetty plugin with the <literal>jetty</literal> profile enabled, as follows:"
+msgstr ""
 
 #. Tag: para
-#: ri.xml:530
 #, no-c-format
-msgid "We've saved the most interesting bit to last, the code! The project has two simple beans, <literal>SentenceParser</literal> and <literal>TextTranslator</literal> and two enterprise beans, <literal>TranslatorControllerBean</literal> and <literal>SentenceTranslator</literal>. You should be getting quite familiar with what a Web Bean looks like by now, so we'll just highlight the most interesting bits here."
-msgstr "我们将最有意思的部分放在最后,那就是代码!这个例子有两个简单Beans, <literal>SentanceParser</literal>和<literal>TextTranslator</literal>,还有两个企业Beans,<literal>TanslatorControllerBean</literal>和<literal>SentenceTranslator</literal>。现在你应该对Web Beans有点熟悉了,我们在这里着重最有意思的部分。"
+msgid ""
+"The log output of Jetty will be shown in the console. Once Jetty reports "
+"that the application has deployed, you can access it at the following local "
+"URL: <ulink url=\"http://localhost:9090/weld-numberguess\">http://"
+"localhost:9090/weld-numberguess</ulink>. The port is defined in the Maven "
+"Jetty plugin configuration within the <literal>jetty</literal> profile."
+msgstr ""
 
 #. Tag: para
-#: ri.xml:540
 #, no-c-format
-msgid "Both <literal>SentenceParser</literal> and <literal>TextTranslator</literal> are dependent beans, and <literal>TextTranslator</literal> uses constructor initialization:"
-msgstr "<literal>SentanceParser</literal>和<literal>TextTranslator</literal>是相互依赖的Beans,<literal>TextTranslator</literal>使用构造器初始化:"
-
-#. Tag: programlisting
-#: ri.xml:546
-#, no-c-format
 msgid ""
-"<![CDATA[public class TextTranslator { \n"
-"   private SentenceParser sentenceParser; \n"
-"   private Translator sentenceTranslator; \n"
-"   \n"
-"   @Initializer\n"
-"   TextTranslator(SentenceParser sentenceParser, Translator sentenceTranslator) \n"
-"   { \n"
-"      this.sentenceParser = sentenceParser; \n"
-"      this.sentenceTranslator = sentenceTranslator;]]>"
+"Any changes to assets in <literal>src/main/webapp</literal> take effect "
+"immediately. If a change to a webapp configuration file is made, the "
+"application may automatically redeploy. The redeploy behavior can be fined-"
+"tuned in the plugin configuration. If you make a change to a classpath "
+"resource, you need to execute a build and the <literal>inplace</literal> "
+"goal of the Maven war plugin, again with the <literal>jetty</literal> "
+"profile enabled."
 msgstr ""
-"<![CDATA[public class TextTranslator { \n"
-"   private SentenceParser sentenceParser; \n"
-"   private Translator sentenceTranslator; \n"
-"   \n"
-"   @Initializer\n"
-"   TextTranslator(SentenceParser sentenceParser, Translator sentenceTranslator) \n"
-"   { \n"
-"      this.sentenceParser = sentenceParser; \n"
-"      this.sentenceTranslator = sentenceTranslator;]]>"
 
 #. Tag: para
-#: ri.xml:548
 #, no-c-format
-msgid "<literal>TextTranslator</literal> is a stateless bean (with a local business interface), where the magic happens - of course, we couldn't develop a full translator, but we gave it a good go!"
-msgstr "<literal>TextTranslator</literal>是一个无状态Bean(拥有一个本地业务接口),这里是魔术展现的地方-当然,我们不会开发一个完整的翻译器,但我们可以开发一个不错的小玩意!"
+msgid ""
+"The <literal>war:inplace</literal> goal copies the compiled classes and jars "
+"inside <literal>src/main/webapp</literal>, under <literal>WEB-INF/classes</"
+"literal> and <literal>WEB-INF/lib</literal>, respectively, mixing source and "
+"compiled files. However, the build does work around these temporary files by "
+"excluding them from the packaged war and cleaning them during the Maven "
+"clean phase."
+msgstr ""
 
 #. Tag: para
-#: ri.xml:554
 #, no-c-format
-msgid "Finally, there is UI orientated controller, that collects the text from the user, and dispatches it to the translator. This is a request scoped, named, stateful session bean, which injects the translator."
-msgstr "最后,这里又要一个面向UI的控制器,从用户输入处搜集文本,转发给翻译器。这个控制器是请求范围的,具名的,有状态的会话Bean,它可以将翻译器注入进来。"
-
-#. Tag: programlisting
-#: ri.xml:560
-#, no-c-format
 msgid ""
-"<![CDATA[@Stateful\n"
-"@RequestScoped\n"
-"@Named(\"translator\")\n"
-"public class TranslatorControllerBean implements TranslatorController\n"
-"{\n"
-"   \n"
-"   @Current TextTranslator translator;]]>"
+"You have two options if you want to run the example on Jetty from the IDE. "
+"You can either install the m2eclispe[link] plugin and run the goals as "
+"described above. Your other option is to start the Jetty container from a "
+"Java application."
 msgstr ""
-"<![CDATA[@Stateful\n"
-"@RequestScoped\n"
-"@Named(\"translator\")\n"
-"public class TranslatorControllerBean implements TranslatorController\n"
-"{\n"
-"   \n"
-"   @Current TextTranslator translator;]]>"
 
 #. Tag: para
-#: ri.xml:562
 #, no-c-format
-msgid "The bean also has getters and setters for all the fields on the page."
-msgstr "这个Bean也拥有页面上所有域的getter和setter方法。"
+msgid "First, initialize the Eclipse project:"
+msgstr ""
 
 #. Tag: para
-#: ri.xml:566
 #, no-c-format
-msgid "As this is a stateful session bean, we have to have a remove method:"
-msgstr "这个Bean是有状态会话Bean,我们需要有一个remove方法:"
-
-#. Tag: programlisting
-#: ri.xml:570
-#, no-c-format
 msgid ""
-"<![CDATA[   @Remove\n"
-"   public void remove()\n"
-"   {\n"
-"      \n"
-"   }]]>"
+"Next, assemble all the necessary resources under <literal>src/main/webapp</"
+"literal>:"
 msgstr ""
-"<![CDATA[   @Remove\n"
-"   public void remove()\n"
-"   {\n"
-"      \n"
-"   }]]>"
 
 #. Tag: para
-#: ri.xml:572
 #, no-c-format
-msgid "The Web Beans manager will call the remove method for you when the bean is destroyed; in this case at the end of the request."
-msgstr "Web Beans管理器在这个bean销毁的时候调用remove方法;在这个例子中是请求结束的时候。"
+msgid ""
+"Now, you are ready to run the server in Eclipse. Import the project into "
+"your Eclipse workspace using \"Import Existing Project into Workspace. Then, "
+"find the start class in <literal>src/jetty/java</literal> and run its main "
+"method as a Java Application. Jetty will launch. You can view the "
+"application at the following local URL: <ulink url=\"http://localhost:8080"
+"\">http://localhost:8080</ulink>. Pay particular attention to the port in "
+"the URL and the lack of a trailing context path."
+msgstr ""
 
 #. Tag: para
-#: ri.xml:578
 #, no-c-format
-msgid "That concludes our short tour of the Web Beans examples. For more on Web Beans , or to help out, please visit <ulink url=\"http://www.seamframework.org/WebBeans/Development\">http://www.seamframework.org/WebBeans/Development</ulink>."
-msgstr "Web Beans参考实现的例子到此结束。想要获得关于参考实现更多的知识或者帮助,请访问<ulink url=\"http://www.seamframework.org/WebBeans/Development\">http://www.seamframework.org/WebBeans/Development</ulink>。"
+msgid ""
+"Now that you have gotten the starter applications deployed on the server of "
+"your choice, you probably want to know a little bit about how they actually "
+"work."
+msgstr ""
 
-#. Tag: para
-#: ri.xml:584
-#, no-c-format
-msgid "We need help in all areas - bug fixing, writing new features, writing examples and translating this reference guide."
-msgstr "我们在各个方面都需要帮助-bug修复,新特性开发,例子开发和参考指南的翻译等等。"
+#~ msgid "Web Beans, the Reference Implementation of JSR-299"
+#~ msgstr "使用Web Beans的参考实现"
 
+#~ msgid ""
+#~ "The Web Beans is being developed at <ulink url=\"http://seamframework.org/"
+#~ "WebBeans\">the Seam project</ulink>. You can download the latest "
+#~ "developer release of Web Beans from the <ulink url=\"http://seamframework."
+#~ "org/Download\">the downloads page</ulink>."
+#~ msgstr ""
+#~ "Web Bean参考实现由<ulink url=\"http://seamframework.org/WebBeans\">Seam项"
+#~ "目</ulink>开发。你可以从<ulink url=\"http://seamframework.org/Download"
+#~ "\">the downloads page</ulink>下载最新的开发者版本。"
+
+#~ msgid ""
+#~ "Web Beans comes with a two deployable example applications: "
+#~ "<literal>webbeans-numberguess</literal>, a war example, containing only "
+#~ "simple beans, and <literal>webbeans-translator</literal> an ear example, "
+#~ "containing enterprise beans. There are also two variations on the "
+#~ "numberguess example, the tomcat example (suitable for deployment to "
+#~ "Tomcat) and the jsf2 example, which you can use if you are running JSF2. "
+#~ "To run the examples you'll need the following:"
+#~ msgstr ""
+#~ "Web Beans RI自带了两个例子:<literal>webbeans-numberguess</literal> (一个"
+#~ "仅包含一个简单Bean的WAR应用例子)和<literal>webbeans-translator</literal> "
+#~ "(一个包含企业Bean的EAR应用例子)。为了运行例子,你需要:"
+
+#~ msgid "Ant 1.7.0."
+#~ msgstr "Ant 1.7.0."
+
+#~ msgid ""
+#~ "You'll need to download JBoss AS 5.0.1.GA from <ulink url=\"http://www."
+#~ "jboss.org/jbossas/downloads/\">jboss.org</ulink>, and unzip it. For "
+#~ "example:"
+#~ msgstr ""
+#~ "当前,Web Beans参考实现只能运行在JBoss AS 5之上。你需要从<ulink url="
+#~ "\"http://www.jboss.org/jbossas/downloads/\">jboss.org</ulink>下载JBoss AS "
+#~ "5.0.0.GA, 然后解压。例如:"
+
+#~ msgid ""
+#~ "<![CDATA[$ cd /Applications\n"
+#~ "$ unzip ~/jboss-5.0.1.GA.zip]]>"
+#~ msgstr ""
+#~ "<![CDATA[$ cd /Applications\n"
+#~ "$ unzip ~/jboss-5.0.0.GA.zip]]>"
+
+#~ msgid ""
+#~ "Next, download Web Beans from <ulink url=\"http://seamframework.org/"
+#~ "Download\">seamframework.org</ulink>, and unzip it. For example"
+#~ msgstr ""
+#~ "然后从<ulink url=\"http://seamframework.org/WebBeans\">seamframework.org</"
+#~ "ulink>下载Web Beans的参考实现,然后解压。例如:"
+
+#~ msgid ""
+#~ "<![CDATA[$ cd ~/\n"
+#~ "$ unzip ~/webbeans-$VERSION.zip]]>"
+#~ msgstr ""
+#~ "<![CDATA[$ cd ~/\n"
+#~ "$ unzip ~/webbeans-1.0.0.ALPHA1.zip]]>"
+
+#~ msgid ""
+#~ "Next, we need to tell Web Beans where JBoss is located. Edit "
+#~ "<literal>jboss-as/build.properties</literal> and set the <literal>jboss."
+#~ "home</literal> property. For example:"
+#~ msgstr ""
+#~ "然后,我们需要告诉Web Beans JBoss的位置。编辑<literal>jboss-as/build."
+#~ "properties</literal>,设置<literal>jboss.home</literal>属性。例如:"
+
+#~ msgid "jboss.home=/Applications/jboss-5.0.1.GA"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
+
+#~ msgid ""
+#~ "To install Web Beans, you'll need Ant 1.7.0 installed, and the "
+#~ "<literal>ANT_HOME</literal> environment variable set. For example:"
+#~ msgstr ""
+#~ "为了安装更新,你需要安装Ant 1.7.0,设置<literal>ANT_HOME</literal>环境变"
+#~ "量。例如:"
+
+#~ msgid "Web Beans is bundled with JBoss AS 5.1 and above."
+#~ msgstr "JBoss AS 5.1版本及以上捆绑了Web Bean。"
+
+#~ msgid ""
+#~ "$ unzip apache-ant-1.7.0.zip\n"
+#~ "$ export ANT_HOME=~/apache-ant-1.7.0"
+#~ msgstr ""
+#~ "$ unzip apache-ant-1.7.0.zip\n"
+#~ "$ export ANT_HOME=~/apache-ant-1.7.0"
+
+#~ msgid ""
+#~ "Then, you can install the update. The update script will use Maven to "
+#~ "download Web Beans automatically."
+#~ msgstr "然后,你需要安装更新,更新脚本使用Maven来自动下载Web Beans和EJB3。"
+
+#~ msgid ""
+#~ "$ cd webbeans-$VERSION/jboss-as\n"
+#~ "$ ant update"
+#~ msgstr ""
+#~ "$ cd webbeans-1.0.0.ALPHA1/jboss-as\n"
+#~ "$ ant update"
+
+#~ msgid ""
+#~ "The build scripts for the examples offer a number of targets for JBoss "
+#~ "AS, these are:"
+#~ msgstr "例子的构建脚本包含多个目标:"
+
+#~ msgid "To deploy the numberguess example:"
+#~ msgstr "部署猜数字(numberguess)例子:"
+
+#~ msgid ""
+#~ "$ cd examples/numberguess\n"
+#~ "ant deploy"
+#~ msgstr ""
+#~ "$ cd examples/numberguess\n"
+#~ "ant deploy"
+
+#~ msgid "Start JBoss AS:"
+#~ msgstr "启动 JBoss AS:"
+
+#~ msgid "$ /Application/jboss-5.0.0.GA/bin/run.sh"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
+
+#~ msgid "If you use Windows, use the <literal>run.bat</literal>script."
+#~ msgstr "如果你使用Windows操作系统,则使用<literal>run.bat</literal> 脚本。"
+
+#~ msgid ""
+#~ "Wait for the application to deploy, and enjoy hours of fun at <ulink url="
+#~ "\"http://localhost:8080/webbeans-numberguess\"></ulink>!"
+#~ msgstr ""
+#~ "等待应用部署完毕,好好体验一下<ulink url=\"http://localhost:8080/webbeans-"
+#~ "numberguess\"></ulink>!"
+
+#~ msgid ""
+#~ "Web Beans includes a second simple example that will translate your text "
+#~ "into Latin. The numberguess example is a war example, and uses only "
+#~ "simple beans; the translator example is an ear example, and includes "
+#~ "enterprise beans, packaged in an EJB module. To try it out:"
+#~ msgstr ""
+#~ "Web Bean参考实现的第二个简单例子能够将你的文本翻译为拉丁文。猜数字例子是一"
+#~ "个WAR应用,仅仅使用了一个简单Beans;翻译器例子是一个EAR应用,包含了打包在"
+#~ "EJB模块中的企业Beans。试一下:"
+
+#~ msgid ""
+#~ "$ cd examples/translator\n"
+#~ "ant deploy"
+#~ msgstr ""
+#~ "$ cd examples/traslator\n"
+#~ "ant deploy"
+
+#~ msgid ""
+#~ "Wait for the application to deploy, and visit <ulink url=\"http://"
+#~ "localhost:8080/webbeans-translator\"></ulink>!"
+#~ msgstr ""
+#~ "等待应用部署,试一下<ulink url=\"http://localhost:8080/webbeans-translator"
+#~ "\"></ulink>!"
+
+#~ msgid ""
+#~ "<![CDATA[$ cd /Applications\n"
+#~ "$ unzip ~/apache-tomcat-6.0.18.zip]]>"
+#~ msgstr ""
+#~ "<![CDATA[$ cd /Applications\n"
+#~ "$ unzip ~/jboss-5.0.0.GA.zip]]>"
+
+#~ msgid ""
+#~ "Next, we need to tell Web Beans where Tomcat is located. Edit "
+#~ "<literal>jboss-as/build.properties</literal> and set the <literal>tomcat."
+#~ "home</literal> property. For example:"
+#~ msgstr ""
+#~ "然后,我们需要告诉Web Beans JBoss的位置。编辑<literal>jboss-as/build."
+#~ "properties</literal>,设置<literal>jboss.home</literal>属性。例如:"
+
+#~ msgid "tomcat.home=/Applications/apache-tomcat-6.0.18"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
+
+#~ msgid ""
+#~ "The build scripts for the examples offer a number of targets for Tomcat, "
+#~ "these are:"
+#~ msgstr "例子的构建脚本包含多个目标:"
+
+#~ msgid "<literal>ant tomcat.clean</literal> - clean the example"
+#~ msgstr "<literal>ant clean</literal> - 清除例子"
+
+#~ msgid ""
+#~ "$ cd examples/tomcat\n"
+#~ "ant tomcat.deploy"
+#~ msgstr ""
+#~ "$ cd examples/traslator\n"
+#~ "ant deploy"
+
+#~ msgid "Start Tomcat:"
+#~ msgstr "启动Tomcat:"
+
+#~ msgid "$ /Applications/apache-tomcat-6.0.18/bin/startup.sh"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
+
+#~ msgid "If you use Windows, use the <literal>startup.bat</literal>script."
+#~ msgstr "如果你使用Windows操作系统,则使用<literal>run.bat</literal> 脚本。"
+
+#~ msgid "TODO"
+#~ msgstr "待办"
+
+#~ msgid "The numberguess example"
+#~ msgstr "猜数字例子"
+
+#~ msgid ""
+#~ "In the numberguess application you get given 10 attempts to guess a "
+#~ "number between 1 and 100. After each attempt, you will be told whether "
+#~ "you are too high, or too low."
+#~ msgstr ""
+#~ "在猜数字应用中,你有十次机会来猜一个1到100之间的数字。每次猜测之后,应用都"
+#~ "会告诉你你猜的数字是高了还是低了。"
+
+#~ msgid ""
+#~ "The numberguess example is comprised of a number of Web Beans, "
+#~ "configuration files, and Facelet JSF pages, packaged as a war. Let's "
+#~ "start with the configuration files."
+#~ msgstr ""
+#~ "猜数字应用由Web Beans,配置文件,Facelete JSF页面组成,打包为一个WAR。我们"
+#~ "先看一下配置文件。"
+
+#~ msgid ""
+#~ "All the configuration files for this example are located in <literal>WEB-"
+#~ "INF/</literal>, which is stored in <literal>WebContent</literal> in the "
+#~ "source tree. First, we have <literal>faces-config.xml</literal>, in which "
+#~ "we tell JSF to use Facelets:"
+#~ msgstr ""
+#~ "猜数字应用的所有的配置文件位于<literal>WEB-INF/</literal>,这个目录位于源"
+#~ "码树的<literal>WebContent</literal>中。首先,我们在faces-config.xml文件中"
+#~ "告诉JSF使用Faceletes:"
+
+#~ msgid ""
+#~ "<![CDATA[<?xml version='1.0' encoding='UTF-8'?>\n"
+#~ "<faces-config version=\"1.2\"\n"
+#~ "              xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "              xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "              xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee "
+#~ "http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd\">\n"
+#~ "    \n"
+#~ "    <application>\n"
+#~ "        <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>\n"
+#~ "    </application>\n"
+#~ "\n"
+#~ "</faces-config>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<?xml version='1.0' encoding='UTF-8'?>\n"
+#~ "<faces-config version=\"1.2\"\n"
+#~ "              xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "              xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "              xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee "
+#~ "http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd\">\n"
+#~ "    \n"
+#~ "    <application>\n"
+#~ "        <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>\n"
+#~ "    </application>\n"
+#~ "\n"
+#~ "</faces-config>]]>"
+
+#~ msgid ""
+#~ "There is an empty <literal>web-beans.xml</literal> file, which marks this "
+#~ "application as a Web Beans application."
+#~ msgstr ""
+#~ "这有一个空的<literal>web-beans.xml</literal>文件,标识这个应用是一个Web "
+#~ "Beans应用。"
+
+#~ msgid "Finally there is <literal>web.xml</literal>:"
+#~ msgstr "最后,这有一个 <literal>web.xml</literal>:"
+
+#~ msgid ""
+#~ "<programlistingco> <areaspec> <area id=\"faces.servlet\" coords=\"12\"/> "
+#~ "<area id=\"faces.servlet.mapping\" coords=\"18\"/> <area id=\"faces."
+#~ "default.suffix\" coords=\"23\"/> <area id=\"session.timeout\" coords=\"28"
+#~ "\"/> <area id=\"webbeans.listener\" coords=\"32\"/> </areaspec> "
+#~ "<programlisting><![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+#~ "\n"
+#~ "<web-app version=\"2.5\"\n"
+#~ "    xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "    xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java."
+#~ "sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n"
+#~ "   \n"
+#~ "   <display-name>Web Beans Numbergues example</display-name>\n"
+#~ "\n"
+#~ "   <!-- JSF -->\n"
+#~ "\n"
+#~ "   <servlet>\n"
+#~ "      <servlet-name>Faces Servlet</servlet-name>\n"
+#~ "      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>\n"
+#~ "      <load-on-startup>1</load-on-startup>\n"
+#~ "   </servlet>\n"
+#~ "\n"
+#~ "   <servlet-mapping>\n"
+#~ "      <servlet-name>Faces Servlet</servlet-name>\n"
+#~ "      <url-pattern>*.jsf</url-pattern>\n"
+#~ "   </servlet-mapping>\n"
+#~ "   \n"
+#~ "   <context-param>\n"
+#~ "      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>\n"
+#~ "      <param-value>.xhtml</param-value>\n"
+#~ "   </context-param>\n"
+#~ "\n"
+#~ "   <session-config>\n"
+#~ "      <session-timeout>10</session-timeout>\n"
+#~ "   </session-config>\n"
+#~ "\n"
+#~ "</web-app>]]></programlisting> <calloutlist> <callout arearefs=\"faces."
+#~ "servlet\"> <para> Enable and load the JSF servlet </para> </callout> "
+#~ "<callout arearefs=\"faces.servlet.mapping\"> <para> Configure requests to "
+#~ "<literal>.jsf</literal> pages to be handled by JSF </para> </callout> "
+#~ "<callout arearefs=\"faces.default.suffix\"> <para> Tell JSF that we will "
+#~ "be giving our source files (facelets) an extension of <literal>.jsf</"
+#~ "literal> </para> </callout> <callout arearefs=\"session.timeout\"> <para> "
+#~ "Configure a session timeout of 10 minutes </para> </callout> </"
+#~ "calloutlist> </programlistingco> <note> <para> Whilst this demo is a JSF "
+#~ "demo, you can use Web Beans with any Servlet based web framework. </para> "
+#~ "</note> <para> Let's take a look at the Facelet view: </para> "
+#~ "<programlistingco> <areaspec> <area id=\"template\" coords=\"8\"/> <area "
+#~ "id=\"messages\" coords=\"12\"/> <area id=\"instructions\" coords=\"19\"/> "
+#~ "<area id=\"guess\" coords=\"25\"/> <area id=\"validator\" coords=\"30\"/> "
+#~ "<area id=\"submit\" coords=\"33\"/> </areaspec> <programlisting><![CDATA"
+#~ "[<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" "
+#~ "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
+#~ "<html xmlns=\"http://www.w3.org/1999/xhtml\"\n"
+#~ "    xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n"
+#~ "    xmlns:h=\"http://java.sun.com/jsf/html\"\n"
+#~ "    xmlns:f=\"http://java.sun.com/jsf/core\"\n"
+#~ "    xmlns:s=\"http://jboss.com/products/seam/taglib\">\n"
+#~ "\n"
+#~ "  <ui:composition template=\"template.xhtml\">\n"
+#~ "    <ui:define name=\"content\">\n"
+#~ "       <h1>Guess a number...</h1>\n"
+#~ "       <h:form id=\"NumberGuessMain\">\n"
+#~ "          <div style=\"color: red\">\n"
+#~ "             <h:messages id=\"messages\" globalOnly=\"false\"/>\n"
+#~ "             <h:outputText id=\"Higher\" value=\"Higher!\" rendered=\"#"
+#~ "{game.number gt game.guess and game.guess ne 0}\"/>\n"
+#~ "             <h:outputText id=\"Lower\" value=\"Lower!\" rendered=\"#"
+#~ "{game.number lt game.guess and game.guess ne 0}\"/>\n"
+#~ "          </div>\n"
+#~ "   \n"
+#~ "          <div>\n"
+#~ "             I'm thinking of a number between #{game.smallest} and #{game."
+#~ "biggest}.\n"
+#~ "             You have #{game.remainingGuesses} guesses.\n"
+#~ "          </div>\n"
+#~ "     \n"
+#~ "          <div>\n"
+#~ "             Your guess: \n"
+#~ "             <h:inputText id=\"inputGuess\" \n"
+#~ "                          value=\"#{game.guess}\" \n"
+#~ "                          required=\"true\" \n"
+#~ "                          size=\"3\" \n"
+#~ "                          disabled=\"#{game.number eq game.guess}\">\n"
+#~ "                <f:validateLongRange maximum=\"#{game.biggest}\" \n"
+#~ "                                     minimum=\"#{game.smallest}\"/>\n"
+#~ "             </h:inputText>\n"
+#~ "            <h:commandButton id=\"GuessButton\"  \n"
+#~ "                             value=\"Guess\" \n"
+#~ "                             action=\"#{game.check}\" \n"
+#~ "                             disabled=\"#{game.number eq game.guess}\"/>\n"
+#~ "          </div>\n"
+#~ "          <div>\n"
+#~ "            <h:commandButton id=\"RestartButton\" value=\"Reset\" action="
+#~ "\"#{game.reset}\" immediate=\"true\" />\n"
+#~ "          </div>\n"
+#~ "       </h:form>\n"
+#~ "    </ui:define>\n"
+#~ "  </ui:composition>\n"
+#~ "</html>]]></programlisting> <calloutlist> <callout arearefs=\"template\"> "
+#~ "<para> Facelets is a templating language for JSF, here we are wrapping "
+#~ "our page in a template which defines the header. </para> </callout> "
+#~ "<callout arearefs=\"messages\"> <para> There are a number of messages "
+#~ "which can be sent to the user, \"Higher!\", \"Lower!\" and \"Correct!\" </"
+#~ "para> </callout> <callout arearefs=\"instructions\"> <para> As the user "
+#~ "guesses, the range of numbers they can guess gets smaller - this sentance "
+#~ "changes to make sure they know what range to guess in. </para> </callout> "
+#~ "<callout arearefs=\"guess\"> <para> This input field is bound to a Web "
+#~ "Bean, using the value expression. </para> </callout> <callout arearefs="
+#~ "\"validator\"> <para> A range validator is used to make sure the user "
+#~ "doesn't accidentally input a number outside of the range in which they "
+#~ "can guess - if the validator wasn't here, the user might use up a guess "
+#~ "on an out of range number. </para> </callout> <callout arearefs=\"submit"
+#~ "\"> <para> And, of course, there must be a way for the user to send their "
+#~ "guess to the server. Here we bind to an action method on the Web Bean. </"
+#~ "para> </callout> </calloutlist> </programlistingco>"
+#~ msgstr ""
+#~ "<programlistingco> <areaspec> <area id=\"faces.servlet\" coords=\"12\"/> "
+#~ "<area id=\"faces.servlet.mapping\" coords=\"18\"/> <area id=\"faces."
+#~ "default.suffix\" coords=\"23\"/> <area id=\"session.timeout\" coords=\"28"
+#~ "\"/> <area id=\"webbeans.listener\" coords=\"32\"/> </areaspec> "
+#~ "<programlisting><![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+#~ "\n"
+#~ "<web-app version=\"2.5\"\n"
+#~ "    xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
+#~ "    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "    xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java."
+#~ "sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n"
+#~ "   \n"
+#~ "   <display-name>Web Beans Numbergues example</display-name>\n"
+#~ "\n"
+#~ "   <!-- JSF -->\n"
+#~ "\n"
+#~ "   <servlet>\n"
+#~ "      <servlet-name>Faces Servlet</servlet-name>\n"
+#~ "      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>\n"
+#~ "      <load-on-startup>1</load-on-startup>\n"
+#~ "   </servlet>\n"
+#~ "\n"
+#~ "   <servlet-mapping>\n"
+#~ "      <servlet-name>Faces Servlet</servlet-name>\n"
+#~ "      <url-pattern>*.jsf</url-pattern>\n"
+#~ "   </servlet-mapping>\n"
+#~ "   \n"
+#~ "   <context-param>\n"
+#~ "      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>\n"
+#~ "      <param-value>.xhtml</param-value>\n"
+#~ "   </context-param>\n"
+#~ "\n"
+#~ "   <session-config>\n"
+#~ "      <session-timeout>10</session-timeout>\n"
+#~ "   </session-config>\n"
+#~ "   \n"
+#~ "    <listener>\n"
+#~ "       <listener-class>org.jboss.webbeans.servlet.WebBeansListener</"
+#~ "listener-class>\n"
+#~ "    </listener>\n"
+#~ "\n"
+#~ "</web-app>]]></programlisting> <calloutlist> <callout arearefs=\"faces."
+#~ "servlet\"> <para> Enable and load the JSF servlet </para> </callout> "
+#~ "<callout arearefs=\"faces.servlet.mapping\"> <para> Configure requests to "
+#~ "<literal>.jsf</literal> pages to be handled by JSF </para> </callout> "
+#~ "<callout arearefs=\"faces.default.suffix\"> <para> Tell JSF that we will "
+#~ "be giving our source files (facelets) an extension of <literal>.jsf</"
+#~ "literal> </para> </callout> <callout arearefs=\"session.timeout\"> <para> "
+#~ "Configure a session timeout of 10 minutes </para> </callout> <callout "
+#~ "arearefs=\"webbeans.listener\"> <para> Configure the Web Beans listener, "
+#~ "so that Web Beans services can be used in the servlet request </para> </"
+#~ "callout> </calloutlist> </programlistingco> <note> <para> The only "
+#~ "configuration required by the Web Beans RI in <literal>web.xml</literal> "
+#~ "is to add the Web Beans listener. </para> <para> Whilst this demo is a "
+#~ "JSF demo, you can use the Web Beans RI with any Servlet based web "
+#~ "framework; just configure the Web Beans listener. </para> </note> <para> "
+#~ "Let's take a look at the Facelet view: </para> <programlistingco> "
+#~ "<areaspec> <area id=\"template\" coords=\"8\"/> <area id=\"messages\" "
+#~ "coords=\"12\"/> <area id=\"instructions\" coords=\"19\"/> <area id=\"guess"
+#~ "\" coords=\"25\"/> <area id=\"validator\" coords=\"29\"/> <area id="
+#~ "\"submit\" coords=\"32\"/> </areaspec> <programlisting><![CDATA[<!DOCTYPE "
+#~ "html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3."
+#~ "org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
+#~ "<html xmlns=\"http://www.w3.org/1999/xhtml\"\n"
+#~ "    xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n"
+#~ "    xmlns:h=\"http://java.sun.com/jsf/html\"\n"
+#~ "    xmlns:f=\"http://java.sun.com/jsf/core\"\n"
+#~ "    xmlns:s=\"http://jboss.com/products/seam/taglib\">\n"
+#~ "\n"
+#~ "  <ui:composition template=\"template.xhtml\">\n"
+#~ "    <ui:define name=\"content\">\n"
+#~ "       <h1>Guess a number...</h1>\n"
+#~ "       <h:form id=\"NumberGuessMain\">\n"
+#~ "          <div style=\"color: red\">\n"
+#~ "             <h:messages id=\"messages\" globalOnly=\"false\"/>\n"
+#~ "             <h:outputText id=\"Higher\" value=\"Higher!\" rendered=\"#"
+#~ "{game.number gt game.guess}\"/>\n"
+#~ "             <h:outputText id=\"Lower\" value=\"Lower!\" rendered=\"#"
+#~ "{game.number lt game.guess}\"/>\n"
+#~ "          </div>\n"
+#~ "   \n"
+#~ "          <div>\n"
+#~ "             I'm thinking of a number between #{game.smallest} and #{game."
+#~ "biggest}.\n"
+#~ "             You have #{game.remainingGuesses} guesses.\n"
+#~ "          </div>\n"
+#~ "     \n"
+#~ "          <div>\n"
+#~ "             Your guess: \n"
+#~ "             <h:inputText id=\"inputGuess\" \n"
+#~ "                          value=\"#{game.guess}\" \n"
+#~ "                          required=\"true\" \n"
+#~ "                          size=\"3\">\n"
+#~ "                <f:validateLongRange maximum=\"#{game.biggest}\" \n"
+#~ "                                     minimum=\"#{game.smallest}\"/>\n"
+#~ "             </h:inputText>\n"
+#~ "            <h:commandButton id=\"GuessButton\" \n"
+#~ "                             value=\"Guess\" \n"
+#~ "                             action=\"#{game.check}\"/>\n"
+#~ "          </div>\n"
+#~ "   \n"
+#~ "       </h:form>\n"
+#~ "    </ui:define>\n"
+#~ "  </ui:composition>\n"
+#~ "</html>]]></programlisting> <calloutlist> <callout arearefs=\"template\"> "
+#~ "<para> Facelets is a templating language for JSF, here we are wrapping "
+#~ "our page in a template which defines the header. </para> </callout> "
+#~ "<callout arearefs=\"messages\"> <para> There are a number of messages "
+#~ "which can be sent to the user, \"Higher!\", \"Lower!\" and \"Correct!\" </"
+#~ "para> </callout> <callout arearefs=\"instructions\"> <para> As the user "
+#~ "guesses, the range of numbers they can guess gets smaller - this sentance "
+#~ "changes to make sure they know what range to guess in. </para> </callout> "
+#~ "<callout arearefs=\"guess\"> <para> This input field is bound to a Web "
+#~ "Bean, using the value expression. </para> </callout> <callout arearefs="
+#~ "\"validator\"> <para> A range validator is used to make sure the user "
+#~ "doesn't accidentally input a number outside of the range in which they "
+#~ "can guess - if the validator wasn't here, the user might use up a guess "
+#~ "on an out of range number. </para> </callout> <callout arearefs=\"submit"
+#~ "\"> <para> And, of course, there must be a way for the user to send their "
+#~ "guess to the server. Here we bind to an action method on the Web Bean. </"
+#~ "para> </callout> </calloutlist> </programlistingco>"
+
+#~ msgid ""
+#~ "The example exists of 4 classes, the first two of which are binding "
+#~ "types. First, there is the <literal>@Random</literal> binding type, used "
+#~ "for injecting a random number:"
+#~ msgstr ""
+#~ "这个例子包括4个类,前面两个是绑定类型。首先,这有一个<literal>@Random</"
+#~ "literal>绑定类型,用来注入一个随机数:"
+
+#~ msgid ""
+#~ "<![CDATA[@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Documented\n"
+#~ "@BindingType\n"
+#~ "public @interface Random {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Documented\n"
+#~ "@BindingType\n"
+#~ "public @interface Random {}]]>"
+
+#~ msgid ""
+#~ "There is also the <literal>@MaxNumber</literal> binding type, used for "
+#~ "injecting the maximum number that can be injected:"
+#~ msgstr ""
+#~ "这还有一个<literal>@MaxNumber</literal>绑定类型,用来注入一个最大值:"
+
+#~ msgid ""
+#~ "<![CDATA[@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Documented\n"
+#~ "@BindingType\n"
+#~ "public @interface MaxNumber {}\n"
+#~ "]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Documented\n"
+#~ "@BindingType\n"
+#~ "public @interface MaxNumber {}\n"
+#~ "]]>"
+
+#~ msgid ""
+#~ "The <literal>Generator</literal> class is responsible for creating the "
+#~ "random number, via a producer method. It also exposes the maximum "
+#~ "possible number via a producer method:"
+#~ msgstr ""
+#~ "<literal>Generator</literal>类通过一个生产者(producer)方法创建一个随机数。"
+#~ "它也通过一个生产者方法暴露可能的最大值:"
+
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped\n"
+#~ "public class Generator {\n"
+#~ "   \n"
+#~ "   private java.util.Random random = new java.util.Random( System."
+#~ "currentTimeMillis() );\n"
+#~ "   \n"
+#~ "   private int maxNumber = 100;\n"
+#~ "   \n"
+#~ "   java.util.Random getRandom()\n"
+#~ "   {\n"
+#~ "      return random;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Produces @Random int next() { \n"
+#~ "      return getRandom().nextInt(maxNumber); \n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Produces @MaxNumber int getMaxNumber()\n"
+#~ "   {\n"
+#~ "      return maxNumber;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped\n"
+#~ "public class Generator {\n"
+#~ "   \n"
+#~ "   private java.util.Random random = new java.util.Random( System."
+#~ "currentTimeMillis() );\n"
+#~ "   \n"
+#~ "   private int maxNumber = 100;\n"
+#~ "   \n"
+#~ "   java.util.Random getRandom()\n"
+#~ "   {\n"
+#~ "      return random;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Produces @Random int next() { \n"
+#~ "      return getRandom().nextInt(maxNumber); \n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Produces @MaxNumber int getMaxNumber()\n"
+#~ "   {\n"
+#~ "      return maxNumber;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "You'll notice that the <literal>Generator</literal> is application "
+#~ "scoped; therefore we don't get a different random each time."
+#~ msgstr ""
+#~ "你会注意到<literal>Generator</literal>是应用范围的;因此我们不会每次都得到"
+#~ "一个不同的随机对象。"
+
+#~ msgid ""
+#~ "The final Web Bean in the application is the session scoped "
+#~ "<literal>Game</literal>."
+#~ msgstr "最终的应用中的Web Bean是会话范围的 <literal>Game</literal> 。"
+
+#~ msgid ""
+#~ "You'll note that we've used the <literal>@Named</literal> annotation, so "
+#~ "that we can use the bean through EL in the JSF page. Finally, we've used "
+#~ "constructor injection to initialize the game with a random number. And of "
+#~ "course, we need to tell the player when they've won, so we give feedback "
+#~ "with a <literal>FacesMessage</literal>."
+#~ msgstr ""
+#~ "你也许注意到我们使用了 <literal>@Named</literal>注释,以便我们能够通过EL"
+#~ "(表达式语言)在JSF页面中使用Bean。最后,我们通过构造器注入来初始化猜数字"
+#~ "游戏并给它设一个随机数。当然,在玩家猜对数字后,我们需要告诉玩家他赢了,所"
+#~ "以我们通过<literal>FacesMessage</literal>反馈给玩家一条信息。"
+
+#~ msgid ""
+#~ "<![CDATA[package org.jboss.webbeans.examples.numberguess;\n"
+#~ "\n"
+#~ "\n"
+#~ "import javax.annotation.PostConstruct;\n"
+#~ "import javax.faces.application.FacesMessage;\n"
+#~ "import javax.faces.context.FacesContext;\n"
+#~ "import javax.webbeans.AnnotationLiteral;\n"
+#~ "import javax.webbeans.Current;\n"
+#~ "import javax.webbeans.Initializer;\n"
+#~ "import javax.webbeans.Named;\n"
+#~ "import javax.webbeans.SessionScoped;\n"
+#~ "import javax.webbeans.manager.Manager;\n"
+#~ "\n"
+#~ "@Named\n"
+#~ "@SessionScoped\n"
+#~ "public class Game\n"
+#~ "{\n"
+#~ "   private int number;\n"
+#~ "   \n"
+#~ "   private int guess;\n"
+#~ "   private int smallest;\n"
+#~ "   private int biggest;\n"
+#~ "   private int remainingGuesses;\n"
+#~ "   \n"
+#~ "   @Current Manager manager;\n"
+#~ "   \n"
+#~ "   public Game()\n"
+#~ "   {\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Initializer\n"
+#~ "   Game(@MaxNumber int maxNumber)\n"
+#~ "   {      \n"
+#~ "      this.biggest = maxNumber;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public int getNumber()\n"
+#~ "   {\n"
+#~ "      return number;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getGuess()\n"
+#~ "   {\n"
+#~ "      return guess;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void setGuess(int guess)\n"
+#~ "   {\n"
+#~ "      this.guess = guess;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getSmallest()\n"
+#~ "   {\n"
+#~ "      return smallest;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getBiggest()\n"
+#~ "   {\n"
+#~ "      return biggest;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getRemainingGuesses()\n"
+#~ "   {\n"
+#~ "      return remainingGuesses;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public String check()\n"
+#~ "   {\n"
+#~ "      if (guess>number)\n"
+#~ "      {\n"
+#~ "         biggest = guess - 1;\n"
+#~ "      }\n"
+#~ "      if (guess<number)\n"
+#~ "      {\n"
+#~ "         smallest = guess + 1;\n"
+#~ "      }\n"
+#~ "      if (guess == number)\n"
+#~ "      {\n"
+#~ "         FacesContext.getCurrentInstance().addMessage(null, new "
+#~ "FacesMessage(\"Correct!\"));\n"
+#~ "      }\n"
+#~ "      remainingGuesses--;\n"
+#~ "      return null;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @PostConstruct\n"
+#~ "   public void reset()\n"
+#~ "   {\n"
+#~ "      this.smallest = 0;\n"
+#~ "      this.guess = 0;\n"
+#~ "      this.remainingGuesses = 10;\n"
+#~ "      this.number = manager.getInstanceByType(Integer.class, new "
+#~ "AnnotationLiteral<Random>(){});\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[package org.jboss.webbeans.examples.numberguess;\n"
+#~ "\n"
+#~ "\n"
+#~ "import javax.annotation.PostConstruct;\n"
+#~ "import javax.faces.application.FacesMessage;\n"
+#~ "import javax.faces.context.FacesContext;\n"
+#~ "import javax.webbeans.AnnotationLiteral;\n"
+#~ "import javax.webbeans.Current;\n"
+#~ "import javax.webbeans.Initializer;\n"
+#~ "import javax.webbeans.Named;\n"
+#~ "import javax.webbeans.SessionScoped;\n"
+#~ "import javax.webbeans.manager.Manager;\n"
+#~ "\n"
+#~ "@Named\n"
+#~ "@SessionScoped\n"
+#~ "public class Game\n"
+#~ "{\n"
+#~ "   private int number;\n"
+#~ "   \n"
+#~ "   private int guess;\n"
+#~ "   private int smallest;\n"
+#~ "   private int biggest;\n"
+#~ "   private int remainingGuesses;\n"
+#~ "   \n"
+#~ "   @Current Manager manager;\n"
+#~ "   \n"
+#~ "   public Game()\n"
+#~ "   {\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Initializer\n"
+#~ "   Game(@MaxNumber int maxNumber)\n"
+#~ "   {      \n"
+#~ "      this.biggest = maxNumber;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public int getNumber()\n"
+#~ "   {\n"
+#~ "      return number;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getGuess()\n"
+#~ "   {\n"
+#~ "      return guess;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void setGuess(int guess)\n"
+#~ "   {\n"
+#~ "      this.guess = guess;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getSmallest()\n"
+#~ "   {\n"
+#~ "      return smallest;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getBiggest()\n"
+#~ "   {\n"
+#~ "      return biggest;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public int getRemainingGuesses()\n"
+#~ "   {\n"
+#~ "      return remainingGuesses;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public String check()\n"
+#~ "   {\n"
+#~ "      if (guess>number)\n"
+#~ "      {\n"
+#~ "         biggest = guess - 1;\n"
+#~ "      }\n"
+#~ "      if (guess<number)\n"
+#~ "      {\n"
+#~ "         smallest = guess + 1;\n"
+#~ "      }\n"
+#~ "      if (guess == number)\n"
+#~ "      {\n"
+#~ "         FacesContext.getCurrentInstance().addMessage(null, new "
+#~ "FacesMessage(\"Correct!\"));\n"
+#~ "      }\n"
+#~ "      remainingGuesses--;\n"
+#~ "      return null;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @PostConstruct\n"
+#~ "   public void reset()\n"
+#~ "   {\n"
+#~ "      this.smallest = 0;\n"
+#~ "      this.guess = 0;\n"
+#~ "      this.remainingGuesses = 10;\n"
+#~ "      this.number = manager.getInstanceByType(Integer.class, new "
+#~ "AnnotationLiteral<Random>(){});\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "}]]>"
+
+#~ msgid "The numberguess example for Tomcat"
+#~ msgstr "猜数字例子"
+
+#~ msgid ""
+#~ "The numberguess for Tomcat differs in a couple of ways. Firstly, Web "
+#~ "Beans should be deployed as a Web Application library in <literal>WEB-INF/"
+#~ "lib</literal>. For your convenience we provide a single jar suitable for "
+#~ "running Web Beans on Tomcat <literal>webbeans-tomcat.jar</literal>."
+#~ msgstr ""
+#~ "在Tomcat中部署猜数字应用有很多地方不同。首先,WebBean应该作为一个Web应用库"
+#~ "文件,部署在<literal>WEB-INF/lib</literal>目录中。为方便起见,我们提供了一"
+#~ "个单一的jar库 <literal>webbeans-tomcat.jar</literal>,能够让我们在Tomcat中"
+#~ "运行Web Bean。"
+
+#~ msgid ""
+#~ "Of course, you must also include JSF and EL, as well common annotations "
+#~ "(<literal>jsr250-api.jar</literal>) which a JEE server includes by "
+#~ "default."
+#~ msgstr ""
+#~ "当然,你必须也要包含JSF和EL, 以及通用的注释(<literal>jsr250-api.jar</"
+#~ "literal>),这些都是一个Java EE服务器默认应该包含的。 "
+
+#~ msgid ""
+#~ "Secondly, we need to explicitly specify the Tomcat servlet listener (used "
+#~ "to boot Web Beans, and control it's interaction with requests) in "
+#~ "<literal>web.xml</literal>:"
+#~ msgstr ""
+#~ "第二,我们需要在<literal>web.xml</literal>中显式地指定Tomcat的Servlet监听"
+#~ "器(用来启动Web Bean,并且控制其与请求的交互):"
+
+#~ msgid ""
+#~ "<![CDATA[<listener>\n"
+#~ "   <listener-class>org.jboss.webbeans.environment.tomcat.Listener</"
+#~ "listener-class>\n"
+#~ "</listener>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<listener>\n"
+#~ "   <listener-class>org.jboss.webbeans.environment.tomcat.Listener</"
+#~ "listener-class>\n"
+#~ "</listener>]]>"
+
+#~ msgid "The translator example"
+#~ msgstr "翻译器例子"
+
+#~ msgid ""
+#~ "The translator example will take any sentences you enter, and translate "
+#~ "them to Latin."
+#~ msgstr "翻译器例子能够将你输入的句子翻译为拉丁文。"
+
+#~ msgid ""
+#~ "The translator example is built as an ear, and contains EJBs. As a "
+#~ "result, it's structure is more complex than the numberguess example."
+#~ msgstr ""
+#~ "翻译器例子是一个EAR应用,包含EJBs和企业Beans。因此,它的结构比猜数字例子复"
+#~ "杂。"
+
+#~ msgid ""
+#~ "EJB 3.1 and Jave EE 6 allow you to package EJBs in a war, which will make "
+#~ "this structure much simpler!"
+#~ msgstr "EJB3.1和Java EE 6允许你在WAR包中打包EJBs, 这将让这个结构更加简单!"
+
+#~ msgid ""
+#~ "First, let's take a look at the ear aggregator, which is located in "
+#~ "<literal>webbeans-translator-ear</literal> module. Maven automatically "
+#~ "generates the <literal>application.xml</literal> for us:"
+#~ msgstr ""
+#~ "首先,让我们看一下EAR聚合器,它位于<literal>webbeans-translator-ear</"
+#~ "literal>模块下。Maven将为我们自动生成<literal>application.xml</literal>和"
+#~ "<literal>jboss-app.xml</literal>文件:"
+
+#~ msgid ""
+#~ "<![CDATA[<plugin>\n"
+#~ "   <groupId>org.apache.maven.plugins</groupId>\n"
+#~ "   <artifactId>maven-ear-plugin</artifactId>\n"
+#~ "   <configuration>\n"
+#~ "      <modules>\n"
+#~ "         <webModule>\n"
+#~ "            <groupId>org.jboss.webbeans.examples.translator</groupId>\n"
+#~ "            <artifactId>webbeans-translator-war</artifactId>\n"
+#~ "            <contextRoot>/webbeans-translator</contextRoot>\n"
+#~ "         </webModule>\n"
+#~ "      </modules>\n"
+#~ "   </configuration>\n"
+#~ "</plugin>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<plugin>\n"
+#~ "   <groupId>org.apache.maven.plugins</groupId>\n"
+#~ "   <artifactId>maven-ear-plugin</artifactId>\n"
+#~ "   <configuration>\n"
+#~ "      <modules>\n"
+#~ "         <webModule>\n"
+#~ "            <groupId>org.jboss.webbeans.examples.translator</groupId>\n"
+#~ "            <artifactId>webbeans-translator-war</artifactId>\n"
+#~ "            <contextRoot>/webbeans-translator</contextRoot>\n"
+#~ "         </webModule>\n"
+#~ "      </modules>\n"
+#~ "      <jboss>\n"
+#~ "         <loader-repository>webbeans.jboss.org:loader=webbeans-"
+#~ "translator</loader-repository>\n"
+#~ "      </jboss>\n"
+#~ "   </configuration>\n"
+#~ "</plugin>]]>"
+
+#~ msgid ""
+#~ "If you aren't using Maven to generate these files, you would need "
+#~ "<literal>META-INF/application.xml</literal>:"
+#~ msgstr ""
+#~ "如果你不使用Maven来生成这些文件,你将需要<literal>META-INF/jboss-app.xml</"
+#~ "literal>:"
+
+#~ msgid ""
+#~ "<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+#~ "<application xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
+#~ "             xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "             xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee "
+#~ "http://java.sun.com/xml/ns/javaee/application_5.xsd\"\n"
+#~ "             version=\"5\">\n"
+#~ "  <display-name>webbeans-translator-ear</display-name>\n"
+#~ "  <description>Ear Example for the reference implementation of JSR 299: "
+#~ "Web Beans</description>\n"
+#~ "  \n"
+#~ "  <module>\n"
+#~ "    <web>\n"
+#~ "      <web-uri>webbeans-translator.war</web-uri>\n"
+#~ "      <context-root>/webbeans-translator</context-root>\n"
+#~ "    </web>\n"
+#~ "  </module>\n"
+#~ "  <module>\n"
+#~ "    <ejb>webbeans-translator.jar</ejb>\n"
+#~ "  </module>\n"
+#~ "</application>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+#~ "<application xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
+#~ "             xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "             xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee "
+#~ "http://java.sun.com/xml/ns/javaee/application_5.xsd\"\n"
+#~ "             version=\"5\">\n"
+#~ "  <display-name>webbeans-translator-ear</display-name>\n"
+#~ "  <description>Ear Example for the reference implementation of JSR 299: "
+#~ "Web Beans</description>\n"
+#~ "  \n"
+#~ "  <module>\n"
+#~ "    <web>\n"
+#~ "      <web-uri>webbeans-translator.war</web-uri>\n"
+#~ "      <context-root>/webbeans-translator</context-root>\n"
+#~ "    </web>\n"
+#~ "  </module>\n"
+#~ "  <module>\n"
+#~ "    <ejb>webbeans-translator.jar</ejb>\n"
+#~ "  </module>\n"
+#~ "</application>]]>"
+
+#~ msgid ""
+#~ "Next, lets look at the war. Just as in the numberguess example, we have a "
+#~ "<literal>faces-config.xml</literal> (to enable Facelets) and a "
+#~ "<literal>web.xml</literal> (to enable JSF) in <literal>WebContent/WEB-"
+#~ "INF</literal>."
+#~ msgstr ""
+#~ "然后,我们看一下WAR包。在猜数字例子中,我们需要<literal>faces-config.xml</"
+#~ "literal>(配置Facelets)和一个位于<literal>WebContent/WEB-INF</literal>下"
+#~ "的<literal>web.xml</literal>(配置JSF并将Web Beans服务加入Servlet容器"
+#~ "中)。"
+
+#~ msgid ""
+#~ "More intersting is the facelet used to translate text. Just as in the "
+#~ "numberguess example we have a template, which surrounds the form "
+#~ "(ommitted here for brevity):"
+#~ msgstr ""
+#~ "更有意思的是用来翻译文本的facelet。在猜数字应用中我们有一个模板,这个模板"
+#~ "套着表单(省略了表单):"
+
+#~ msgid ""
+#~ "<![CDATA[<h:form id=\"NumberGuessMain\">\n"
+#~ "            \n"
+#~ "   <table>\n"
+#~ "      <tr align=\"center\" style=\"font-weight: bold\" >\n"
+#~ "         <td>\n"
+#~ "            Your text\n"
+#~ "         </td>\n"
+#~ "         <td>\n"
+#~ "            Translation\n"
+#~ "         </td>\n"
+#~ "      </tr>\n"
+#~ "      <tr>\n"
+#~ "         <td>\n"
+#~ "            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
+#~ "required=\"true\" rows=\"5\" cols=\"80\" />\n"
+#~ "         </td>\n"
+#~ "         <td>\n"
+#~ "            <h:outputText value=\"#{translator.translatedText}\" />\n"
+#~ "         </td>\n"
+#~ "      </tr>\n"
+#~ "   </table>\n"
+#~ "   <div>\n"
+#~ "      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
+#~ "{translator.translate}\"/>\n"
+#~ "   </div>\n"
+#~ "   \n"
+#~ "</h:form>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<h:form id=\"NumberGuessMain\">\n"
+#~ "            \n"
+#~ "   <table>\n"
+#~ "      <tr align=\"center\" style=\"font-weight: bold\" >\n"
+#~ "         <td>\n"
+#~ "            Your text\n"
+#~ "         </td>\n"
+#~ "         <td>\n"
+#~ "            Translation\n"
+#~ "         </td>\n"
+#~ "      </tr>\n"
+#~ "      <tr>\n"
+#~ "         <td>\n"
+#~ "            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
+#~ "required=\"true\" rows=\"5\" cols=\"80\" />\n"
+#~ "         </td>\n"
+#~ "         <td>\n"
+#~ "            <h:outputText value=\"#{translator.translatedText}\" />\n"
+#~ "         </td>\n"
+#~ "      </tr>\n"
+#~ "   </table>\n"
+#~ "   <div>\n"
+#~ "      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
+#~ "{translator.translate}\"/>\n"
+#~ "   </div>\n"
+#~ "   \n"
+#~ "</h:form>]]>"
+
+#~ msgid ""
+#~ "The user can enter some text in the lefthand textarea, and hit the "
+#~ "translate button to see the result to the right."
+#~ msgstr ""
+#~ "用户可以在左手边的文本区输入一些文本,点击翻译按钮查看右边的翻译结果。"
+
+#~ msgid ""
+#~ "Finally, let's look at the ejb module, <literal>webbeans-translator-ejb</"
+#~ "literal>. In <literal>src/main/resources/META-INF</literal> there is just "
+#~ "an empty <literal>web-beans.xml</literal>, used to mark the archive as "
+#~ "containing Web Beans."
+#~ msgstr ""
+#~ "最后,我们看一下EJB模块,<literal>webbeans-translator-ejb</literal>。在"
+#~ "<literal>src/main/resources/META-INF</literal>下有两个配置文件,一个是空的"
+#~ "<literal>web-beans.xml</literal>,用来标识这个档案包包含Web Beans,一个是"
+#~ "<literal>ejb-jar.xml</literal>。Web Beans为所有的EJB提供注入和初始化服务,"
+#~ "使用<literal>ejb-jar.xml</literal>文件来配置。你将在使用Web Beans的EJB项目"
+#~ "中需要这些配置:"
+
+#~ msgid ""
+#~ "We've saved the most interesting bit to last, the code! The project has "
+#~ "two simple beans, <literal>SentenceParser</literal> and "
+#~ "<literal>TextTranslator</literal> and two enterprise beans, "
+#~ "<literal>TranslatorControllerBean</literal> and "
+#~ "<literal>SentenceTranslator</literal>. You should be getting quite "
+#~ "familiar with what a Web Bean looks like by now, so we'll just highlight "
+#~ "the most interesting bits here."
+#~ msgstr ""
+#~ "我们将最有意思的部分放在最后,那就是代码!这个例子有两个简单Beans, "
+#~ "<literal>SentanceParser</literal>和<literal>TextTranslator</literal>,还有"
+#~ "两个企业Beans,<literal>TanslatorControllerBean</literal>和"
+#~ "<literal>SentenceTranslator</literal>。现在你应该对Web Beans有点熟悉了,我"
+#~ "们在这里着重最有意思的部分。"
+
+#~ msgid ""
+#~ "Both <literal>SentenceParser</literal> and <literal>TextTranslator</"
+#~ "literal> are dependent beans, and <literal>TextTranslator</literal> uses "
+#~ "constructor initialization:"
+#~ msgstr ""
+#~ "<literal>SentanceParser</literal>和<literal>TextTranslator</literal>是相互"
+#~ "依赖的Beans,<literal>TextTranslator</literal>使用构造器初始化:"
+
+#~ msgid ""
+#~ "<![CDATA[public class TextTranslator { \n"
+#~ "   private SentenceParser sentenceParser; \n"
+#~ "   private Translator sentenceTranslator; \n"
+#~ "   \n"
+#~ "   @Initializer\n"
+#~ "   TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) \n"
+#~ "   { \n"
+#~ "      this.sentenceParser = sentenceParser; \n"
+#~ "      this.sentenceTranslator = sentenceTranslator;]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TextTranslator { \n"
+#~ "   private SentenceParser sentenceParser; \n"
+#~ "   private Translator sentenceTranslator; \n"
+#~ "   \n"
+#~ "   @Initializer\n"
+#~ "   TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) \n"
+#~ "   { \n"
+#~ "      this.sentenceParser = sentenceParser; \n"
+#~ "      this.sentenceTranslator = sentenceTranslator;]]>"
+
+#~ msgid ""
+#~ "<literal>TextTranslator</literal> is a stateless bean (with a local "
+#~ "business interface), where the magic happens - of course, we couldn't "
+#~ "develop a full translator, but we gave it a good go!"
+#~ msgstr ""
+#~ "<literal>TextTranslator</literal>是一个无状态Bean(拥有一个本地业务接"
+#~ "口),这里是魔术展现的地方-当然,我们不会开发一个完整的翻译器,但我们可以"
+#~ "开发一个不错的小玩意!"
+
+#~ msgid ""
+#~ "Finally, there is UI orientated controller, that collects the text from "
+#~ "the user, and dispatches it to the translator. This is a request scoped, "
+#~ "named, stateful session bean, which injects the translator."
+#~ msgstr ""
+#~ "最后,这里又要一个面向UI的控制器,从用户输入处搜集文本,转发给翻译器。这个"
+#~ "控制器是请求范围的,具名的,有状态的会话Bean,它可以将翻译器注入进来。"
+
+#~ msgid ""
+#~ "<![CDATA[@Stateful\n"
+#~ "@RequestScoped\n"
+#~ "@Named(\"translator\")\n"
+#~ "public class TranslatorControllerBean implements TranslatorController\n"
+#~ "{\n"
+#~ "   \n"
+#~ "   @Current TextTranslator translator;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateful\n"
+#~ "@RequestScoped\n"
+#~ "@Named(\"translator\")\n"
+#~ "public class TranslatorControllerBean implements TranslatorController\n"
+#~ "{\n"
+#~ "   \n"
+#~ "   @Current TextTranslator translator;]]>"
+
+#~ msgid ""
+#~ "The bean also has getters and setters for all the fields on the page."
+#~ msgstr "这个Bean也拥有页面上所有域的getter和setter方法。"
+
+#~ msgid "As this is a stateful session bean, we have to have a remove method:"
+#~ msgstr "这个Bean是有状态会话Bean,我们需要有一个remove方法:"
+
+#~ msgid ""
+#~ "<![CDATA[   @Remove\n"
+#~ "   public void remove()\n"
+#~ "   {\n"
+#~ "      \n"
+#~ "   }]]>"
+#~ msgstr ""
+#~ "<![CDATA[   @Remove\n"
+#~ "   public void remove()\n"
+#~ "   {\n"
+#~ "      \n"
+#~ "   }]]>"
+
+#~ msgid ""
+#~ "The Web Beans manager will call the remove method for you when the bean "
+#~ "is destroyed; in this case at the end of the request."
+#~ msgstr ""
+#~ "Web Beans管理器在这个bean销毁的时候调用remove方法;在这个例子中是请求结束"
+#~ "的时候。"
+
+#~ msgid ""
+#~ "That concludes our short tour of the Web Beans examples. For more on Web "
+#~ "Beans , or to help out, please visit <ulink url=\"http://www."
+#~ "seamframework.org/WebBeans/Development\">http://www.seamframework.org/"
+#~ "WebBeans/Development</ulink>."
+#~ msgstr ""
+#~ "Web Beans参考实现的例子到此结束。想要获得关于参考实现更多的知识或者帮助,"
+#~ "请访问<ulink url=\"http://www.seamframework.org/WebBeans/Development"
+#~ "\">http://www.seamframework.org/WebBeans/Development</ulink>。"
+
+#~ msgid ""
+#~ "We need help in all areas - bug fixing, writing new features, writing "
+#~ "examples and translating this reference guide."
+#~ msgstr ""
+#~ "我们在各个方面都需要帮助-bug修复,新特性开发,例子开发和参考指南的翻译等"
+#~ "等。"
+
 #, fuzzy
 #~ msgid ""
 #~ "A new deployer, <literal>webbeans.deployer</literal> is added to JBoss "
@@ -1266,8 +1904,7 @@
 #~ "deployer</literal>。这个部署器提供JBoss AS对Web Bean档案包的支持,能够让"
 #~ "Web Beans参考实现查询EJB3容器,发现应用中安装的EJB。第二,需要更新JBoss "
 #~ "EJB3。"
-#~ msgid "Web Beans is bundled with JBoss AS 5.1 and above."
-#~ msgstr "JBoss AS 5.1版本及以上捆绑了Web Bean。"
+
 #~ msgid ""
 #~ "As Web Beans is a new piece of software, you need to update JBoss AS to "
 #~ "run the Web Beans RI. Future versions of JBoss AS will include these "
@@ -1275,6 +1912,7 @@
 #~ msgstr ""
 #~ "因为Web Beans是新的软件,你需要更新JBoss AS来运行Web Beans的参考实现。"
 #~ "JBoss AS未来的版本将包括这些更新,这些步骤将不再是必须的。"
+
 #~ msgid ""
 #~ "The final Web Bean in the application is the session scoped "
 #~ "<literal>Game</literal>. By making <literal>Game</literal> session "
@@ -1284,6 +1922,7 @@
 #~ "最后,应用的Web Bean是会话范围的 <literal>Game</literal>。通过将 "
 #~ "<literal>Game</literal>的范围设为会话范围,你可以为每个浏览器会话启动一个"
 #~ "猜数字游戏。你可以简单地添加一个复位按钮-对于读者来说是一个很好的练习 :)"
+
 #~ msgid ""
 #~ "<![CDATA[@Named\n"
 #~ "@SessionScoped\n"
@@ -1362,6 +2001,7 @@
 #~ "   }\n"
 #~ "   \n"
 #~ "}]]>"
+
 #~ msgid ""
 #~ "<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 #~ "<!DOCTYPE jboss-app\n"
@@ -1380,8 +2020,10 @@
 #~ "  <loader-repository>webbeans.jboss.org:loader=webbeans-translator</"
 #~ "loader-repository>\n"
 #~ "</jboss-app>]]>"
+
 #~ msgid "and <literal>META-INF/application.xml</literal>:"
 #~ msgstr "和 <literal>META-INF/application.xml</literal>:"
+
 #~ msgid ""
 #~ "<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 #~ "<ejb-jar xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
@@ -1430,4 +2072,3 @@
 #~ "   </assembly-descriptor>\n"
 #~ "   \n"
 #~ "</ejb-jar>]]>"
-

Modified: doc/trunk/reference/zh-CN/injection.po
===================================================================
--- doc/trunk/reference/zh-CN/injection.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/injection.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-13 10:08+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,28 +14,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: injection.xml:4
 #, fuzzy, no-c-format
 msgid "Dependency injection and programmatic lookup"
 msgstr "依赖注入"
 
 #. Tag: para
-#: injection.xml:6
 #, no-c-format
 msgid ""
-"One of the most significant features of CDI&#8212;certainly the most "
-"recognized&#8212;is dependency injection; excuse me, <emphasis>typesafe</"
-"emphasis> dependency injection."
+"One of the most significant features of CDI—certainly the most recognized—is "
+"dependency injection; excuse me, <emphasis>typesafe</emphasis> dependency "
+"injection."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:12
 #, no-c-format
 msgid "Injection points"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:14
 #, no-c-format
 msgid ""
 "The <literal>@Inject</literal> annotation lets us define an injection point "
@@ -44,77 +40,21 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:19
 #, fuzzy, no-c-format
 msgid "<emphasis>Bean constructor</emphasis> parameter injection:"
 msgstr "<emphasis>初始化</emphasis> 方法参数注入:"
 
-#. Tag: programlisting
-#: injection.xml:23
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private final ShoppingCart cart;\n"
-"    \n"
-"   @Inject\n"
-"   public Checkout(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"    private final ShoppingCart cart;\n"
-"    \n"
-"    @Initializer\n"
-"    public Checkout(ShoppingCart cart) {\n"
-"        this.cart = cart;\n"
-"    }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:26
 #, no-c-format
 msgid "A bean can only have one injectable constructor."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:31
 #, fuzzy, no-c-format
 msgid "<emphasis>Initializer method</emphasis> parameter injection:"
 msgstr "<emphasis>初始化</emphasis> 方法参数注入:"
 
-#. Tag: programlisting
-#: injection.xml:35
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private ShoppingCart cart;\n"
-"\n"
-"   @Inject\n"
-"   void setShoppingCart(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"    private ShoppingCart cart;\n"
-"\n"
-"    @Initializer \n"
-"    void setShoppingCart(ShoppingCart cart) {\n"
-"        this.cart = cart;\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:38
 #, no-c-format
 msgid ""
 "A bean can have multiple initializer methods. If the bean is a session bean, "
@@ -123,29 +63,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:44
 #, no-c-format
 msgid "And direct field injection:"
 msgstr "和直接的域注入:"
 
-#. Tag: programlisting
-#: injection.xml:48
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"   private @Inject ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"    private @Current ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:51
 #, no-c-format
 msgid ""
 "Getter and setter methods are not required for field injection to work "
@@ -153,7 +75,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:56
 #, fuzzy, no-c-format
 msgid ""
 "Dependency injection always occurs when the bean instance is first "
@@ -162,7 +83,6 @@
 msgstr "当Web Bean实例被首次初始化时,依赖注入总是随之发生。"
 
 #. Tag: para
-#: injection.xml:63
 #, fuzzy, no-c-format
 msgid ""
 "First, the container calls the bean constructor (the default constructor or "
@@ -171,7 +91,6 @@
 msgstr "首先,Web Bean管理器调用Web Bean构造器来获得一个Web Bean的实例。"
 
 #. Tag: para
-#: injection.xml:69
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container initializes the values of all injected fields of the "
@@ -179,7 +98,6 @@
 msgstr "接下来,Web Bean管理器初始化这个Web bean的所有注入域的值。"
 
 #. Tag: para
-#: injection.xml:74
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container calls all initializer methods of bean (the call order is "
@@ -187,7 +105,6 @@
 msgstr "然后,Web Bean管理器调用这个Web Bean的初始化方法。"
 
 #. Tag: para
-#: injection.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "Finally, the <literal>@PostConstruct</literal> method, if any, is called."
@@ -195,7 +112,6 @@
 "最后, 如果有 <literal>@PostConstruct</literal> 方法的话,调用这个方法。"
 
 #. Tag: para
-#: injection.xml:86
 #, no-c-format
 msgid ""
 "(The only complication is that the container might call initializer methods "
@@ -204,7 +120,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:90
 #, no-c-format
 msgid ""
 "One major advantage of constructor injection is that it allows the bean to "
@@ -212,7 +127,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:95
 #, no-c-format
 msgid ""
 "CDI also supports parameter injection for some other methods that are "
@@ -220,36 +134,21 @@
 "producer methods:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:100
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:102
 #, no-c-format
 msgid ""
 "This is a case where the <literal>@Inject</literal> annotation <emphasis>is "
 "not</emphasis> required at the injection point. The same is true for "
-"observer methods (which we'll meet in <xref linkend=\"events\"/>) and "
+"observer methods (which we'll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:110
 #, no-c-format
 msgid "What gets injected"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:112
 #, fuzzy, no-c-format
 msgid ""
 "The CDI specification defines a procedure, called <emphasis>typesafe "
@@ -268,7 +167,6 @@
 "<literal>AmbiguousDependencyException</literal> 异常。"
 
 #. Tag: para
-#: injection.xml:120
 #, fuzzy, no-c-format
 msgid ""
 "The purpose of this algorithm is to allow multiple beans to implement the "
@@ -276,7 +174,6 @@
 msgstr "这个算法的目的是允许多个Web Beans实现相同的API类型,并且:"
 
 #. Tag: para
-#: injection.xml:126
 #, fuzzy, no-c-format
 msgid ""
 "allow the client to select which implementation it requires using a "
@@ -284,7 +181,6 @@
 msgstr "允许客户通过 <emphasis>绑定注释</emphasis> 选择它需要的具体实现,"
 
 #. Tag: para
-#: injection.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "allow the application deployer to select which implementation is appropriate "
@@ -295,13 +191,11 @@
 "署环境下选择适当的具体实现,而无需修改客户,或者"
 
 #. Tag: para
-#: injection.xml:137
 #, no-c-format
 msgid "allow the beans to be isolated into separate modules."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:143
 #, no-c-format
 msgid ""
 "Obviously, if you have exactly one bean of a given type, and an injection "
@@ -311,7 +205,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:149
 #, no-c-format
 msgid ""
 "But then, things start to get complicated. Let's explore how the container "
@@ -320,13 +213,11 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:157
 #, fuzzy, no-c-format
 msgid "Qualifier annotations"
 msgstr "绑定注释"
 
 #. Tag: para
-#: injection.xml:159
 #, fuzzy, no-c-format
 msgid ""
 "If we have more than one bean that implements a particular bean type, the "
@@ -338,36 +229,7 @@
 "入点注入哪个Web Bean。例如,我们可能有两个 <literal>PaymentProcessor</"
 "literal> 的实现:"
 
-#. Tag: programlisting
-#: injection.xml:165
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Synchronous\n"
-"public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: injection.xml:167
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Asynchronous\n"
-"public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:169
 #, fuzzy, no-c-format
 msgid ""
 "Where <literal>@Synchronous</literal> and <literal>@Asynchronous</literal> "
@@ -376,36 +238,7 @@
 "其中 <literal>@PayByCheque</literal> 和 <literal>@PayByCreditCard</literal> "
 "是绑定注释:"
 
-#. Tag: programlisting
-#: injection.xml:173
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Synchronous {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayByCheque {}]]>"
-
-#. Tag: programlisting
-#: injection.xml:175
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Asynchronous {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayByCheque {}]]>"
-
 #. Tag: para
-#: injection.xml:177
 #, fuzzy, no-c-format
 msgid ""
 "A client bean developer uses the qualifier annotation to specify exactly "
@@ -413,76 +246,21 @@
 msgstr "一个客户Web Bean开发者使用绑定注释来指定到底哪个Web Bean应该被注入。"
 
 #. Tag: para
-#: injection.xml:181
 #, no-c-format
 msgid "Using field injection:"
 msgstr "使用域注入:"
 
-#. Tag: programlisting
-#: injection.xml:183
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
-"@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@PayByCheque PaymentProcessor chequePaymentProcessor;\n"
-"@PayByCreditCard PaymentProcessor creditCardPaymentProcessor;]]>"
-
 #. Tag: para
-#: injection.xml:185
 #, no-c-format
 msgid "Using initializer method injection:"
 msgstr "使用初始化方法注入:"
 
-#. Tag: programlisting
-#: injection.xml:187
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public void setPaymentProcessors(@Synchronous PaymentProcessor "
-"syncPaymentProcessor, \n"
-"                                 @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public void setPaymentProcessors(@PayByCheque PaymentProcessor "
-"chequePaymentProcessor, \n"
-"                                 @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:189
 #, fuzzy, no-c-format
 msgid "Using constructor injection:"
 msgstr "或者使用构造器注入:"
 
-#. Tag: programlisting
-#: injection.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
-"                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public Checkout(@PayByCheque PaymentProcessor chequePaymentProcessor, \n"
-"                @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:193
 #, no-c-format
 msgid ""
 "Qualifier annotations can also qualify method arguments of producer, "
@@ -491,29 +269,7 @@
 "runtime based on the state of the system:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:199
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces\n"
-"PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
-"syncPaymentProcessor,\n"
-"                                     @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   return isSynchronous() ? syncPaymentProcessor : asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public void setPaymentProcessors(@PayByCheque PaymentProcessor "
-"chequePaymentProcessor, \n"
-"                                 @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:201
 #, no-c-format
 msgid ""
 "If an injected field or a parameter of a bean constructor or initializer "
@@ -522,7 +278,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:206
 #, no-c-format
 msgid ""
 "Now, you may be thinking, <emphasis>\"What's the different between using a "
@@ -534,7 +289,6 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:216
 #, fuzzy, no-c-format
 msgid ""
 "The built-in qualifiers <literal>@Default</literal> and <literal>@Any</"
@@ -544,7 +298,6 @@
 "<literal>@PreDestroy</literal> 回调。"
 
 #. Tag: para
-#: injection.xml:218
 #, no-c-format
 msgid ""
 "Whenever a bean or injection point does not explicitly declare a qualifier, "
@@ -557,33 +310,18 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:225
 #, no-c-format
 msgid ""
 "This is especially useful if you want to iterate over all beans with a "
 "certain bean type. For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:226
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject \n"
-"void initServices(@Any Instance<Service> services) { \n"
-"   for (Service service: services) {\n"
-"      service.init();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:232
 #, no-c-format
 msgid "Qualifiers with members"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:234
 #, no-c-format
 msgid ""
 "Java annotations can have members. We can use annotation members to further "
@@ -593,41 +331,13 @@
 "single annotation with a member:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:240
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayBy {\n"
-"    PaymentType value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:242
 #, no-c-format
 msgid ""
 "Then we select one of the possible member values when appling the qualifier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:246
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:248
 #, fuzzy, no-c-format
 msgid ""
 "We can force the container to ignore a member of a qualifier type by "
@@ -636,48 +346,17 @@
 "你可以告诉Web Bean管理器忽略一个绑定注释的成员,只需在这个成员上使用 "
 "<literal>@NonBinding</literal> 注释。"
 
-#. Tag: programlisting
-#: injection.xml:253
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"   @Nonbinding String comment() default \"\";\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @NonBinding public String value();\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:258
 #, no-c-format
 msgid "Multiple qualifiers"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:260
 #, fuzzy, no-c-format
 msgid "An injection point may specify multiple qualifiers:"
 msgstr "一个注入点甚至可以指定多个绑定注释:"
 
-#. Tag: programlisting
-#: injection.xml:264
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
-"syncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:266
 #, fuzzy, no-c-format
 msgid ""
 "Then only a bean which has <emphasis>both</emphasis> qualifier annotations "
@@ -686,29 +365,12 @@
 "在这个情况下,只有<emphasis>拥有两个</emphasis>绑定注释的Web Bean才有资格被注"
 "入。"
 
-#. Tag: programlisting
-#: injection.xml:271
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Synchronous @Reliable\n"
-"public class SynchronousReliablePaymentProcessor implements PaymentProcessor "
-"{\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:276
 #, no-c-format
 msgid "Alternatives"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:278
 #, no-c-format
 msgid ""
 "Alternatives are beans whose implementation is specific to a particular "
@@ -717,22 +379,7 @@
 "<literal>@Asynchronous PaymentProcessor</literal>, all in one:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:282
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Synchronous @Asynchronous\n"
-"public class MockPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:284
 #, no-c-format
 msgid ""
 "By default, <literal>@Alternative</literal> beans are disabled. We need to "
@@ -741,24 +388,7 @@
 "and injection. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:290
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <class>org.mycompany.mock.MockPaymentProcessor</class>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:292
 #, no-c-format
 msgid ""
 "When an ambiguous dependency exists at an injection point, the container "
@@ -768,13 +398,11 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:301
 #, fuzzy, no-c-format
 msgid "Fixing unsatisfied and ambiguous dependencies"
 msgstr "修正没有满足条件的依赖"
 
 #. Tag: para
-#: injection.xml:303
 #, fuzzy, no-c-format
 msgid ""
 "The typesafe resolution algorithm fails when, after considering the "
@@ -788,7 +416,6 @@
 "法失败,那么Web Bean管理器无法识别究竟应该注入哪个Web Bean。"
 
 #. Tag: para
-#: injection.xml:310
 #, no-c-format
 msgid ""
 "During the course of your development, you're going to encounter this "
@@ -796,13 +423,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:314
 #, no-c-format
 msgid "To fix an <emphasis>unsatisfied dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:320
 #, no-c-format
 msgid ""
 "create a bean which implements the bean type and has all the qualifier types "
@@ -810,7 +435,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:325
 #, no-c-format
 msgid ""
 "make sure that the bean you already have is in the classpath of the module "
@@ -818,7 +442,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:330
 #, no-c-format
 msgid ""
 "explicitly enable an <literal>@Alternative</literal> bean that implements "
@@ -827,13 +450,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:337
 #, no-c-format
 msgid "To fix an <emphasis>ambiguous dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:343
 #, no-c-format
 msgid ""
 "introduce a qualifier to distinguish between the two implementations of the "
@@ -841,14 +462,12 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:348
 #, no-c-format
 msgid ""
 "disable one of the beans by annotating it <literal>@Alternative</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:353
 #, no-c-format
 msgid ""
 "move one of the implementations to a module that is not in the classpath of "
@@ -856,7 +475,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:359
 #, no-c-format
 msgid ""
 "disable one of two <literal>@Alternative</literal> beans that are trying to "
@@ -864,7 +482,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:366
 #, no-c-format
 msgid ""
 "See <ulink url=\"http://sfwk.org/Documentation/"
@@ -875,22 +492,19 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:374
 #, no-c-format
 msgid "Just remember: \"There can be only one.\""
 msgstr ""
 
 #. Tag: para
-#: injection.xml:377
 #, no-c-format
 msgid ""
 "On the other hand, if you really do have an optional or multivalued "
 "injection point, you should change the type of your injection point to "
-"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\"/>."
+"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:382
 #, fuzzy, no-c-format
 msgid ""
 "Now there's one more issue you need to be aware of when using the dependency "
@@ -898,13 +512,11 @@
 msgstr "使用Web Bean依赖注入的时候还需要注意一个问题。"
 
 #. Tag: title
-#: injection.xml:389
 #, no-c-format
 msgid "Client proxies"
 msgstr "客户代理"
 
 #. Tag: para
-#: injection.xml:391
 #, fuzzy, no-c-format
 msgid ""
 "Clients of an injected bean do not usually hold a direct reference to a bean "
@@ -913,20 +525,18 @@
 msgstr "注入的Web Bean的客户通常不会直接拥有这个Web bean实例的引用。"
 
 #. Tag: para
-#: injection.xml:396
 #, fuzzy, no-c-format
 msgid ""
 "Imagine that a bean bound to the application scope held a direct reference "
 "to a bean bound to the request scope. The application-scoped bean is shared "
 "between many different requests. However, each request should see a "
-"different instance of the request scoped bean&#8212;the current one!"
+"different instance of the request scoped bean—the current one!"
 msgstr ""
 "想象一下如果一个应用范围的Web Bean能够拥有一个请求范围的Web Bean的直接引用。"
 "应用范围的Web Bean是被很多不同的请求共享的。但是不同的请求应该看到不同的请求"
 "范围的Web Bean实例!"
 
 #. Tag: para
-#: injection.xml:402
 #, fuzzy, no-c-format
 msgid ""
 "Now imagine that a bean bound to the session scope holds a direct reference "
@@ -941,7 +551,6 @@
 "和会话范围的Web Bean一起被序列化!"
 
 #. Tag: para
-#: injection.xml:409
 #, fuzzy, no-c-format
 msgid ""
 "Therefore, unless a bean has the default scope <literal>@Dependent</"
@@ -960,7 +569,6 @@
 "归地序列化注入到这个Web Bean中的其他的Web Bean。"
 
 #. Tag: para
-#: injection.xml:417
 #, fuzzy, no-c-format
 msgid ""
 "Unfortunately, due to limitations of the Java language, some Java types "
@@ -974,20 +582,17 @@
 "<literal>UnproxyableDependencyException</literal> 异常。"
 
 #. Tag: para
-#: injection.xml:423
 #, fuzzy, no-c-format
 msgid "The following Java types cannot be proxied by the container:"
 msgstr "下面的Java类型无法被Web Bean管理器代理:"
 
 #. Tag: para
-#: injection.xml:427
 #, fuzzy, no-c-format
 msgid ""
 "classes which don't have a non-private constructor with no parameters, and"
 msgstr "没有无参非私有构造器的类,以及"
 
 #. Tag: para
-#: injection.xml:430
 #, no-c-format
 msgid ""
 "classes which are declared <literal>final</literal> or have a "
@@ -997,13 +602,11 @@
 "类,"
 
 #. Tag: para
-#: injection.xml:435
 #, no-c-format
 msgid "arrays and primitive types."
 msgstr "数组和原始类型。"
 
 #. Tag: para
-#: injection.xml:439
 #, no-c-format
 msgid ""
 "It's usually very easy to fix an unproxyable dependency problem. If an "
@@ -1012,13 +615,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:446
 #, no-c-format
 msgid "add a constructor with no parameters to <literal>X</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:451
 #, no-c-format
 msgid ""
 "change the type of the injection point to <literal>Instance&lt;X&gt;</"
@@ -1026,7 +627,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:456
 #, no-c-format
 msgid ""
 "introduce an interface <literal>Y</literal>, implemented by the injected "
@@ -1034,7 +634,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:462
 #, no-c-format
 msgid ""
 "if all else fails, change the scope of the injected bean to "
@@ -1042,7 +641,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:469
 #, no-c-format
 msgid ""
 "A future release of Weld will likely support a non-standard workaround for "
@@ -1050,7 +648,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:476
 #, no-c-format
 msgid ""
 "Sun, IcedTea, Mac: <literal>Unsafe.allocateInstance()</literal> (The most "
@@ -1058,7 +655,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:481
 #, no-c-format
 msgid ""
 "IBM, JRockit: <literal>ReflectionFactory.newConstructorForSerialization()</"
@@ -1066,19 +662,16 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:487
 #, no-c-format
 msgid "But we didn't get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:496
 #, fuzzy, no-c-format
 msgid "Obtaining a contextual instance by programmatic lookup"
 msgstr "通过编程查找获得一个Web Bean"
 
 #. Tag: para
-#: injection.xml:498
 #, no-c-format
 msgid ""
 "In certain situations, injection is not the most convenient way to obtain a "
@@ -1086,13 +679,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:505
 #, no-c-format
 msgid "the bean type or qualifiers vary dynamically at runtime, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:510
 #, no-c-format
 msgid ""
 "depending upon the deployment, there may be no bean which satisfies the type "
@@ -1100,27 +691,18 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:515
 #, no-c-format
 msgid "we would like to iterate over all beans of a certain type."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:521
 #, fuzzy, no-c-format
 msgid ""
 "In these situations, the application may obtain an instance of the interface "
 "<literal>Instance</literal>, parameterized for the bean type, by injection:"
 msgstr "应用可以通过注入获得一个 <literal>Manager</literal> 接口实例:"
 
-#. Tag: programlisting
-#: injection.xml:526
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:528
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>get()</literal> method of <literal>Instance</literal> produces "
@@ -1129,26 +711,17 @@
 "<literal>@Mock</literal> 和 <literal>@Staging</literal> 是为测试准备的部署类"
 "型"
 
-#. Tag: programlisting
-#: injection.xml:532
-#, fuzzy, no-c-format
-msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:534
 #, no-c-format
 msgid "Qualifiers can be specified in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:540
 #, no-c-format
 msgid "by annotating the <literal>Instance</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:543
 #, fuzzy, no-c-format
 msgid ""
 "by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
@@ -1158,22 +731,11 @@
 "<literal>@PreDestroy</literal> 回调。"
 
 #. Tag: para
-#: injection.xml:547
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is much, much easier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:551
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
-"paymentProcessorSource;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:553
 #, no-c-format
 msgid ""
 "Now, the <literal>PaymentProcessor</literal> returned by <literal>get()</"
@@ -1181,7 +743,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:558
 #, no-c-format
 msgid ""
 "Alternatively, we can specify the qualifier dynamically. First, we add the "
@@ -1189,15 +750,7 @@
 "default qualifier. (All beans have the qualifier <literal>@Any</literal>.)"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:563
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:565
 #, no-c-format
 msgid ""
 "Next, we need to obtain an instance of our qualifier type. Since annotatons "
@@ -1207,68 +760,30 @@
 "subclassing the helper class <literal>AnnotationLiteral</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:572
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[abstract class AsynchronousQualifier\n"
-"extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
-msgstr ""
-"<![CDATA[abstract class CreditCardBinding \n"
-"    extends AnnotationLiteral<CreditCard> \n"
-"    implements CreditCard {}]]>"
-
 #. Tag: para
-#: injection.xml:574
 #, no-c-format
 msgid "In some cases, we can use an anonymous class:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:578
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
-"   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
-msgstr ""
-"<![CDATA[PaymentProcessor p = manager.getInstanceByType(PaymentProcessor."
-"class, \n"
-"                                               new "
-"AnnotationLiteral<CreditCard>(){});]]>"
-
 #. Tag: para
-#: injection.xml:581
 #, no-c-format
 msgid ""
 "We can't use an anonymous class to implement a qualifier type with members."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:586
 #, no-c-format
 msgid ""
 "Now, finally, we can pass the qualifier to the <literal>select()</literal> "
 "method of <literal>Instance</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:590
-#, no-c-format
-msgid ""
-"<![CDATA[Annotation qualifier = synchronously ?\n"
-"      new SynchronousQualifier() : new AsynchronousQualifier();\n"
-"PaymentProcessor p = anyPaymentProcessor.select(qualifier).get().process"
-"(payment);]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:595
 #, no-c-format
 msgid "The <literal>InjectionPoint</literal> object"
 msgstr " <literal>InjectionPoint</literal> 对象"
 
 #. Tag: para
-#: injection.xml:597
 #, fuzzy, no-c-format
 msgid ""
 "There are certain kinds of dependent objects (beans with scope "
@@ -1280,7 +795,6 @@
 "需要知道它们所注入的对象或者注入点的信息,以便能够实现其功能。例如:"
 
 #. Tag: para
-#: injection.xml:603
 #, no-c-format
 msgid ""
 "The log category for a <literal>Logger</literal> depends upon the class of "
@@ -1288,7 +802,6 @@
 msgstr "  <literal>Logger</literal>的日志分类取决于拥有它的类。"
 
 #. Tag: para
-#: injection.xml:607
 #, no-c-format
 msgid ""
 "Injection of a HTTP parameter or header value depends upon what parameter or "
@@ -1296,7 +809,6 @@
 msgstr "一个HTTP参数和报头值的注入取决于注入点指定的参数或者报头名称。"
 
 #. Tag: para
-#: injection.xml:611
 #, no-c-format
 msgid ""
 "Injection of the result of an EL expression evaluation depends upon the "
@@ -1304,7 +816,6 @@
 msgstr "表达式运算结果的注入取决于在注入点指定的表达式。"
 
 #. Tag: para
-#: injection.xml:616
 #, fuzzy, no-c-format
 msgid ""
 "A bean with scope <literal>@Dependent</literal> may inject an instance of "
@@ -1315,21 +826,13 @@
 "<literal>InjectionPoint</literal> 实例并且访问这个注入点相关的元数据。"
 
 #. Tag: para
-#: injection.xml:620
 #, no-c-format
 msgid ""
 "Let's look at an example. The following code is verbose, and vulnerable to "
 "refactoring problems:"
 msgstr "我们看一个例子。下面的代码很冗长脆弱,有重构问题:"
 
-#. Tag: programlisting
-#: injection.xml:623
-#, no-c-format
-msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-msgstr "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-
 #. Tag: para
-#: injection.xml:625
 #, no-c-format
 msgid ""
 "This clever little producer method lets you inject a JDK <literal>Logger</"
@@ -1338,114 +841,29 @@
 "这个生产者方法允许你注入一个JDK的 <literal>Logger</literal> ,没有显式的指定"
 "一个日志分类:"
 
-#. Tag: programlisting
-#: injection.xml:628
-#, no-c-format
-msgid ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:630
 #, no-c-format
 msgid "We can now write:"
 msgstr "我们现在可以编写:"
 
-#. Tag: programlisting
-#: injection.xml:632
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject Logger log;]]>"
-msgstr "<![CDATA[@Current Logger log;]]>"
-
 #. Tag: para
-#: injection.xml:634
 #, fuzzy, no-c-format
 msgid ""
 "Not convinced? Then here's a second example. To inject HTTP parameters, we "
 "need to define a qualifier type:"
 msgstr "没被说服?我们还有第二个例子。要注入HTTP参数,我们需要定一个绑定类型:"
 
-#. Tag: programlisting
-#: injection.xml:637
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @Nonbinding public String value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @NonBinding public String value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:639
 #, fuzzy, no-c-format
 msgid "We would use this qualifier type at injection points as follows:"
 msgstr "我们可以在注入点使用这个绑定类型:"
 
-#. Tag: programlisting
-#: injection.xml:641
-#, no-c-format
-msgid ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-msgstr ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-
 #. Tag: para
-#: injection.xml:643
 #, no-c-format
 msgid "The following producer method does the work:"
 msgstr "下面的生产方法能够完成这个工作:"
 
-#. Tag: programlisting
-#: injection.xml:645
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotated().getAnnotation(HttpParam."
-"class).value());\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotation(HttpParam.class).value"
-"());\n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:647
 #, fuzzy, no-c-format
 msgid ""
 "(Note that the <literal>value()</literal> member of the <literal>HttpParam</"
@@ -1456,7 +874,6 @@
 "Web Bean管理器忽略,因为它拥有 <literal>@NonBinding.</literal> 注释)"
 
 #. Tag: para
-#: injection.xml:650
 #, fuzzy, no-c-format
 msgid ""
 "The container provides a built-in bean that implements the "
@@ -1465,30 +882,395 @@
 "Web Bean管理器提供一个内置的实现 <literal>InjectionPoint</literal> 接口的Web "
 "Bean:"
 
-#. Tag: programlisting
-#: injection.xml:653
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Type getType();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Bean<?> getBean();\n"
-"   public Member getMember();\n"
-"   public Annotated getAnnotated();\n"
-"   public boolean isDelegate();\n"
-"   public boolean isTransient();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Object getInstance(); \n"
-"   public Bean<?> getBean(); \n"
-"   public Member getMember(): \n"
-"   public <T extends Annotation> T getAnnotation(Class<T> annotation); \n"
-"   public Set<T extends Annotation> getAnnotations(); \n"
-"}]]>"
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   public Checkout(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "    private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "    @Initializer\n"
+#~ "    public Checkout(ShoppingCart cart) {\n"
+#~ "        this.cart = cart;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "}]]>"
 
 #, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private ShoppingCart cart;\n"
+#~ "\n"
+#~ "   @Inject\n"
+#~ "   void setShoppingCart(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "    private ShoppingCart cart;\n"
+#~ "\n"
+#~ "    @Initializer \n"
+#~ "    void setShoppingCart(ShoppingCart cart) {\n"
+#~ "        this.cart = cart;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "   private @Inject ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "    private @Current ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Synchronous\n"
+#~ "public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Asynchronous\n"
+#~ "public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Synchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayByCheque {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Asynchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayByCheque {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
+#~ "@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque PaymentProcessor chequePaymentProcessor;\n"
+#~ "@PayByCreditCard PaymentProcessor creditCardPaymentProcessor;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public void setPaymentProcessors(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor, \n"
+#~ "                                 @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public void setPaymentProcessors(@PayByCheque PaymentProcessor "
+#~ "chequePaymentProcessor, \n"
+#~ "                                 @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
+#~ "                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public Checkout(@PayByCheque PaymentProcessor chequePaymentProcessor, \n"
+#~ "                @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces\n"
+#~ "PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor,\n"
+#~ "                                     @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   return isSynchronous() ? syncPaymentProcessor : "
+#~ "asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public void setPaymentProcessors(@PayByCheque PaymentProcessor "
+#~ "chequePaymentProcessor, \n"
+#~ "                                 @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayBy {\n"
+#~ "    PaymentType value();\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "   @Nonbinding String comment() default \"\";\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @NonBinding public String value();\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
+#~ "syncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Synchronous @Reliable\n"
+#~ "public class SynchronousReliablePaymentProcessor implements "
+#~ "PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative @Synchronous @Asynchronous\n"
+#~ "public class MockPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
+#~ "paymentProcessorSource;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]"
+#~ ">"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[abstract class AsynchronousQualifier\n"
+#~ "extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[abstract class CreditCardBinding \n"
+#~ "    extends AnnotationLiteral<CreditCard> \n"
+#~ "    implements CreditCard {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
+#~ "   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
+#~ msgstr ""
+#~ "<![CDATA[PaymentProcessor p = manager.getInstanceByType(PaymentProcessor."
+#~ "class, \n"
+#~ "                                               new "
+#~ "AnnotationLiteral<CreditCard>(){});]]>"
+
+#~ msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
+#~ msgstr "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
+
+#~ msgid ""
+#~ "<![CDATA[class LogFactory {\n"
+#~ "\n"
+#~ "   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
+#~ "      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass"
+#~ "().getName()); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[class LogFactory {\n"
+#~ "\n"
+#~ "   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
+#~ "      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass"
+#~ "().getName()); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject Logger log;]]>"
+#~ msgstr "<![CDATA[@Current Logger log;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @Nonbinding public String value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @NonBinding public String value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@HttpParam(\"username\") String username;\n"
+#~ "@HttpParam(\"password\") String password;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@HttpParam(\"username\") String username;\n"
+#~ "@HttpParam(\"password\") String password;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[class HttpParams\n"
+#~ "\n"
+#~ "   @Produces @HttpParam(\"\")\n"
+#~ "   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
+#~ "      return request.getParameter(ip.getAnnotated().getAnnotation"
+#~ "(HttpParam.class).value());\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[class HttpParams\n"
+#~ "\n"
+#~ "   @Produces @HttpParam(\"\")\n"
+#~ "   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
+#~ "      return request.getParameter(ip.getAnnotation(HttpParam.class).value"
+#~ "());\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public interface InjectionPoint { \n"
+#~ "   public Type getType();\n"
+#~ "   public Set<Annotation> getQualifiers();\n"
+#~ "   public Bean<?> getBean();\n"
+#~ "   public Member getMember();\n"
+#~ "   public Annotated getAnnotated();\n"
+#~ "   public boolean isDelegate();\n"
+#~ "   public boolean isTransient();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface InjectionPoint { \n"
+#~ "   public Object getInstance(); \n"
+#~ "   public Bean<?> getBean(); \n"
+#~ "   public Member getMember(): \n"
+#~ "   public <T extends Annotation> T getAnnotation(Class<T> annotation); \n"
+#~ "   public Set<T extends Annotation> getAnnotations(); \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
 #~ "It's usually very easy to fix an unproxyable dependency problem. Simply "
 #~ "add a constructor with no parameters to the injected class, introduce an "
 #~ "interface, or, if all else fails, change the scope of the injected bean "

Modified: doc/trunk/reference/zh-CN/interceptors.po
===================================================================
--- doc/trunk/reference/zh-CN/interceptors.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/interceptors.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-13 13:15+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: interceptors.xml:5
 #, no-c-format
 msgid "Interceptors"
 msgstr "拦截器"
 
 #. Tag: para
-#: interceptors.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Interceptor functionality is defined in the Java Interceptors specification. "
@@ -29,32 +27,27 @@
 msgstr "Web Beans拥有一个更复杂的基于注释的方法将拦截器绑定到Web Bean上。"
 
 #. Tag: para
-#: interceptors.xml:12
 #, fuzzy, no-c-format
 msgid ""
 "The Interceptors specification defines two kinds of interception points:"
 msgstr "EJB规范定义了两种拦截点:"
 
 #. Tag: para
-#: interceptors.xml:18
 #, no-c-format
 msgid "business method interception, and"
 msgstr "业务方法拦截,和"
 
 #. Tag: para
-#: interceptors.xml:21
 #, no-c-format
 msgid "lifecycle callback interception."
 msgstr "生命周期回调方法拦截。"
 
 #. Tag: para
-#: interceptors.xml:25
 #, fuzzy, no-c-format
 msgid "In addition, the EJB specification defines timeout method interception."
 msgstr "EJB规范定义了两种拦截点:"
 
 #. Tag: para
-#: interceptors.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>business method interceptor</emphasis> applies to invocations of "
@@ -63,23 +56,7 @@
 "一个 <emphasis>业务方法拦截</emphasis> 是Web Bean的客户应用在Web Bean的方法调"
 "用上:"
 
-#. Tag: programlisting
-#: interceptors.xml:34
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:36
 #, no-c-format
 msgid ""
 "A <emphasis>lifecycle callback interceptor</emphasis> applies to invocations "
@@ -88,22 +65,7 @@
 "一个 <emphasis>生命周期回调拦截器</emphasis> 是容器应用在生命周期回调方法的调"
 "用上:"
 
-#. Tag: programlisting
-#: interceptors.xml:41
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"   @PostConstruct \n"
-"   public void injectDependencies(InvocationContext ctx) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"    @PostConstruct public void injectDependencies(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:43
 #, no-c-format
 msgid ""
 "An interceptor class may intercept both lifecycle callbacks and business "
@@ -111,7 +73,6 @@
 msgstr "一个拦截器类既可以拦截生命周期回调方法,也可以拦截业务方法。"
 
 #. Tag: para
-#: interceptors.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>timeout method interceptor</emphasis> applies to invocations of "
@@ -120,29 +81,12 @@
 "一个 <emphasis>生命周期回调拦截器</emphasis> 是容器应用在生命周期回调方法的调"
 "用上:"
 
-#. Tag: programlisting
-#: interceptors.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TimeoutInterceptor {\n"
-"   @AroundTimeout \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:55
 #, no-c-format
 msgid "Interceptor bindings"
 msgstr "拦截器绑定"
 
 #. Tag: para
-#: interceptors.xml:57
 #, fuzzy, no-c-format
 msgid ""
 "Suppose we want to declare that some of our beans are transactional. The "
@@ -152,22 +96,7 @@
 "假定我们想声明我们的某些Web Beans是事务性的。我们要做的第一个事情就是需要一"
 "个 <emphasis>拦截器绑定注释</emphasis> 以便指定哪些Web Beans是事务性的:"
 
-#. Tag: programlisting
-#: interceptors.xml:62
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-
 #. Tag: para
-#: interceptors.xml:64
 #, no-c-format
 msgid ""
 "Now we can easily specify that our <literal>ShoppingCart</literal> is a "
@@ -176,42 +105,17 @@
 "现在我们可以很容易地指定我们的 <literal>ShoppingCart</literal> 是一个事务性的"
 "对象:"
 
-#. Tag: programlisting
-#: interceptors.xml:68
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:70
 #, no-c-format
 msgid "Or, if we prefer, we can specify that just one method is transactional:"
 msgstr "或者,如果我们愿意的话,我们可以仅仅指定一个方法是事务性的:"
 
-#. Tag: programlisting
-#: interceptors.xml:74
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class ShoppingCart {\n"
-"    @Transactional public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:79
 #, no-c-format
 msgid "Implementing interceptors"
 msgstr "实现拦截器"
 
 #. Tag: para
-#: interceptors.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "That's great, but somewhere along the line we're going to have to actually "
@@ -223,68 +127,22 @@
 "就是创建一个标准的EJB拦截器,使用 <literal>@Interceptor</literal> 和 "
 "<literal>@Transactional</literal>注释它。"
 
-#. Tag: programlisting
-#: interceptors.xml:87
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:89
 #, no-c-format
 msgid "Interceptors can take advantage of dependency injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:93
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource UserTransaction transaction;\n"
-"\n"
-"    @AroundInvoke \n"
-"    public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource Transaction transaction;\n"
-"\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:95
 #, no-c-format
 msgid "Multiple interceptors may use the same interceptor binding type."
 msgstr "多个拦截器可以使用相同的拦截器绑定类型"
 
 #. Tag: title
-#: interceptors.xml:102
 #, no-c-format
 msgid "Enabling interceptors"
 msgstr "激活拦截器"
 
 #. Tag: para
-#: interceptors.xml:104
 #, no-c-format
 msgid ""
 "By default, all interceptors are disabled. We need to <emphasis>enable</"
@@ -292,30 +150,12 @@
 "a bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:110
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:112
 #, no-c-format
 msgid "Whoah! Why the angle bracket stew?"
 msgstr "哇塞!为何使用尖括号?"
 
 #. Tag: para
-#: interceptors.xml:114
 #, fuzzy, no-c-format
 msgid ""
 "Well, having the XML declaration is actually a <emphasis>good thing</"
@@ -323,7 +163,6 @@
 msgstr "好吧,XML声明解决了两个问题:"
 
 #. Tag: para
-#: interceptors.xml:120
 #, no-c-format
 msgid ""
 "it enables us to specify a total ordering for all the interceptors in our "
@@ -332,13 +171,11 @@
 "它可以让我们在我们的系统中指定所有的拦截器顺序,确保这些行为具有确定性,并且"
 
 #. Tag: para
-#: interceptors.xml:126
 #, no-c-format
 msgid "it lets us enable or disable interceptor classes at deployment time."
 msgstr "它能够让我们在部署期间激活或者关闭拦截器类。"
 
 #. Tag: para
-#: interceptors.xml:130
 #, fuzzy, no-c-format
 msgid ""
 "For example, we could specify that our security interceptor runs before our "
@@ -347,25 +184,7 @@
 "例如,我们可以指定在 <literal>TransactionInterceptor</literal> 之前运行我们的"
 "安全拦截器。"
 
-#. Tag: programlisting
-#: interceptors.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.SecurityInterceptor</class>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:136
 #, no-c-format
 msgid ""
 "Or we could turn them both off in our test environment by simply not "
@@ -373,13 +192,11 @@
 msgstr ""
 
 #. Tag: title
-#: interceptors.xml:142
 #, no-c-format
 msgid "Interceptor bindings with members"
 msgstr "成员拦截器绑定"
 
 #. Tag: para
-#: interceptors.xml:144
 #, no-c-format
 msgid ""
 "Suppose we want to add some extra information to our "
@@ -387,26 +204,7 @@
 msgstr ""
 "假定我们想要往 <literal>@Transactional</literal> 注释中添加一些额外信息:"
 
-#. Tag: programlisting
-#: interceptors.xml:148
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"   boolean requiresNew() default false;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"    boolean requiresNew() default false;\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:150
 #, fuzzy, no-c-format
 msgid ""
 "CDI will use the value of <literal>requiresNew</literal> to choose between "
@@ -417,25 +215,7 @@
 "<literal>TransactionInterceptor</literal> 和 "
 "<literal>RequiresNewTransactionInterceptor</literal> 中选择哪一个。"
 
-#. Tag: programlisting
-#: interceptors.xml:155
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional(requiresNew=true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:157
 #, no-c-format
 msgid ""
 "Now we can use <literal>RequiresNewTransactionInterceptor</literal> like "
@@ -444,18 +224,7 @@
 "现在我们可以像这样使用 <literal>RequiresNewTransactionInterceptor</literal> "
 ":"
 
-#. Tag: programlisting
-#: interceptors.xml:161
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true)\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional(requiresNew=true)\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:163
 #, fuzzy, no-c-format
 msgid ""
 "But what if we only have one interceptor and we want the container to ignore "
@@ -467,32 +236,12 @@
 "<literal>requiresNew</literal> 的值,那该怎么办?我们可以使用 "
 "<literal>@NonBinding</literal> 注释:"
 
-#. Tag: programlisting
-#: interceptors.xml:169
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"   @Nonbinding String[] rolesAllowed() default {};\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"    @NonBinding String[] rolesAllowed() default {};\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:174
 #, no-c-format
 msgid "Multiple interceptor binding annotations"
 msgstr "多个拦截器绑定注释"
 
 #. Tag: para
-#: interceptors.xml:176
 #, fuzzy, no-c-format
 msgid ""
 "Usually we use combinations of interceptor bindings types to bind multiple "
@@ -504,18 +253,7 @@
 "声明可以将 <literal>TransactionInterceptor</literal> 和 "
 "<literal>SecurityInterceptor</literal> 绑定到相同的Web Bean上:"
 
-#. Tag: programlisting
-#: interceptors.xml:182
-#, no-c-format
-msgid ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:184
 #, no-c-format
 msgid ""
 "However, in very complex cases, an interceptor itself may specify some "
@@ -523,18 +261,7 @@
 msgstr ""
 "然而,在非常复杂的情况下,一个拦截器本身可以指定一些拦截器绑定类型的组合:"
 
-#. Tag: programlisting
-#: interceptors.xml:189
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:191
 #, no-c-format
 msgid ""
 "Then this interceptor could be bound to the <literal>checkout()</literal> "
@@ -543,68 +270,12 @@
 "然后,这个拦截器可以使用下面的任何一个组合来绑定到 <literal>checkout()</"
 "literal> 方法上:"
 
-#. Tag: programlisting
-#: interceptors.xml:196
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class ShoppingCart {\n"
-"    @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:198
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"    @Transactional public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:200
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart {\n"
-"   @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactionl\n"
-"public class ShoppingCart {\n"
-"    @Secure public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:202
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"    public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:207
 #, no-c-format
 msgid "Interceptor binding type inheritance"
 msgstr "拦截器绑定类型的继承"
 
 #. Tag: para
-#: interceptors.xml:209
 #, no-c-format
 msgid ""
 "One limitation of the Java language support for annotations is the lack of "
@@ -614,46 +285,20 @@
 "Java语言对注释的支持有一个限制,那就是缺少注释的继承机制。实际上,注释应该可"
 "以重用内置,应该支持下列工作:"
 
-#. Tag: programlisting
-#: interceptors.xml:214
-#, no-c-format
-msgid ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-msgstr ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:216
 #, fuzzy, no-c-format
 msgid ""
 "Well, fortunately, CDI works around this missing feature of Java. We may "
 "annotate one interceptor binding type with other interceptor binding types "
 "(termed a <emphasis>meta-annotation</emphasis>). The interceptor bindings "
-"are transitive &#8212; any bean with the first interceptor binding inherits "
-"the interceptor bindings declared as meta-annotations."
+"are transitive — any bean with the first interceptor binding inherits the "
+"interceptor bindings declared as meta-annotations."
 msgstr ""
 "不过幸运的是,Web Beans能够解决这个Java缺失的特性。我们可以向一个拦截器绑定类"
 "型注释另一个拦截器绑定类型。拦截器绑定是具有传递性的 &#151; 拥有第一个拦截器"
 "绑定的任何Web Bean都继承被声明为元注释的拦截器绑定。"
 
-#. Tag: programlisting
-#: interceptors.xml:223
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBinding\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBindingType\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:225
 #, fuzzy, no-c-format
 msgid ""
 "Now, any bean annotated <literal>@Action</literal> will be bound to both "
@@ -667,13 +312,11 @@
 "话,甚至可以绑定到这个拦截器)"
 
 #. Tag: title
-#: interceptors.xml:234
 #, no-c-format
 msgid "Use of <literal>@Interceptors</literal>"
 msgstr " <literal>@Interceptors</literal> 的使用"
 
 #. Tag: para
-#: interceptors.xml:236
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>@Interceptors</literal> annotation defined by the interceptor "
@@ -683,55 +326,287 @@
 "企业级和简单的Web Bean都支持EJB规范指定的 <literal>@Interceptors</literal> 注"
 "释,例如:"
 
-#. Tag: programlisting
-#: interceptors.xml:239
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"    public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:241
 #, no-c-format
 msgid "However, this approach suffers the following drawbacks:"
 msgstr "然而,这种方法具有下列缺陷:"
 
 #. Tag: para
-#: interceptors.xml:245
 #, no-c-format
 msgid "the interceptor implementation is hardcoded in business code,"
 msgstr "拦截器实现被硬编码到在业务代码中,"
 
 #. Tag: para
-#: interceptors.xml:250
 #, no-c-format
 msgid "interceptors may not be easily disabled at deployment time, and"
 msgstr "拦截器可能无法轻松地在部署期间关闭,并且"
 
 #. Tag: para
-#: interceptors.xml:255
 #, fuzzy, no-c-format
 msgid ""
-"the interceptor ordering is non-global &#8212; it is determined by the order "
-"in which interceptors are listed at the class level."
+"the interceptor ordering is non-global — it is determined by the order in "
+"which interceptors are listed at the class level."
 msgstr "拦截器的顺序是非全局性的 &#151; 它由在类级别上列出的拦截器的顺序决定。"
 
 #. Tag: para
-#: interceptors.xml:262
 #, fuzzy, no-c-format
 msgid "Therefore, we recommend the use of CDI-style interceptor bindings."
 msgstr "因此,我们建议使用Web Bean风格的拦截器绑定。"
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DependencyInjectionInterceptor {\n"
+#~ "   @PostConstruct \n"
+#~ "   public void injectDependencies(InvocationContext ctx) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DependencyInjectionInterceptor {\n"
+#~ "    @PostConstruct public void injectDependencies(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class TimeoutInterceptor {\n"
+#~ "   @AroundTimeout \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "    @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke \n"
+#~ "    public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource Transaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {\n"
+#~ "   boolean requiresNew() default false;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {\n"
+#~ "    boolean requiresNew() default false;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
+#~ "public class RequiresNewTransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional(requiresNew=true) @Interceptor\n"
+#~ "public class RequiresNewTransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional(requiresNew = true)\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional(requiresNew=true)\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Secure {\n"
+#~ "   @Nonbinding String[] rolesAllowed() default {};\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Secure {\n"
+#~ "    @NonBinding String[] rolesAllowed() default {};\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure @Interceptor\n"
+#~ "public class TransactionalSecureInterceptor { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure @Interceptor\n"
+#~ "public class TransactionalSecureInterceptor { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "    @Transactional @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "    @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactionl\n"
+#~ "public class ShoppingCart {\n"
+#~ "    @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "    public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "@InterceptorBinding\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Action { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "@InterceptorBindingType\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Action { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
+#~ "class})\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
+#~ "class})\n"
+#~ "public class ShoppingCart {\n"
+#~ "    public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "Web Beans re-uses the basic interceptor architecture of EJB 3.0, "
 #~ "extending the functionality in two directions:"
 #~ msgstr ""

Modified: doc/trunk/reference/zh-CN/intro.po
===================================================================
--- doc/trunk/reference/zh-CN/intro.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/intro.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-30 09:14+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: intro.xml:4
 #, no-c-format
 msgid "Introduction"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "So you're keen to get started writing your first bean? Or perhaps you're "
@@ -35,13 +33,11 @@
 "了。"
 
 #. Tag: title
-#: intro.xml:13
 #, fuzzy, no-c-format
 msgid "What is a bean?"
 msgstr "什么是Web Bean?"
 
 #. Tag: para
-#: intro.xml:15
 #, no-c-format
 msgid ""
 "A bean is exactly what you think it is. Only now, it has a true identity in "
@@ -49,7 +45,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:19
 #, no-c-format
 msgid ""
 "Prior to Java EE 6, there was no clear definition of the term \"bean\" in "
@@ -62,7 +57,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:27
 #, no-c-format
 msgid ""
 "Java EE 6 finally lays down that common definition in the Managed Beans "
@@ -76,14 +70,13 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:36
 #, no-c-format
 msgid ""
 "With very few exceptions, almost every concrete Java class that has a "
 "constructor with no parameters (or a constructor designated with the "
 "annotation <literal>@Inject</literal>) is a bean. This includes every "
 "JavaBean and every EJB session bean. If you've already got some JavaBeans or "
-"session beans lying around, they're already beans&#8212;you won't need any "
+"session beans lying around, they're already beans—you won't need any "
 "additional special metadata. There's just little one thing you need to do "
 "before you can start injecting them into stuff: you need to put them in an "
 "archive (a jar, or a Java EE module such as a war or EJB jar) that contains "
@@ -91,33 +84,29 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:45
 #, no-c-format
 msgid ""
 "The JavaBeans and EJBs you've been writing every day, up until now, have not "
 "been able to take advantage of the new services defined by the CDI "
-"specification. But you'll be able to use every one of them with CDI&#8212;"
-"allowing the container to create and destroy instances of your beans and "
-"associate them with a designated context, injecting them into other beans, "
-"using them in EL expressions, specializing them with qualifier annotations, "
-"even adding interceptors and decorators to them&#8212;without modifying your "
-"existing code. At most, you'll need to add some annotations."
+"specification. But you'll be able to use every one of them with CDI—allowing "
+"the container to create and destroy instances of your beans and associate "
+"them with a designated context, injecting them into other beans, using them "
+"in EL expressions, specializing them with qualifier annotations, even adding "
+"interceptors and decorators to them—without modifying your existing code. At "
+"most, you'll need to add some annotations."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:54
 #, no-c-format
 msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
-#: intro.xml:61
 #, no-c-format
 msgid "Getting our feet wet"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:63
 #, fuzzy, no-c-format
 msgid ""
 "Suppose that we have two existing Java classes that we've been using for "
@@ -127,20 +116,7 @@
 "假定我们有两个已经写好的Java类,我们已经在不同的应用中使用它们好多年了。第一"
 "个类将一个字符串解析为一个句子列表:"
 
-#. Tag: programlisting
-#: intro.xml:68
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class SentenceParser {\n"
-"   public List<String> parse(String text) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class SentenceParser {\n"
-"    public List<String> parse(String text) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:70
 #, no-c-format
 msgid ""
 "The second existing class is a stateless session bean front-end for an "
@@ -150,42 +126,12 @@
 "第二个已有类是一个无状态的会话Bean,这个会话Bean作为一个外部系统的前端,能够"
 "将句子从一种语言翻译到另一个语言:"
 
-#. Tag: programlisting
-#: intro.xml:75
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"   public String translate(String sentence) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"    public String translate(String sentence) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:77
 #, fuzzy, no-c-format
 msgid "Where <literal>Translator</literal> is the EJB local interface:"
 msgstr "<literal>Translator</literal>是本地接口:"
 
-#. Tag: programlisting
-#: intro.xml:79
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"   public String translate(String sentence);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"    public String translate(String sentence);\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "Unfortunately, we don't have a class that translates whole text documents. "
@@ -194,54 +140,7 @@
 "不幸的是,我们没有Java类能够翻译整个文档。因此,让我们写一个Web Bean来做这个"
 "工作:"
 
-#. Tag: programlisting
-#: intro.xml:85
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator {\n"
-"   private SentenceParser sentenceParser;\n"
-"   private Translator sentenceTranslator;\n"
-"    \n"
-"   @Inject\n"
-"   TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"      this.sentenceParser = sentenceParser;\n"
-"      this.sentenceTranslator = sentenceTranslator;\n"
-"   }\n"
-"    \n"
-"   public String translate(String text) {\n"
-"      StringBuilder sb = new StringBuilder();\n"
-"      for (String sentence: sentenceParser.parse(text)) {\n"
-"          sb.append(sentenceTranslator.translate(sentence));\n"
-"      }\n"
-"      return sb.toString();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TextTranslator {\n"
-"    \n"
-"    private SentenceParser sentenceParser;\n"
-"    private Translator sentenceTranslator;\n"
-"    \n"
-"    @Initializer\n"
-"    TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"        this.sentenceParser = sentenceParser;\n"
-"        this.sentenceTranslator = sentenceTranslator;\n"
-"    }\n"
-"    \n"
-"    public String translate(String text) {\n"
-"        StringBuilder sb = new StringBuilder();\n"
-"        for (String sentence: sentenceParser.parse(text)) {\n"
-"            sb.append(sentenceTranslator.translate(sentence));\n"
-"        }\n"
-"        return sb.toString();\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:87
 #, fuzzy, no-c-format
 msgid ""
 "But wait! <literal>TextTranslator</literal> does not have a constructor with "
@@ -254,7 +153,6 @@
 "在它的一个构造器上使用<literal>@Initializer</literal>注释即可。"
 
 #. Tag: para
-#: intro.xml:93
 #, fuzzy, no-c-format
 msgid ""
 "As you've guessed, the <literal>@Inject</literal> annotation has something "
@@ -269,7 +167,6 @@
 "管理器能够将其他的Web Bean注入到构造器或者方法的参数中。"
 
 #. Tag: para
-#: intro.xml:100
 #, no-c-format
 msgid ""
 "We may obtain an instance of <literal>TextTranslator</literal> by injecting "
@@ -280,7 +177,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:107
 #, no-c-format
 msgid ""
 "Let's create a UI controller bean that uses field injection to obtain an "
@@ -288,44 +184,12 @@
 "entered by a user:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:116
-#, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class TranslateController {\n"
-"   @Inject TextTranslator textTranslator;\n"
-"\n"
-"   private String inputText;\n"
-"   private String translation;\n"
-"\n"
-"   // JSF action method, perhaps\n"
-"   public void translate() {\n"
-"      translation = textTranslator.translate(inputText); \n"
-"   }\n"
-"\n"
-"   public String getInputText() {\n"
-"      return inputText;\n"
-"   }\n"
-"\n"
-"   public void setInputText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"\n"
-"   public String getTranslation() {\n"
-"      return translation;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:119
 #, fuzzy, no-c-format
 msgid "Field injection of <literal>TextTranslator</literal> instance"
 msgstr "<literal>Translator</literal>是本地接口:"
 
 #. Tag: para
-#: intro.xml:127
 #, no-c-format
 msgid ""
 "Notice the controller bean is request-scoped and named. Since this "
@@ -336,7 +200,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:135
 #, fuzzy, no-c-format
 msgid ""
 "Alternatively, we may obtain an instance of <literal>TextTranslator</"
@@ -346,23 +209,7 @@
 "通过将其注入到一个Web Bean,Servlet或者EJB,我们能够获得一个 "
 "<literal>TextTranslator</literal>的实例:"
 
-#. Tag: programlisting
-#: intro.xml:140
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
-"...\n"
-"public void translate() {\n"
-"   textTranslatorInstance.get().translate(inputText);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public setTextTranslator(TextTranslator textTranslator) {\n"
-"    this.textTranslator = textTranslator;\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:142
 #, no-c-format
 msgid ""
 "Notice that it isn't necessary to create a getter or setter method to inject "
@@ -373,17 +220,15 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:148
 #, fuzzy, no-c-format
 msgid ""
 "At system initialization time, the container must validate that exactly one "
 "bean exists which satisfies each injection point. In our example, if no "
-"implementation of <literal>Translator</literal> is available&#8212;if the "
-"<literal>SentenceTranslator</literal> EJB was not deployed&#8212;the "
-"container would inform us of an <emphasis>unsatisfied dependency</emphasis>. "
-"If more than one implementation of <literal>Translator</literal> were "
-"available, the container would inform us of the <emphasis>ambiguous "
-"dependency</emphasis>."
+"implementation of <literal>Translator</literal> is available—if the "
+"<literal>SentenceTranslator</literal> EJB was not deployed—the container "
+"would inform us of an <emphasis>unsatisfied dependency</emphasis>. If more "
+"than one implementation of <literal>Translator</literal> were available, the "
+"container would inform us of the <emphasis>ambiguous dependency</emphasis>."
 msgstr ""
 "在系统初始化的时候,Web Bean管理器必须验证只存在一个Web Bean能够满足每个注入"
 "点。在我们的例子中,如果没有<literal>Translator</literal>实现&#151;如果"
@@ -393,7 +238,6 @@
 "<literal>AmbiguousDependencyException</literal>异常。"
 
 #. Tag: para
-#: intro.xml:156
 #, no-c-format
 msgid ""
 "Before we get too deep in the details, let's pause and examine a bean's "
@@ -402,6 +246,97 @@
 "what <emphasis>makes</emphasis> something a bean."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class SentenceParser {\n"
+#~ "   public List<String> parse(String text) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class SentenceParser {\n"
+#~ "    public List<String> parse(String text) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator {\n"
+#~ "   public String translate(String sentence) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator {\n"
+#~ "    public String translate(String sentence) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Local\n"
+#~ "public interface Translator {\n"
+#~ "   public String translate(String sentence);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Local\n"
+#~ "public interface Translator {\n"
+#~ "    public String translate(String sentence);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class TextTranslator {\n"
+#~ "   private SentenceParser sentenceParser;\n"
+#~ "   private Translator sentenceTranslator;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) {\n"
+#~ "      this.sentenceParser = sentenceParser;\n"
+#~ "      this.sentenceTranslator = sentenceTranslator;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public String translate(String text) {\n"
+#~ "      StringBuilder sb = new StringBuilder();\n"
+#~ "      for (String sentence: sentenceParser.parse(text)) {\n"
+#~ "          sb.append(sentenceTranslator.translate(sentence));\n"
+#~ "      }\n"
+#~ "      return sb.toString();\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TextTranslator {\n"
+#~ "    \n"
+#~ "    private SentenceParser sentenceParser;\n"
+#~ "    private Translator sentenceTranslator;\n"
+#~ "    \n"
+#~ "    @Initializer\n"
+#~ "    TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) {\n"
+#~ "        this.sentenceParser = sentenceParser;\n"
+#~ "        this.sentenceTranslator = sentenceTranslator;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public String translate(String text) {\n"
+#~ "        StringBuilder sb = new StringBuilder();\n"
+#~ "        for (String sentence: sentenceParser.parse(text)) {\n"
+#~ "            sb.append(sentenceTranslator.translate(sentence));\n"
+#~ "        }\n"
+#~ "        return sb.toString();\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
+#~ "...\n"
+#~ "public void translate() {\n"
+#~ "   textTranslatorInstance.get().translate(inputText);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public setTextTranslator(TextTranslator textTranslator) {\n"
+#~ "    this.textTranslator = textTranslator;\n"
+#~ "}]]>"
+
 #~ msgid "Getting started with Web Beans"
 #~ msgstr "Web Beans起步"
 

Modified: doc/trunk/reference/zh-CN/master.po
===================================================================
--- doc/trunk/reference/zh-CN/master.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/master.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-27 13:37+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: master.xml:9
 #, no-c-format
 msgid "A note about naming and nomenclature"
 msgstr ""
 
 #. Tag: para
-#: master.xml:10
 #, no-c-format
 msgid ""
 "Shortly before the final draft of JSR-299 was submitted, the specification "
@@ -35,7 +33,6 @@
 msgstr ""
 
 #. Tag: para
-#: master.xml:19
 #, no-c-format
 msgid ""
 "You'll also find that some of the functionality that once existed in the "
@@ -45,43 +42,37 @@
 msgstr ""
 
 #. Tag: para
-#: master.xml:25
 #, no-c-format
 msgid ""
 "Note that this reference guide was started while changes were still being "
 "made to the specification. We've done our best to update it for accuracy. If "
 "you discover a conflict between what is written in this guide and the "
-"specification, the specification is the authority&#8212;assume it is "
-"correct. If you believe you have found an error in the specification, please "
-"report it to the JSR-299 EG."
+"specification, the specification is the authority—assume it is correct. If "
+"you believe you have found an error in the specification, please report it "
+"to the JSR-299 EG."
 msgstr ""
 
 #. Tag: title
-#: master.xml:36
 #, no-c-format
 msgid "Beans"
 msgstr ""
 
 #. Tag: title
-#: master.xml:49
 #, no-c-format
 msgid "Weld, the CDI Reference Implementation"
 msgstr ""
 
 #. Tag: title
-#: master.xml:59
 #, fuzzy, no-c-format
 msgid "Loose coupling with strong typing"
 msgstr "最大程度地使用强类型"
 
 #. Tag: title
-#: master.xml:75
 #, fuzzy, no-c-format
 msgid "CDI and the Java EE ecosystem"
 msgstr "Web Beans和Java EE生态系统"
 
 #. Tag: title
-#: master.xml:87
 #, no-c-format
 msgid "Weld reference"
 msgstr ""

Modified: doc/trunk/reference/zh-CN/next.po
===================================================================
--- doc/trunk/reference/zh-CN/next.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/next.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-23 16:53+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: next.xml:4
 #, no-c-format
 msgid "Next steps"
 msgstr "下一步"
 
 #. Tag: para
-#: next.xml:6
 #, no-c-format
 msgid ""
 "Because CDI is so new, there's not yet a lot of information available "
@@ -33,7 +31,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:14
 #, fuzzy, no-c-format
 msgid ""
 "The CDI reference implementation, Weld, is being developed at the <ulink url="
@@ -49,7 +46,6 @@
 "relation.to</literal>。本篇文章的撰写完全基于先前发表在那里的一系列博客文章。"
 
 #. Tag: para
-#: next.xml:22
 #, no-c-format
 msgid ""
 "We encourage you to follow the <ulink url=\"https://lists.jboss.org/mailman/"
@@ -59,7 +55,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:28
 #, no-c-format
 msgid ""
 "We are eager to find volunteers to help revise, proofread or translate this "
@@ -68,7 +63,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:35
 #, no-c-format
 msgid ""
 "Checkout source from <ulink url=\"http://anonsvn.jboss.org/repos/weld/doc/"
@@ -76,16 +70,7 @@
 "ulink> using SVN"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:40
-#, no-c-format
-msgid ""
-"<![CDATA[$> svn co http://anonsvn.jboss.org/repos/weld/doc/trunk/reference "
-"weld-reference]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:43
 #, no-c-format
 msgid ""
 "Edit the <literal>pom.xml</literal> file in the root of the checkout and "
@@ -94,19 +79,11 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:49
 #, no-c-format
 msgid "Build using Maven 2"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:52
-#, no-c-format
-msgid "<![CDATA[$> mvn]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:54
 #, no-c-format
 msgid ""
 "If you experience an out of memory error, try setting this environment "
@@ -114,7 +91,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:61
 #, no-c-format
 msgid ""
 "The PDF version of the reference guide will appear the current directory. "
@@ -123,7 +99,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:66
 #, no-c-format
 msgid "We look forward to your participation!"
 msgstr ""

Modified: doc/trunk/reference/zh-CN/part1.po
===================================================================
--- doc/trunk/reference/zh-CN/part1.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/part1.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-22 10:45+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part1.xml:14
 #, fuzzy, no-c-format
 msgid ""
 "The <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-299</ulink> "
@@ -29,7 +28,6 @@
 "提供了:"
 
 #. Tag: para
-#: part1.xml:23
 #, fuzzy, no-c-format
 msgid ""
 "an improved lifecycle for stateful objects, bound to well-defined "
@@ -39,20 +37,17 @@
 "生命周期,"
 
 #. Tag: para
-#: part1.xml:28
 #, no-c-format
 msgid "a typesafe approach to <emphasis>dependency injection</emphasis>,"
 msgstr "一个类型安全的<emphasis>依赖注入</emphasis>方法,"
 
 #. Tag: para
-#: part1.xml:33
 #, fuzzy, no-c-format
 msgid ""
 "object interaction via an <emphasis>event notification facility</emphasis>,"
 msgstr "通过 <emphasis>事件通知</emphasis> 机制实现的交互,并且"
 
 #. Tag: para
-#: part1.xml:38
 #, fuzzy, no-c-format
 msgid ""
 "a better approach to binding <emphasis>interceptors</emphasis> to objects, "
@@ -64,7 +59,6 @@
 "务问题。"
 
 #. Tag: para
-#: part1.xml:45
 #, no-c-format
 msgid ""
 "an <emphasis>SPI</emphasis> for developing portable extensions to the "
@@ -72,22 +66,21 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:51
 #, no-c-format
 msgid ""
 "The CDI services are a core aspect of the Java EE platform and include full "
 "support for Java EE modularity and the Java EE component architecture. But "
 "the specification does not limit the use of CDI to the Java EE environment. "
 "In the Java SE environment, the services might be provided by a standalone "
-"CDI implementation like Weld (see <xref linkend=\"weld-se\"/>), or even by a "
-"container that also implements the subset of EJB defined for embedded usage "
-"by the EJB 3.1 specification. CDI is especially useful in the context of web "
-"application development, but the problems it solves are general development "
-"concerns and it is therefore applicable to a wide variety of application."
+"CDI implementation like Weld (see <xref linkend=\"weld-se\" />), or even by "
+"a container that also implements the subset of EJB defined for embedded "
+"usage by the EJB 3.1 specification. CDI is especially useful in the context "
+"of web application development, but the problems it solves are general "
+"development concerns and it is therefore applicable to a wide variety of "
+"application."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:61
 #, no-c-format
 msgid ""
 "An object bound to a lifecycle context is called a bean. CDI includes built-"
@@ -96,19 +89,16 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:68
 #, no-c-format
 msgid "managed beans, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:71
 #, no-c-format
 msgid "EJB session beans."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:75
 #, no-c-format
 msgid ""
 "Both managed beans and EJB session beans may inject other beans. But some "
@@ -118,37 +108,31 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:83
 #, no-c-format
 msgid "message-driven beans,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:86
 #, no-c-format
 msgid "interceptors,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:89
 #, no-c-format
 msgid "servlets, servlet filters and servlet event listeners,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:92
 #, no-c-format
 msgid "JAX-WS service endpoints and handlers, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:95
 #, no-c-format
 msgid "JSP tag handlers and tag library event listeners."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:99
 #, fuzzy, no-c-format
 msgid ""
 "CDI relieves the user of an unfamiliar API of the need to answer the "
@@ -158,44 +142,37 @@
 "下列问题所浪费时间:"
 
 #. Tag: para
-#: part1.xml:105
 #, fuzzy, no-c-format
 msgid "What is the lifecycle of this object?"
 msgstr "这个对象的生命周期是什么?"
 
 #. Tag: para
-#: part1.xml:108
 #, fuzzy, no-c-format
 msgid "How many simultaneous clients can it have?"
 msgstr "它能够有多少个并发的客户端"
 
 #. Tag: para
-#: part1.xml:111
 #, fuzzy, no-c-format
 msgid "Is it multithreaded?"
 msgstr "它是多线程的么?"
 
 #. Tag: para
-#: part1.xml:114
 #, no-c-format
 msgid "How do I get access to it from a client?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:117
 #, fuzzy, no-c-format
 msgid "Do I need to explicitly destroy it?"
 msgstr "我需要显式地销毁它么?"
 
 #. Tag: para
-#: part1.xml:120
 #, fuzzy, no-c-format
 msgid ""
 "Where should I keep the reference to it when I'm not currently using it?"
 msgstr "当我不再直接使用它的时候,我需要将它的引用保存到哪里?"
 
 #. Tag: para
-#: part1.xml:125
 #, fuzzy, no-c-format
 msgid ""
 "How can I define an alternative implementation, so that the implementation "
@@ -203,13 +180,11 @@
 msgstr "我如何才能添加一个间接层,以便在部署的时候可以更换这个对象的不同实现?"
 
 #. Tag: para
-#: part1.xml:131
 #, fuzzy, no-c-format
 msgid "How should I go about sharing this object between other objects?"
 msgstr "我应该如何在其他对象中共享这个对象?"
 
 #. Tag: para
-#: part1.xml:137
 #, no-c-format
 msgid ""
 "CDI is more than a framework. It's a whole, rich programming model. The "
@@ -218,7 +193,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:142
 #, fuzzy, no-c-format
 msgid ""
 "A bean specifies only the type and semantics of other beans it depends upon. "
@@ -234,7 +208,6 @@
 "署场景而更改,却丝毫不影响任何客户端。"
 
 #. Tag: para
-#: part1.xml:149
 #, fuzzy, no-c-format
 msgid ""
 "Events, interceptors and decorators enhance the loose-coupling inherent in "
@@ -243,7 +216,6 @@
 "事件,拦截器和装饰器增强了这个模型固有的<emphasis>松耦合</emphasis>特性:"
 
 #. Tag: para
-#: part1.xml:155
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -251,7 +223,6 @@
 msgstr "<emphasis>事件通知</emphasis>将事件的消费者和事件的产生者解耦,"
 
 #. Tag: para
-#: part1.xml:159
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -259,7 +230,6 @@
 msgstr "<emphasis>拦截器</emphasis>将技术关注点从业务逻辑中解耦,并且"
 
 #. Tag: para
-#: part1.xml:163
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> allow business concerns to be "
@@ -267,7 +237,6 @@
 msgstr "<emphasis>装饰器</emphasis>允许开发者划分业务关注点。"
 
 #. Tag: para
-#: part1.xml:168
 #, fuzzy, no-c-format
 msgid ""
 "What's even more powerful (and comforting) is that CDI provides all these "
@@ -287,7 +256,6 @@
 "依赖以及拦截器,装饰器和事件消费者关联在一起。"
 
 #. Tag: para
-#: part1.xml:177
 #, no-c-format
 msgid ""
 "But CDI isn't a restrictive programming model. It doesn't tell you how you "
@@ -297,7 +265,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:183
 #, fuzzy, no-c-format
 msgid ""
 "CDI even provides a comprehensive SPI, allowing other kinds of object "
@@ -310,7 +277,6 @@
 "Bean交互。"
 
 #. Tag: para
-#: part1.xml:189
 #, fuzzy, no-c-format
 msgid ""
 "CDI was influenced by a number of existing Java frameworks, including Seam, "
@@ -326,7 +292,6 @@
 "用更少的XML, 比Guice更加具备Web和企业应用的能力。"
 
 #. Tag: para
-#: part1.xml:197
 #, no-c-format
 msgid ""
 "Finally, CDI is a <ulink url=\"http://jcp.org\">Java Community Process</"

Modified: doc/trunk/reference/zh-CN/part2.po
===================================================================
--- doc/trunk/reference/zh-CN/part2.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/part2.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-23 17:08+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part2.xml:5
 #, no-c-format
 msgid ""
 "Weld, the JSR-299 Reference Implementation (RI), is being developed as part "
@@ -26,7 +25,6 @@
 msgstr ""
 
 #. Tag: para
-#: part2.xml:12
 #, no-c-format
 msgid ""
 "Weld provides a complete SPI allowing Java EE containers such as JBoss AS "
@@ -36,7 +34,6 @@
 msgstr ""
 
 #. Tag: para
-#: part2.xml:18
 #, no-c-format
 msgid ""
 "Weld comes with an extensive library of examples, which are a great starting "

Modified: doc/trunk/reference/zh-CN/part3.po
===================================================================
--- doc/trunk/reference/zh-CN/part3.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/part3.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-23 17:29+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part3.xml:5
 #, no-c-format
 msgid ""
 "The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've "
@@ -22,19 +21,16 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:12
 #, no-c-format
 msgid "<emphasis>alternatives</emphasis> enable deployment time polymorphism,"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:17
 #, no-c-format
 msgid "<emphasis>producer methods</emphasis> enable runtime polymorphism, and"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:21
 #, no-c-format
 msgid ""
 "<emphasis>contextual lifecycle management</emphasis> decouples bean "
@@ -42,7 +38,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:27
 #, no-c-format
 msgid ""
 "These techniques serve to enable loose coupling of client and server. The "
@@ -52,7 +47,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:33
 #, no-c-format
 msgid ""
 "Loose coupling makes a system more <emphasis>dynamic</emphasis>. The system "
@@ -64,7 +58,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:40
 #, no-c-format
 msgid ""
 "CDI provides three extra important facilities that further the goal of loose "
@@ -72,7 +65,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:46
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -80,7 +72,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:51
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> may be used to decouple some business "
@@ -88,7 +79,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:56
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -96,7 +86,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:62
 #, fuzzy, no-c-format
 msgid ""
 "The second major theme of CDI is <emphasis>strong typing</emphasis>. The "
@@ -109,20 +98,18 @@
 "中,可以被编译器验证。"
 
 #. Tag: para
-#: part3.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "You don't see string-based identifiers in CDI code, not because the "
-"framework is hiding them from you using clever defaulting rules&#8212;so-"
-"called \"configuration by convention\"&#8212;but because there are simply no "
-"strings there to begin with!"
+"framework is hiding them from you using clever defaulting rules—so-called "
+"\"configuration by convention\"—but because there are simply no strings "
+"there to begin with!"
 msgstr ""
 "在Web Bean代码中,你不会看到基于字符串的标识符。这不是因为这个框架使用智能默"
 "认规则 &#151; 也叫\"按惯例配置\" &#151; 将它们隐藏起来,这是因为从开始就没有"
 "任何字符串!"
 
 #. Tag: para
-#: part3.xml:74
 #, no-c-format
 msgid ""
 "The obvious benefit of this approach is that <emphasis>any</emphasis> IDE "
@@ -138,68 +125,57 @@
 "你的代码的语义水平。"
 
 #. Tag: para
-#: part3.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "CDI encourages you develop annotations that model concepts, for example,"
 msgstr "Web Beans能够鼓励你为概念建模,开发注释。例如:"
 
 #. Tag: para
-#: part3.xml:87
 #, no-c-format
 msgid "<literal>@Asynchronous</literal>,"
 msgstr "<literal>@Asynchronous</literal>,"
 
 #. Tag: para
-#: part3.xml:90
 #, no-c-format
 msgid "<literal>@Mock</literal>,"
 msgstr "<literal>@Mock</literal>,"
 
 #. Tag: para
-#: part3.xml:93
 #, no-c-format
 msgid "<literal>@Secure</literal> or"
 msgstr "<literal>@Secure</literal> or"
 
 #. Tag: para
-#: part3.xml:96
 #, no-c-format
 msgid "<literal>@Updated</literal>,"
 msgstr "<literal>@Updated</literal>,"
 
 #. Tag: para
-#: part3.xml:100
 #, no-c-format
 msgid "instead of using compound names like"
 msgstr "而不是使用复合名字,像:"
 
 #. Tag: para
-#: part3.xml:104
 #, no-c-format
 msgid "<literal>asyncPaymentProcessor</literal>,"
 msgstr "<literal>asyncPaymentProcessor</literal>,"
 
 #. Tag: para
-#: part3.xml:107
 #, no-c-format
 msgid "<literal>mockPaymentProcessor</literal>,"
 msgstr "<literal>mockPaymentProcessor</literal>,"
 
 #. Tag: para
-#: part3.xml:110
 #, no-c-format
 msgid "<literal>SecurityInterceptor</literal> or"
 msgstr "<literal>SecurityInterceptor</literal> or"
 
 #. Tag: para
-#: part3.xml:113
 #, no-c-format
 msgid "<literal>DocumentUpdatedEvent</literal>."
 msgstr "<literal>DocumentUpdatedEvent</literal>."
 
 #. Tag: para
-#: part3.xml:117
 #, no-c-format
 msgid ""
 "The annotations are reusable. They help describe common qualities of "
@@ -212,7 +188,6 @@
 "具有更高的可读性,更加容易被理解。"
 
 #. Tag: para
-#: part3.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "CDI <emphasis>stereotypes</emphasis> take this idea a step further. A "
@@ -227,7 +202,6 @@
 "括范围,拦截器绑定,部署类型,等等封装到一个单一的可重用的包中。"
 
 #. Tag: para
-#: part3.xml:138
 #, fuzzy, no-c-format
 msgid ""
 "We're now ready to meet some more advanced features of CDI. Bear in mind "

Modified: doc/trunk/reference/zh-CN/part4.po
===================================================================
--- doc/trunk/reference/zh-CN/part4.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/part4.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2008-12-23 17:48+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,7 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part4.xml:5
 #, no-c-format
 msgid ""
 "The third theme of CDI is <emphasis>integration</emphasis>. We've already "
@@ -26,7 +25,6 @@
 msgstr ""
 
 #. Tag: para
-#: part4.xml:12
 #, fuzzy, no-c-format
 msgid ""
 "CDI is also designed to work in concert with technologies outside of the "
@@ -49,7 +47,6 @@
 "台一部分的技术更加容易并且无缝地集成到Java EE环境中。"
 
 #. Tag: para
-#: part4.xml:23
 #, fuzzy, no-c-format
 msgid ""
 "We're about to see how to take full advantage of the Java EE platform in an "

Modified: doc/trunk/reference/zh-CN/part5.po
===================================================================
--- doc/trunk/reference/zh-CN/part5.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/part5.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,7 +15,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part5.xml:5
 #, no-c-format
 msgid ""
 "Weld is the reference implementation of JSR-299, and is used by JBoss AS and "
@@ -27,7 +26,6 @@
 msgstr ""
 
 #. Tag: para
-#: part5.xml:12
 #, no-c-format
 msgid ""
 "Some of the extensions in Weld are portable across JSR-299 implementations "
@@ -37,12 +35,11 @@
 msgstr ""
 
 #. Tag: para
-#: part5.xml:18
 #, no-c-format
 msgid ""
 "If you want to get started quickly using Weld (and, in turn, CDI) with JBoss "
 "AS, GlassFish or Tomcat and experiment with one of the examples, take a look "
-"at <xref linkend=\"gettingstarted\"/>. Otherwise read on for a exhaustive "
+"at <xref linkend=\"gettingstarted\" />. Otherwise read on for a exhaustive "
 "discussion of using Weld in all the environments and application servers it "
 "supports and the Weld extensions."
 msgstr ""

Modified: doc/trunk/reference/zh-CN/producermethods.po
===================================================================
--- doc/trunk/reference/zh-CN/producermethods.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/producermethods.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-12 11:20+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: producermethods.xml:5
 #, no-c-format
 msgid "Producer methods"
 msgstr "生产者方法"
 
 #. Tag: para
-#: producermethods.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Producer methods let us overcome certain limitations that arise when a "
@@ -33,31 +31,26 @@
 "径。(我们将在<xref linkend=\"xml\"/>讨论第二种方法)"
 
 #. Tag: para
-#: producermethods.xml:14
 #, no-c-format
 msgid "According to the spec:"
 msgstr "根据规范:"
 
 #. Tag: para
-#: producermethods.xml:18
 #, no-c-format
 msgid "A producer method acts as a source of objects to be injected, where:"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:22
 #, no-c-format
 msgid "the objects to be injected are not required to be instances of beans,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:25
 #, no-c-format
 msgid "the concrete type of the objects to be injected may vary at runtime or"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:28
 #, no-c-format
 msgid ""
 "the objects require some custom initialization that is not performed by the "
@@ -65,25 +58,21 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:36
 #, fuzzy, no-c-format
 msgid "For example, producer methods let us:"
 msgstr "生产者方法的范围"
 
 #. Tag: para
-#: producermethods.xml:40
 #, no-c-format
 msgid "expose a JPA entity as a bean,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:43
 #, no-c-format
 msgid "expose any JDK class as a bean,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:46
 #, no-c-format
 msgid ""
 "define multiple beans, with different scopes or initialization, for the same "
@@ -91,13 +80,11 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:51
 #, no-c-format
 msgid "vary the implementation of a bean type at runtime."
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:55
 #, no-c-format
 msgid ""
 "In particular, producer methods let us use runtime polymorphism with CDI. As "
@@ -106,55 +93,12 @@
 "is fixed. A producer method has no such limitation:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:61
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Preferences implements Serializable {\n"
-"   private PaymentStrategyType paymentStrategy;\n"
-"   ...\n"
-"   @Produces @Preferred \n"
-"   public PaymentStrategy getPaymentStrategy() {\n"
-"       switch (paymentStrategy) {\n"
-"           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
-"           case CHECK: return new CheckPaymentStrategy();\n"
-"           case PAYPAL: return new PayPalPaymentStrategy();\n"
-"           default: return null;\n"
-"       } \n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          ChequePaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:63
 #, no-c-format
 msgid "Consider an injection point:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:65
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"    ...\n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:67
 #, no-c-format
 msgid ""
 "This injection point has the same type and qualifier annotations as the "
@@ -164,13 +108,11 @@
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:74
 #, no-c-format
 msgid "Scope of a producer method"
 msgstr "生产者方法的范围"
 
 #. Tag: para
-#: producermethods.xml:76
 #, fuzzy, no-c-format
 msgid ""
 "The scope of the producer method defaults to <literal>@Dependent</literal>, "
@@ -185,7 +127,6 @@
 "<literal>PaymentStrategy</literal>实例。"
 
 #. Tag: para
-#: producermethods.xml:83
 #, no-c-format
 msgid ""
 "To change this behavior, we can add a <literal>@SessionScoped</literal> "
@@ -194,22 +135,7 @@
 "要改变这种行为,我们可以给这个方法添加一个 <literal>@SessionScoped</literal> "
 "注释。"
 
-#. Tag: programlisting
-#: producermethods.xml:87
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"    ...\n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:89
 #, no-c-format
 msgid ""
 "Now, when the producer method is called, the returned "
@@ -220,7 +146,6 @@
 "对象将被绑定到会话上下文中。这个生产者方法在同一个会话范围中不会被再次调用。"
 
 #. Tag: para
-#: producermethods.xml:95
 #, no-c-format
 msgid ""
 "A producer method does <emphasis>not</emphasis> inherit the scope of the "
@@ -233,13 +158,11 @@
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:107
 #, no-c-format
 msgid "Injection into producer methods"
 msgstr "注入到生产者方法中"
 
 #. Tag: para
-#: producermethods.xml:109
 #, no-c-format
 msgid ""
 "There's one potential problem with the code above. The implementations of "
@@ -253,7 +176,6 @@
 "法获得依赖注入的好处,也无法获得拦截器。"
 
 #. Tag: para
-#: producermethods.xml:116
 #, fuzzy, no-c-format
 msgid ""
 "If this isn't what we want, we can use dependency injection into the "
@@ -261,36 +183,7 @@
 msgstr ""
 "如果这不是我们想要的,我们可以对生产者方法使用依赖注入来获得Web Bean实例:"
 
-#. Tag: programlisting
-#: producermethods.xml:121
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          CheckPaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          ChequePaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-"
@@ -309,7 +202,6 @@
 "这种错误,因此使用生产者方法返回Web bean实例的时候一定要多加小心!"
 
 #. Tag: para
-#: producermethods.xml:132
 #, fuzzy, no-c-format
 msgid ""
 "There's at least three ways we could go about fixing this bug. We could "
@@ -324,7 +216,6 @@
 "<literal>@Dependent</literal> 或者 <literal>@RequestScoped</literal>。"
 
 #. Tag: para
-#: producermethods.xml:139
 #, fuzzy, no-c-format
 msgid ""
 "But a more common solution is to use the special <literal>@New</literal> "
@@ -332,51 +223,16 @@
 msgstr "不过更加常用的方法是使用特殊的 <literal>@New</literal> 绑定注释。"
 
 #. Tag: title
-#: producermethods.xml:144
 #, no-c-format
 msgid "Use of <literal>@New</literal> with producer methods"
 msgstr "在生产者方法中使用 <literal>@New</literal> "
 
 #. Tag: para
-#: producermethods.xml:146
 #, no-c-format
 msgid "Consider the following producer method:"
 msgstr "考虑到下面的生产者方法:"
 
-#. Tag: programlisting
-#: producermethods.xml:148
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New CheckPaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New ChequePaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:150
 #, no-c-format
 msgid ""
 "Then a new <emphasis>dependent</emphasis> instance of "
@@ -392,47 +248,25 @@
 "<literal>Preferences</literal> 一起被销毁。"
 
 #. Tag: title
-#: producermethods.xml:160
 #, fuzzy, no-c-format
 msgid "Disposer methods"
 msgstr "生产者方法"
 
 #. Tag: para
-#: producermethods.xml:162
 #, no-c-format
 msgid ""
 "Some producer methods return objects that require explicit destruction. For "
 "example, somebody needs to close this JDBC connection:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:167
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @RequestScoped Connection connect(User user) {\n"
-"   return createConnection(user.getId(), user.getPassword());\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:169
 #, no-c-format
 msgid ""
 "Destruction can be performed by a matching <emphasis>disposer method</"
 "emphasis>, defined by the same class as the producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:172
-#, no-c-format
-msgid ""
-"<![CDATA[void close(@Disposes Connection connection) {\n"
-"   connection.close();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:174
 #, no-c-format
 msgid ""
 "The disposer method must have at least one parameter, annotated "
@@ -445,7 +279,116 @@
 "method automatically."
 msgstr ""
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Preferences implements Serializable {\n"
+#~ "   private PaymentStrategyType paymentStrategy;\n"
+#~ "   ...\n"
+#~ "   @Produces @Preferred \n"
+#~ "   public PaymentStrategy getPaymentStrategy() {\n"
+#~ "       switch (paymentStrategy) {\n"
+#~ "           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
+#~ "           case CHECK: return new CheckPaymentStrategy();\n"
+#~ "           case PAYPAL: return new PayPalPaymentStrategy();\n"
+#~ "           default: return null;\n"
+#~ "       } \n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          ChequePaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "    ...\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "    ...\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          CheckPaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          ChequePaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          @New CheckPaymentStrategy cps,\n"
+#~ "                                          @New PayPalPaymentStrategy "
+#~ "ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          @New ChequePaymentStrategy "
+#~ "cps,\n"
+#~ "                                          @New PayPalPaymentStrategy "
+#~ "ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "<blockquote> <para>A Web Beans producer method acts as a source of "
 #~ "objects to be injected, where:</para> <itemizedlist> <listitem> <para>the "
 #~ "objects to be injected are not required to be instances of Web Beans,</"

Modified: doc/trunk/reference/zh-CN/resources.po
===================================================================
--- doc/trunk/reference/zh-CN/resources.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/resources.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: resources.xml:5
 #, no-c-format
 msgid "Java EE component environment resources"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:7
 #, no-c-format
 msgid ""
 "Java EE 5 already introduced some limited support for dependency injection, "
@@ -30,7 +28,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:13
 #, no-c-format
 msgid ""
 "Naturally, there is now a slight mismatch with the new style of dependency "
@@ -44,7 +41,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:22
 #, no-c-format
 msgid ""
 "Fields have a duality in that they can both be the target of Java EE "
@@ -57,13 +53,11 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:31
 #, no-c-format
 msgid "Defining a resource"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:33
 #, no-c-format
 msgid ""
 "The CDI specification uses the term <emphasis>resource</emphasis> to refer, "
@@ -72,7 +66,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:38
 #, no-c-format
 msgid ""
 "JDBC <literal>Datasource</literal>s, JMS <literal>Queue</literal>s, "
@@ -82,7 +75,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:43
 #, no-c-format
 msgid ""
 "JPA <literal>EntityManager</literal>s and <literal>EntityManagerFactory</"
@@ -90,19 +82,16 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:46
 #, no-c-format
 msgid "remote EJBs, and"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:49
 #, no-c-format
 msgid "web services"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:53
 #, no-c-format
 msgid ""
 "We declare a resource by annotating a producer field with a component "
@@ -111,61 +100,17 @@
 "<literal>@PersistenceUnit</literal> or <literal>@WebServiceRef</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:57
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @WebServiceRef(lookup=\"java:app/service/Catalog\")\n"
-"Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Resource(lookup=\"java:global/env/jdbc/CustomerDatasource"
-"\") \n"
-"@CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceContext(unitName=\"CustomerDatabase\")\n"
-"@CustomerDatabase EntityManager customerDatabasePersistenceContext;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:63
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceUnit(unitName=\"CustomerDatabase\") \n"
-"@CustomerDatabase EntityManagerFactory customerDatabasePersistenceUnit;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @EJB(ejbLink=\"../their.jar#PaymentService\") \n"
-"PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:67
 #, no-c-format
 msgid "The field may be static (but not final)."
 msgstr ""
 
 #. Tag: para
-#: resources.xml:69
 #, no-c-format
 msgid "A resource declaration really contains two pieces of information:"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:73
 #, no-c-format
 msgid ""
 "the JNDI name, EJB link, persistence unit name, or other metadata needed to "
@@ -173,7 +118,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:77
 #, no-c-format
 msgid ""
 "the type and qualifiers that we will use to inject the reference into our "
@@ -181,7 +125,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:82
 #, no-c-format
 msgid ""
 "It might feel strange to be declaring resources in Java code. Isn't this "
@@ -191,53 +134,16 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:90
 #, no-c-format
 msgid "Typesafe resource injection"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:92
 #, no-c-format
 msgid "These resources can now be injected in the usual way."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:96
-#, no-c-format
-msgid "<![CDATA[@Inject Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:97
-#, no-c-format
-msgid "<![CDATA[@Inject @CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:98
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManager "
-"customerDatabaseEntityManager;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManagerFactory "
-"customerDatabaseEntityManagerFactory;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:100
-#, no-c-format
-msgid "<![CDATA[@Inject PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:102
 #, no-c-format
 msgid ""
 "The bean type and qualifiers of the resource are determined by the producer "
@@ -245,7 +151,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:106
 #, no-c-format
 msgid ""
 "It might seem like a pain to have to write these extra producer field "
@@ -256,26 +161,12 @@
 "and more typesafe to write"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:113
-#, no-c-format
-msgid "@Inject @CustomerDatabase EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:115
 #, no-c-format
 msgid "instead of"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:117
-#, no-c-format
-msgid "@PersistenceContext(unitName=\"CustomerDatabase\") EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:119
 #, no-c-format
 msgid "all over the place?"
 msgstr ""

Modified: doc/trunk/reference/zh-CN/ri-spi.po
===================================================================
--- doc/trunk/reference/zh-CN/ri-spi.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/ri-spi.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-27 13:50+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: ri-spi.xml:4
 #, fuzzy, no-c-format
 msgid "Integrating Weld into other environments"
 msgstr "将Web Bean参考实现整合到其他环境中"
 
 #. Tag: para
-#: ri-spi.xml:6
 #, no-c-format
 msgid ""
 "If you want to use Weld in another environment, you will need to provide "
@@ -29,13 +27,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:12
 #, fuzzy, no-c-format
 msgid "Enterprise Services"
 msgstr "资源加载"
 
 #. Tag: para
-#: ri-spi.xml:13
 #, no-c-format
 msgid ""
 "If you just want to use managed beans, and not take advantage of enterprise "
@@ -47,7 +43,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:21
 #, no-c-format
 msgid ""
 "All SPIs and APIs described have extensive JavaDoc, which spell out the "
@@ -55,13 +50,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:27
 #, fuzzy, no-c-format
 msgid "The Weld SPI"
 msgstr "Web Bean的参考实现SPI"
 
 #. Tag: para
-#: ri-spi.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "The Weld SPI is located in the <literal>weld-spi</literal> module, and "
@@ -74,7 +67,6 @@
 "为,你需要其他的SPI。"
 
 #. Tag: para
-#: ri-spi.xml:35
 #, no-c-format
 msgid ""
 "All interfaces in the SPI support the decorator pattern and provide a "
@@ -85,7 +77,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:41
 #, no-c-format
 msgid ""
 "Weld supports multiple environments. An environment is defined by an "
@@ -99,7 +90,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:50
 #, no-c-format
 msgid ""
 "Weld uses a generic-typed service registry to allow services to be "
@@ -108,18 +98,16 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:56
 #, no-c-format
 msgid "Deployment structure"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:58
 #, no-c-format
 msgid ""
 "An application is often comprised of a number of modules. For example, a "
 "Java EE deployment may contain a number of EJB modules (containing business "
-"logic) and WAR modules (containing the user interface). A container may "
+"logic) and war modules (containing the user interface). A container may "
 "enforce certain <emphasis>accessibility</emphasis> rules which limit the "
 "visibility of classes between modules. CDI allows these same rules to apply "
 "to bean and observer method resolution. As the accessibility rules vary "
@@ -129,13 +117,12 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:67
 #, no-c-format
 msgid ""
 "The CDI specification discusses <emphasis>Bean Deployment Archives</"
-"emphasis> (BDAs)&#8212;archives which are marked as containing beans which "
-"should be deployed to the CDI container, and made available for injection "
-"and resolution. Weld reuses this description of <emphasis>Bean Deployment "
+"emphasis> (BDAs)—archives which are marked as containing beans which should "
+"be deployed to the CDI container, and made available for injection and "
+"resolution. Weld reuses this description of <emphasis>Bean Deployment "
 "Archives</emphasis> in its deployment structure SPI. Each deployment exposes "
 "the BDAs which it contains; each BDA may also reference other which it can "
 "access. Together, the transitive closure of this graph forms the beans which "
@@ -143,7 +130,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:76
 #, no-c-format
 msgid ""
 "To describe the deployment structure to Weld, the container should provide "
@@ -157,7 +143,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:85
 #, no-c-format
 msgid ""
 "As programmatically described beans may result in additional BDAs being "
@@ -167,13 +152,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:92
 #, no-c-format
 msgid "Virtual BDAs"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:93
 #, no-c-format
 msgid ""
 "In a strict container, each BDA might have to explicitly specify which other "
@@ -184,7 +167,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:100
 #, no-c-format
 msgid ""
 "A container, might, for example, use a flat accessibility structure for the "
@@ -193,11 +175,10 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:106
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it's contents to be discovered by Weld&#8212;<literal>BeanDeploymentArchive."
+"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
 "getBeanClasses()</literal> must return all the classes in the BDA, "
 "<literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the "
 "deployment descriptors in the archive, and <literal>BeanDeploymentArchive."
@@ -206,7 +187,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:114
 #, no-c-format
 msgid ""
 "BDA X may also reference another BDA Y whose beans can be resolved by, and "
@@ -217,13 +197,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:122
 #, no-c-format
 msgid "Matching the classloader structure for the deployment"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:124
 #, no-c-format
 msgid ""
 "In practice, you can regard the deployment structure represented by "
@@ -234,7 +212,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:132
 #, no-c-format
 msgid ""
 "To specify the directly accessible BDAs, the container should provide an "
@@ -243,7 +220,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:138
 #, no-c-format
 msgid ""
 "Weld allows the container to describe a circular graph, and will convert a "
@@ -251,7 +227,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:144
 #, no-c-format
 msgid ""
 "Certain services are provided for the whole deployment, whilst some are "
@@ -261,13 +236,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:153
 #, no-c-format
 msgid "EJB descriptors"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:155
 #, no-c-format
 msgid ""
 "Weld delegates EJB 3 bean discovery to the container so that it doesn't "
@@ -276,7 +249,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:160
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>EjbDescriptor</literal> should return the relevant metadata as "
@@ -289,13 +261,11 @@
 "例的jndi名字)"
 
 #. Tag: title
-#: ri-spi.xml:169
 #, no-c-format
 msgid "EE resource injection and resolution services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:171
 #, no-c-format
 msgid ""
 "All the EE resource services are per-BDA services, and may be provided using "
@@ -304,37 +274,33 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:176
 #, no-c-format
 msgid ""
 "The integrator may choose to provide all EE resource injection services "
 "themselves, using another library or framework. In this case the integrator "
 "should use the <literal>EE</literal> environment, and implement the <xref "
-"linkend=\"injection.services\"/> SPI."
+"linkend=\"injection.services\" /> SPI."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:182
 #, no-c-format
 msgid ""
 "Alternatively, the integrator may choose to use CDI to provide EE resource "
 "injection. In this case, the <literal>EE_INJECT</literal> environment should "
 "be used, and the integrator should implement the <xref linkend=\"ejb."
-"services.resolution\"/>, <xref linkend=\"resource.services\"/> and <xref "
-"linkend=\"jpa.services\"/>."
+"services.resolution\" />, <xref linkend=\"resource.services\" /> and <xref "
+"linkend=\"jpa.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:189
 #, no-c-format
 msgid ""
 "CDI only provides annotation-based EE resource injection; if you wish to "
 "provide deployment descriptor (e.g. <literal>ejb-jar.xml</literal>) "
-"injection, you must use <xref linkend=\"injection.services\"/>."
+"injection, you must use <xref linkend=\"injection.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:195
 #, no-c-format
 msgid ""
 "If the container performs EE resource injection, the injected resources must "
@@ -343,7 +309,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:201
 #, no-c-format
 msgid ""
 "If you use a non-EE environment then you may implement any of the EE service "
@@ -352,49 +317,48 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:210
 #, no-c-format
 msgid "EJB services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:212
 #, no-c-format
 msgid "EJB services are split between two interfaces which are both per-BDA."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:216
 #, no-c-format
 msgid ""
 "<literal>EJBServices</literal> is used to resolve local EJBs used to back "
 "session beans, and must always be provided in an EE environment. "
 "<literal>EJBServices.resolveEjb(EjbDescriptor ejbDescriptor)</literal> "
-"returns a wrapper&#8212;<literal>SessionObjectReference</literal>&#8212;"
-"around the EJB reference. This wrapper allows Weld to request a reference "
-"that implements the given business interface, and, in the case of SFSBs, "
-"both request the removal of the EJB from the container and query whether the "
-"EJB has been previously removed."
+"returns a wrapper—<literal>SessionObjectReference</literal>—around the EJB "
+"reference. This wrapper allows Weld to request a reference that implements "
+"the given business interface, and, in the case of SFSBs, both request the "
+"removal of the EJB from the container and query whether the EJB has been "
+"previously removed."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:225
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>EJBResolutionServices.resolveEjb(InjectionPoint ij)</literal> "
 "allows the resolution of <literal>@EJB</literal> (for injection into managed "
 "beans). This service is not required if the implementation of <xref linkend="
-"\"injection.services\"/> takes care of <literal>@EJB</literal> injection."
+"\"injection.services\" /> takes care of <literal>@EJB</literal> injection."
 msgstr ""
+"<literal>@EJB</literal>, <literal>@PersistenceContext</literal> 和 "
+"<literal>@Resource</literal> 的解析被委托给容器。你必须提供一个 <literal>org."
+"jboss.webbeans.ejb.spi.EjbResolver</literal> 实现来完成这些工作。每次解析请求"
+"到来时,Web Beans都将 <literal>javax.inject.manager.InjectionPoint</literal> "
+"以及 <literal>NamingContext</literal> 传递进来以便解析。"
 
 #. Tag: title
-#: ri-spi.xml:234
 #, no-c-format
 msgid "JPA services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:236
 #, no-c-format
 msgid ""
 "Just as EJB resolution is delegated to the container, resolution of "
@@ -404,23 +368,25 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:242
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "To allow JPA integration, the <literal>JpaServices</literal> interface "
 "should be implemented. This service is not required if the implementation of "
-"<xref linkend=\"injection.services\"/> takes care of "
+"<xref linkend=\"injection.services\" /> takes care of "
 "<literal>@PersistenceContext</literal> injection."
 msgstr ""
+"<literal>@EJB</literal>, <literal>@PersistenceContext</literal> 和 "
+"<literal>@Resource</literal> 的解析被委托给容器。你必须提供一个 <literal>org."
+"jboss.webbeans.ejb.spi.EjbResolver</literal> 实现来完成这些工作。每次解析请求"
+"到来时,Web Beans都将 <literal>javax.inject.manager.InjectionPoint</literal> "
+"以及 <literal>NamingContext</literal> 传递进来以便解析。"
 
 #. Tag: title
-#: ri-spi.xml:251
 #, no-c-format
 msgid "Transaction Services"
 msgstr "事务服务"
 
 #. Tag: para
-#: ri-spi.xml:253
 #, fuzzy, no-c-format
 msgid ""
 "Weld delegates JTA activities to the container. The SPI provides a couple "
@@ -431,7 +397,6 @@
 "<literal>TransactionServices</literal> 接口来轻松完成这个任务。"
 
 #. Tag: para
-#: ri-spi.xml:258
 #, no-c-format
 msgid ""
 "Any <literal>javax.transaction.Synchronization</literal> implementation may "
@@ -444,7 +409,6 @@
 "到EJB使用的JTA事务管理器。"
 
 #. Tag: para
-#: ri-spi.xml:264
 #, no-c-format
 msgid ""
 "To make it easier to determine whether or not a transaction is currently "
@@ -457,20 +421,18 @@
 "JTA事务管理器。"
 
 #. Tag: title
-#: ri-spi.xml:272
 #, fuzzy, no-c-format
 msgid "Resource Services"
 msgstr "资源加载"
 
 #. Tag: para
-#: ri-spi.xml:274
 #, fuzzy, no-c-format
 msgid ""
 "The resolution of <literal>@Resource</literal> (for injection into managed "
 "beans) is delegated to the container. You must provide an implementation of "
 "<literal>ResourceServices</literal> which provides these operations. This "
 "service is not required if the implementation of <xref linkend=\"injection."
-"services\"/> takes care of <literal>@Resource</literal> injection."
+"services\" /> takes care of <literal>@Resource</literal> injection."
 msgstr ""
 "<literal>@EJB</literal>, <literal>@PersistenceContext</literal> 和 "
 "<literal>@Resource</literal> 的解析被委托给容器。你必须提供一个 <literal>org."
@@ -479,13 +441,11 @@
 "以及 <literal>NamingContext</literal> 传递进来以便解析。"
 
 #. Tag: title
-#: ri-spi.xml:283
 #, fuzzy, no-c-format
 msgid "Injection Services"
 msgstr "事务服务"
 
 #. Tag: para
-#: ri-spi.xml:285
 #, no-c-format
 msgid ""
 "An integrator may wish to use <literal>InjectionServices</literal> to "
@@ -496,7 +456,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:291
 #, no-c-format
 msgid ""
 "<literal>InjectionServices</literal> provides a very simple contract, the "
@@ -507,7 +466,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:298
 #, no-c-format
 msgid ""
 "The <literal>InjectionContext</literal> can be used to discover additional "
@@ -518,13 +476,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:307
 #, fuzzy, no-c-format
 msgid "Security Services"
 msgstr "资源加载"
 
 #. Tag: para
-#: ri-spi.xml:309
 #, no-c-format
 msgid ""
 "In order to obtain the <literal>Principal</literal> representing the current "
@@ -533,13 +489,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:317
 #, fuzzy, no-c-format
 msgid "Bean Validation Services"
 msgstr "事务服务"
 
 #. Tag: para
-#: ri-spi.xml:319
 #, no-c-format
 msgid ""
 "In order to obtain the default <literal>ValidatorFactory</literal> for the "
@@ -548,13 +502,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:327
 #, no-c-format
 msgid "Identifying the BDA being addressed"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:329
 #, no-c-format
 msgid ""
 "When a client makes a request to an application which uses Weld, the request "
@@ -565,43 +517,39 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:337
 #, no-c-format
 msgid ""
-"Most Servlet contains use a classloader-per-WAR, this may provide a good way "
+"Most Servlet contains use a classloader-per-war, this may provide a good way "
 "to identify the BDA in use for web requests."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:343
 #, no-c-format
 msgid ""
 "When Weld needs to identify the BDA, it will use one of these services, "
 "depending on what is servicing the request:"
 msgstr ""
 
-#. Tag: literal
-#: ri-spi.xml:350
+#. Tag: term
 #, no-c-format
-msgid "ServletServices.getBeanDeploymentArchive(ServletContext ctx)"
+msgid ""
+"<literal>ServletServices.getBeanDeploymentArchive(ServletContext ctx)</"
+"literal>"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:352
 #, no-c-format
 msgid ""
-"Identify the WAR in use. The <literal>ServletContext</literal> is provided "
+"Identify the war in use. The <literal>ServletContext</literal> is provided "
 "for additional context."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:362
 #, no-c-format
 msgid "The bean store"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:364
 #, fuzzy, no-c-format
 msgid ""
 "Weld uses a map like structure to store bean instances - <literal>org.jboss."
@@ -614,13 +562,11 @@
 "ConcurrentHashMapBeanStore</literal> 非常有用。"
 
 #. Tag: title
-#: ri-spi.xml:372
 #, no-c-format
 msgid "The application context"
 msgstr "应用上下文"
 
 #. Tag: para
-#: ri-spi.xml:374
 #, fuzzy, no-c-format
 msgid ""
 "Weld expects the Application Server or other container to provide the "
@@ -634,13 +580,11 @@
 "ConcurrentHashMapBeanStore</literal> 非常有用。"
 
 #. Tag: title
-#: ri-spi.xml:383
 #, fuzzy, no-c-format
 msgid "Initialization and shutdown"
 msgstr "自举和停止"
 
 #. Tag: para
-#: ri-spi.xml:384
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>org.jboss.weld.bootstrap.api.Bootstrap</literal> interface "
@@ -655,7 +599,6 @@
 "literal>) ,告诉它使用的SPI,然后请求容器启动。 "
 
 #. Tag: para
-#: ri-spi.xml:391
 #, fuzzy, no-c-format
 msgid ""
 "The bootstrap is split into phases, container initialization, bean "
@@ -669,7 +612,6 @@
 "Bean;和验证所有的Bean。"
 
 #. Tag: para
-#: ri-spi.xml:398
 #, fuzzy, no-c-format
 msgid ""
 "To initialize the container, you call <literal>Bootstrap.startInitialization"
@@ -686,7 +628,6 @@
 "literal>,你必须在调用<literal>initialize()</literal>之前设置它们。"
 
 #. Tag: para
-#: ri-spi.xml:405
 #, fuzzy, no-c-format
 msgid ""
 "Having called <literal>startInitialization()</literal>, the "
@@ -697,7 +638,6 @@
 "getManager()</literal>来获得<literal>管理器</literal>。"
 
 #. Tag: para
-#: ri-spi.xml:410
 #, no-c-format
 msgid ""
 "To deploy the discovered beans, call <literal>Bootstrap.deployBeans()</"
@@ -705,7 +645,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:414
 #, no-c-format
 msgid ""
 "To validate the deployed beans, call <literal>Bootstrap.validateBeans()</"
@@ -713,7 +652,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:418
 #, no-c-format
 msgid ""
 "To place the container into a state where it can service requests, call "
@@ -721,7 +659,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:423
 #, fuzzy, no-c-format
 msgid ""
 "To shutdown the container you call <literal>Bootstrap.shutdown()</literal>. "
@@ -731,13 +668,11 @@
 "行一些必要的清洁工作。"
 
 #. Tag: title
-#: ri-spi.xml:431
 #, no-c-format
 msgid "Resource loading"
 msgstr "资源加载"
 
 #. Tag: para
-#: ri-spi.xml:433
 #, fuzzy, no-c-format
 msgid ""
 "Weld needs to load classes and resources from the classpath at various "
@@ -751,13 +686,11 @@
 "的话,你可以实现<literal>org.jboss.webbeans.spi.ResourceLoader</literal> :"
 
 #. Tag: title
-#: ri-spi.xml:445
 #, no-c-format
 msgid "The contract with the container"
 msgstr "容器的合约"
 
 #. Tag: para
-#: ri-spi.xml:447
 #, fuzzy, no-c-format
 msgid ""
 "There are a number of requirements that Weld places on the container for "
@@ -765,13 +698,11 @@
 msgstr "为了接口实现之外的正确的功能,Web Beans参考实现对容器有大量的要求。"
 
 #. Tag: term
-#: ri-spi.xml:454
 #, no-c-format
 msgid "Classloader isolation"
 msgstr "类加载器隔离"
 
 #. Tag: para
-#: ri-spi.xml:458
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into an environment that supports deployment of "
@@ -782,13 +713,11 @@
 "置或者自动化方式为每个Web Bean应用激活类加载器隔离。"
 
 #. Tag: term
-#: ri-spi.xml:466
 #, no-c-format
 msgid "Servlet"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:470
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a Servlet environment you must register "
@@ -801,7 +730,6 @@
 "WebBeansListener</literal> 注册为一个Servlet监听器。"
 
 #. Tag: para
-#: ri-spi.xml:475
 #, no-c-format
 msgid ""
 "You must ensure that that <literal>WeldListener.contextInitialized()</"
@@ -810,13 +738,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:482
 #, no-c-format
-msgid "<term>JSF</term>"
+msgid "JSF"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:487
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -827,7 +753,6 @@
 "WebBeansListener</literal> 注册为一个Servlet监听器。"
 
 #. Tag: para
-#: ri-spi.xml:492
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -839,7 +764,6 @@
 "WebBeansListener</literal> 注册为一个Servlet监听器。"
 
 #. Tag: para
-#: ri-spi.xml:497
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -851,7 +775,6 @@
 "WebBeansListener</literal> 注册为一个Servlet监听器。"
 
 #. Tag: para
-#: ri-spi.xml:502
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -863,7 +786,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:509
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -873,7 +795,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:516 ri-spi.xml:562
 #, no-c-format
 msgid ""
 "There are a number of ways you can obtain the bean manager for the module. "
@@ -883,7 +804,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:523
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -898,19 +818,16 @@
 "以安全地向所有Servlet部署注册。"
 
 #. Tag: para
-#: ri-spi.xml:531
 #, no-c-format
 msgid "Weld only supports JSF 1.2 and above."
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:538
 #, no-c-format
-msgid "<term>JSP</term>"
+msgid "JSP"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:543
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must register "
@@ -922,7 +839,6 @@
 "WebBeansListener</literal> 注册为一个Servlet监听器。"
 
 #. Tag: para
-#: ri-spi.xml:548
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -933,7 +849,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:555
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -943,27 +858,26 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:572
 #, no-c-format
 msgid "Session Bean Interceptor"
 msgstr "会话Bean拦截器"
 
 #. Tag: para
-#: ri-spi.xml:576
 #, fuzzy, no-c-format
 msgid ""
-"If you are integrating Weld into an EJB environment you must register "
-"<literal>org.jboss.weld.ejb.SessionBeanInterceptor</literal> as a EJB "
-"interceptor for all EJBs in the application, either automatically, or "
-"through user configuration, for each CDI application which uses enterprise "
-"beans."
+"If you are integrating Weld into an EJB environment you must register the "
+"<literal>aroundInvoke</literal> method of <literal>org.jboss.weld.ejb."
+"SessionBeanInterceptor</literal> as a EJB around-invoke interceptor for all "
+"EJBs in the application, either automatically, or through user "
+"configuration, for each CDI application which uses enterprise beans. If you "
+"are running in a EJB 3.1 environment, you should register this as an around-"
+"timeout interceptor as well."
 msgstr ""
 "如果你将Web Beans整合到EJB环境中,对每个使用企业级Bean的Web Bean应用,你需要"
 "以用户配置或者自动化形式将 <literal>org.jboss.webbeans.ejb."
 "SessionBeanInterceptor</literal> 注册为应用中所有EJB的EJB拦截器。"
 
 #. Tag: para
-#: ri-spi.xml:583
 #, no-c-format
 msgid ""
 "You must register the <literal>SessionBeanInterceptor</literal> as the inner "
@@ -973,13 +887,11 @@
 "最内部的拦截器。"
 
 #. Tag: term
-#: ri-spi.xml:591
 #, fuzzy, no-c-format
 msgid "The <literal>weld-core.jar</literal>"
 msgstr "<literal>webbeans-ri.jar</literal>"
 
 #. Tag: para
-#: ri-spi.xml:595
 #, no-c-format
 msgid ""
 "Weld can reside on an isolated classloader, or on a shared classloader. If "
@@ -991,7 +903,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:601
 #, no-c-format
 msgid ""
 "You can provide your own implementation of <literal>Singleton</literal> and "
@@ -1000,7 +911,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:606
 #, no-c-format
 msgid ""
 "Weld also provides an implementation of Thread Context Classloader per "
@@ -1008,13 +918,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:613
 #, no-c-format
 msgid "Binding the manager in JNDI"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:617
 #, no-c-format
 msgid ""
 "You should bind the bean manager for the bean deployment archive into JNDI "
@@ -1025,13 +933,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:627
 #, no-c-format
 msgid "Performing CDI injection on Java EE component classes"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:631
 #, no-c-format
 msgid ""
 "The CDI specification requires the container to provide injection into non-"
@@ -1043,7 +949,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:639
 #, no-c-format
 msgid ""
 "The CDI specification also requires that a <literal>ProcessInjectionTarget</"
@@ -1054,7 +959,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:646
 #, no-c-format
 msgid ""
 "To help the integrator, Weld provides <literal>WeldManager."
@@ -1062,36 +966,7 @@
 "<literal>InjectionTarget</literal> to use."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:651
-#, no-c-format
-msgid ""
-"<![CDATA[// Fire ProcessInjectionTarget, returning the InjectionTarget\n"
-"// to use\n"
-"InjectionTarget it = weldBeanManager.fireProcessInjectionTarget(clazz);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = beanManager.createCreationalContext(null);\n"
-"\n"
-"// Produce the instance, performing any constructor injection required\n"
-"Object instance = it.produce();\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
-
 #. Tag: para
-#: ri-spi.xml:652
 #, no-c-format
 msgid ""
 "The container may intersperse other operations between these calls. Further, "
@@ -1100,7 +975,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:656
 #, no-c-format
 msgid ""
 "When performing injections on EJBs you must use the Weld-defined SPI, "
@@ -1109,42 +983,6 @@
 "EJB."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:661
-#, no-c-format
-msgid ""
-"<![CDATA[// Obtain the EjbDescriptor for the EJB\n"
-"// You may choose to use this utility method to get the descriptor\n"
-"EjbDescriptor<?> ejbDescriptor = beanManager.getEjbDescriptor(ejbName);\n"
-"\n"
-"// Get an the Bean object\n"
-"Bean<?> bean = beanManager.getBean(ejbDescriptor);\n"
-"\n"
-"// Create the injection target\n"
-"InjectionTarget it = deploymentBeanManager.createInjectionTarget"
-"(ejbDescriptor);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = deploymentBeanManager.createCreationalContext"
-"(bean);\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// You may choose to have CDI call the post construct and pre destroy\n"
-"// lifecycle callbacks\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
-
 #, fuzzy
 #~ msgid ""
 #~ "Currently Web Beans only runs in JBoss AS 5; integrating the RI into "

Modified: doc/trunk/reference/zh-CN/scopescontexts.po
===================================================================
--- doc/trunk/reference/zh-CN/scopescontexts.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/scopescontexts.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-30 09:18+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: scopescontexts.xml:5
 #, no-c-format
 msgid "Scopes and contexts"
 msgstr "范围和上下文"
 
 #. Tag: para
-#: scopescontexts.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "So far, we've seen a few examples of <emphasis>scope type annotations</"
@@ -33,26 +31,22 @@
 "Bean实例。根据Web Beans规范,一个范围决定:"
 
 #. Tag: para
-#: scopescontexts.xml:16
 #, fuzzy, no-c-format
 msgid "When a new instance of any bean with that scope is created"
 msgstr "该范围的Web Bean的一个实例何时被创建"
 
 #. Tag: para
-#: scopescontexts.xml:19
 #, fuzzy, no-c-format
 msgid "When an existing instance of any bean with that scope is destroyed"
 msgstr "该范围的Web Bean实例何时被销毁"
 
 #. Tag: para
-#: scopescontexts.xml:22
 #, fuzzy, no-c-format
 msgid ""
 "Which injected references refer to any instance of a bean with that scope"
 msgstr "注入的引用指向该范围的Web Bean的哪个实例"
 
 #. Tag: para
-#: scopescontexts.xml:27
 #, fuzzy, no-c-format
 msgid ""
 "For example, if we have a session-scoped bean, <literal>CurrentUser</"
@@ -68,7 +62,6 @@
 "<literal>CurrentUser</literal>时被自动创建,在会话结束时被自动销毁。"
 
 #. Tag: para
-#: scopescontexts.xml:35
 #, no-c-format
 msgid ""
 "JPA entities aren't a great fit for this model. Entities have their whole "
@@ -81,13 +74,11 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:45
 #, no-c-format
 msgid "Scope types"
 msgstr "范围类型"
 
 #. Tag: para
-#: scopescontexts.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "CDI features an <emphasis>extensible context model</emphasis>. It's possible "
@@ -96,22 +87,7 @@
 "Web Bean有一个特性是<emphasis>可扩展的上下文模型</emphasis>。我们可以创建一个"
 "新的范围类型注释来定一个新的范围:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ScopeType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"public @interface ClusterScoped {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"@ScopeType\n"
-"public @interface ClusterScoped {}]]>"
-
 #. Tag: para
-#: scopescontexts.xml:54
 #, fuzzy, no-c-format
 msgid ""
 "Of course, that's the easy part of the job. For this scope type to be "
@@ -126,73 +102,53 @@
 "个非常具备挑战的技术任务,这常常只能由开发编程框架的专家完成。"
 
 #. Tag: para
-#: scopescontexts.xml:61
 #, fuzzy, no-c-format
 msgid ""
 "We can apply a scope type annotation to a bean implementation class to "
 "specify the scope of the bean:"
 msgstr "我们可以在Web Bean实现类中应用范围类型注释来指定Web Bean的范围:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-msgstr ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:67
 #, fuzzy, no-c-format
 msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr "通常,你将会使用一个Web Bean内置的范围。"
 
 #. Tag: title
-#: scopescontexts.xml:72
 #, no-c-format
 msgid "Built-in scopes"
 msgstr "内置范围"
 
 #. Tag: para
-#: scopescontexts.xml:74
 #, fuzzy, no-c-format
 msgid "CDI defines four built-in scopes:"
 msgstr "Web Beans定义了四个内置范围:"
 
-#. Tag: literal
-#: scopescontexts.xml:78
-#, no-c-format
-msgid "@RequestScoped"
-msgstr "@RequestScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@RequestScoped</literal>"
+msgstr "<literal>@New</literal>注释"
 
-#. Tag: literal
-#: scopescontexts.xml:81
-#, no-c-format
-msgid "@SessionScoped"
-msgstr "@SessionScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@SessionScoped</literal>"
+msgstr "<literal>@New</literal>注释"
 
-#. Tag: literal
-#: scopescontexts.xml:84
-#, no-c-format
-msgid "@ApplicationScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@ApplicationScoped</literal>"
 msgstr "@ApplicationScoped"
 
-#. Tag: literal
-#: scopescontexts.xml:87
-#, no-c-format
-msgid "@ConversationScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@ConversationScoped</literal>"
 msgstr "@ConversationScoped"
 
 #. Tag: para
-#: scopescontexts.xml:91
 #, fuzzy, no-c-format
 msgid "For a web application that uses CDI:"
 msgstr "对于使用Web Beans的Web应用:"
 
 #. Tag: para
-#: scopescontexts.xml:95
 #, no-c-format
 msgid ""
 "any servlet request has access to active request, session and application "
@@ -200,13 +156,11 @@
 msgstr "任何Servlet请求可以访问激活的请求,会话和应用范围,并且"
 
 #. Tag: para
-#: scopescontexts.xml:100
 #, no-c-format
 msgid "any JSF request has access to an active conversation scope."
 msgstr "任何JSF请求可以访问一个激活的对话范围"
 
 #. Tag: para
-#: scopescontexts.xml:105
 #, no-c-format
 msgid ""
 "A CDI extension can implement support for the conversation scope in other "
@@ -214,49 +168,41 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:108
 #, no-c-format
 msgid "The request and application scopes are also active:"
 msgstr "在下列情况下请求和应用范围是激活的:"
 
 #. Tag: para
-#: scopescontexts.xml:112
 #, no-c-format
 msgid "during invocations of EJB remote methods,"
 msgstr "在EJB远程方法调用期间,"
 
 #. Tag: para
-#: scopescontexts.xml:115
 #, fuzzy, no-c-format
 msgid "during invocations of EJB asynchronous methods,"
 msgstr "在EJB远程方法调用期间,"
 
 #. Tag: para
-#: scopescontexts.xml:118
 #, no-c-format
 msgid "during EJB timeouts,"
 msgstr "在EJB超时期间,"
 
 #. Tag: para
-#: scopescontexts.xml:121
 #, fuzzy, no-c-format
 msgid "during message delivery to a message-driven bean,"
 msgstr "在消息发送给消息驱动Bean的期间,"
 
 #. Tag: para
-#: scopescontexts.xml:124
 #, fuzzy, no-c-format
 msgid "during message delivery to a <literal>MessageListener</literal>, and"
 msgstr "在消息发送给消息驱动Bean的期间,"
 
 #. Tag: para
-#: scopescontexts.xml:127
 #, no-c-format
 msgid "during web service invocations."
 msgstr "在Web Service调用期间。"
 
 #. Tag: para
-#: scopescontexts.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "If the application tries to invoke a bean with a scope that does not have an "
@@ -267,7 +213,6 @@
 "管理器在运行时将抛出一个<literal>ContextNotActiveException</literal>异常。"
 
 #. Tag: para
-#: scopescontexts.xml:136
 #, no-c-format
 msgid ""
 "Managed beans with scope <literal>@SessionScoped</literal> or "
@@ -276,7 +221,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:141
 #, no-c-format
 msgid ""
 "Three of the four built-in scopes should be extremely familiar to every Java "
@@ -287,13 +231,11 @@
 "时间来讨论他们。不过有一个范围是新的。"
 
 #. Tag: title
-#: scopescontexts.xml:149
 #, no-c-format
 msgid "The conversation scope"
 msgstr "对话范围"
 
 #. Tag: para
-#: scopescontexts.xml:151
 #, fuzzy, no-c-format
 msgid ""
 "The conversation scope is a bit like the traditional session scope in that "
@@ -306,13 +248,11 @@
 "还有很多地方和会话范围不一样:"
 
 #. Tag: para
-#: scopescontexts.xml:159
 #, no-c-format
 msgid "is demarcated explicitly by the application, and"
 msgstr "它通过应用显式地声明,并且"
 
 #. Tag: para
-#: scopescontexts.xml:162
 #, no-c-format
 msgid ""
 "holds state associated with a particular web browser tab in a JSF "
@@ -321,19 +261,17 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:169
 #, fuzzy, no-c-format
 msgid ""
-"A conversation represents a task&#8212;a unit of work from the point of view "
-"of the user. The conversation context holds state associated with what the "
-"user is currently working on. If the user is doing multiple things at the "
-"same time, there are multiple conversations."
+"A conversation represents a task—a unit of work from the point of view of "
+"the user. The conversation context holds state associated with what the user "
+"is currently working on. If the user is doing multiple things at the same "
+"time, there are multiple conversations."
 msgstr ""
 "从用户角度出发,一个对话代表一个任务,或者一个工作单元。用户当前工作相关的状"
 "态由对话上下文维护。如果用户同时处理多个事情,就会有多个对话与之对应。"
 
 #. Tag: para
-#: scopescontexts.xml:175
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context is active during any JSF request. Most "
@@ -346,13 +284,11 @@
 "<emphasis>长时对话</emphasis>。"
 
 #. Tag: title
-#: scopescontexts.xml:182
 #, no-c-format
 msgid "Conversation demarcation"
 msgstr "对话划分"
 
 #. Tag: para
-#: scopescontexts.xml:184
 #, fuzzy, no-c-format
 msgid ""
 "CDI provides a built-in bean for controlling the lifecycle of conversations "
@@ -361,14 +297,7 @@
 "Web Beans提供了一个内置的Web Bean来在控制一个JSF应用中对话的生命周期。这个"
 "Web Bean可以通过注入来获得:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:189
-#, fuzzy, no-c-format
-msgid "@Inject Conversation conversation;"
-msgstr "@Current Conversation conversation;"
-
 #. Tag: para
-#: scopescontexts.xml:191
 #, no-c-format
 msgid ""
 "To promote the conversation associated with the current request to a long-"
@@ -382,79 +311,13 @@
 "<literal>end()</literal>方法。"
 
 #. Tag: para
-#: scopescontexts.xml:197
 #, fuzzy, no-c-format
 msgid ""
 "In the following example, a conversation-scoped bean controls the "
 "conversation with which it is associated:"
 msgstr "在下面的例子中,一个对话范围的Web Bean控制和它关联的对话:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:201
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"   private Order order;\n"
-"   private @Inject Conversation conversation;\n"
-"   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
-"   \n"
-"   @Produces public Order getOrder() {\n"
-"      return order;\n"
-"   }\n"
-"\n"
-"   public Order createOrder() {\n"
-"      order = new Order();\n"
-"      conversation.begin();\n"
-"      return order;\n"
-"   }\n"
-"   \n"
-"   public void addLineItem(Product product, int quantity) {\n"
-"      order.add(new LineItem(product, quantity));\n"
-"   }\n"
-"\n"
-"   public void saveOrder(Order order) {\n"
-"      em.persist(order);\n"
-"      conversation.end();\n"
-"   }\n"
-"   \n"
-"   @Remove\n"
-"   public void destroy() {}\n"
-"}]]>"
-msgstr ""
-"@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"\n"
-"    private Order order;\n"
-"    private @Current Conversation conversation;\n"
-"    private @PersistenceContext(type=EXTENDED) EntityManager em;\n"
-"    \n"
-"    @Produces public Order getOrder() {\n"
-"        return order;\n"
-"    }\n"
-"\n"
-"    public Order createOrder() {\n"
-"        order = new Order();\n"
-"        conversation.begin();\n"
-"        return order;\n"
-"    }\n"
-"    \n"
-"    public void addLineItem(Product product, int quantity) {\n"
-"        order.add( new LineItem(product, quantity) );\n"
-"    }\n"
-"\n"
-"    public void saveOrder(Order order) {\n"
-"        em.persist(order);\n"
-"        conversation.end();\n"
-"    }\n"
-"    \n"
-"    @Remove\n"
-"    public void destroy() {}\n"
-"    \n"
-"}"
-
 #. Tag: para
-#: scopescontexts.xml:203
 #, fuzzy, no-c-format
 msgid ""
 "This bean is able to control its own lifecycle through use of the "
@@ -465,13 +328,11 @@
 "他一些Web Bean的生命周期完全依赖与其他对象。"
 
 #. Tag: title
-#: scopescontexts.xml:211
 #, no-c-format
 msgid "Conversation propagation"
 msgstr "对话的传播"
 
 #. Tag: para
-#: scopescontexts.xml:213
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context automatically propagates with any JSF faces request "
@@ -482,7 +343,6 @@
 "上下文将不会自动传播,例如通过一个链接来导航。"
 
 #. Tag: para
-#: scopescontexts.xml:218
 #, fuzzy, no-c-format
 msgid ""
 "We can force the conversation to propagate with a non-faces request by "
@@ -498,38 +358,16 @@
 "的名字<literal>conversation</literal>。"
 
 #. Tag: para
-#: scopescontexts.xml:225
 #, no-c-format
 msgid "Therefore, the following link propagates the conversation:"
 msgstr "因此,下面的链接能够传播对话:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:229
-#, no-c-format
-msgid ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-msgstr ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-
 #. Tag: para
-#: scopescontexts.xml:231
 #, no-c-format
 msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:235
-#, no-c-format
-msgid ""
-"<![CDATA[<h:link outcome=\"/addProduct.xhtml value=\"Add Product\">\n"
-"   <f:param name=\"cid\" value=\"#{conversation.id}\"/>\n"
-"</h:link>]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:238
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context propagates across redirects, making it very easy to "
@@ -543,21 +381,19 @@
 "求参数。"
 
 #. Tag: title
-#: scopescontexts.xml:248
 #, no-c-format
 msgid "Conversation timeout"
 msgstr "对话超时"
 
 #. Tag: para
-#: scopescontexts.xml:250
 #, fuzzy, no-c-format
 msgid ""
 "The container is permitted to destroy a conversation and all state held in "
 "its context at any time in order to conserve resources. A CDI implementation "
-"will normally do this on the basis of some kind of timeout&#8212;though this "
-"is not required by the specification. The timeout is the period of "
-"inactivity before the conversation is destroyed (as opposed to the amount of "
-"time the conversation is active)."
+"will normally do this on the basis of some kind of timeout—though this is "
+"not required by the specification. The timeout is the period of inactivity "
+"before the conversation is destroyed (as opposed to the amount of time the "
+"conversation is active)."
 msgstr ""
 "Web Bean管理器可以在任何时候销毁一个对话及其上下文中维护的所有状态,这样的设"
 "计可以降低资源的消耗。一个Web Bean管理器的实现将根据超时&#151;设置自动的完成"
@@ -565,7 +401,6 @@
 "活时间。"
 
 #. Tag: para
-#: scopescontexts.xml:257
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Conversation</literal> object provides a method to set the "
@@ -575,20 +410,12 @@
 "<literal>Conversation</literal>对象提供一个方法来设置超时。这个方法可以让Web "
 "Bean管理器忽略原来的配置。"
 
-#. Tag: programlisting
-#: scopescontexts.xml:262
-#, no-c-format
-msgid "conversation.setTimeout(timeoutInMillis);"
-msgstr "conversation.setTimeout(timeoutInMillis);"
-
 #. Tag: title
-#: scopescontexts.xml:269
 #, fuzzy, no-c-format
 msgid "The singleton pseudo-scope"
 msgstr "依赖的伪范围"
 
 #. Tag: para
-#: scopescontexts.xml:271
 #, fuzzy, no-c-format
 msgid ""
 "In addition to the four built-in scopes, CDI also supports two "
@@ -600,7 +427,6 @@
 "这个范围是没有显式设置范围类型的Web Bean的默认范围。"
 
 #. Tag: para
-#: scopescontexts.xml:277
 #, no-c-format
 msgid ""
 "Unlike the other scopes, which belong to the package <literal>javax."
@@ -609,7 +435,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:283
 #, no-c-format
 msgid ""
 "You can guess what \"singleton\" means here. It means a bean that is "
@@ -624,7 +449,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:292
 #, no-c-format
 msgid ""
 "Now, if the singleton instance is a simple, immutable, serializable object "
@@ -635,7 +459,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:298
 #, no-c-format
 msgid ""
 "There are several ways to ensure that the singleton bean remains a singleton "
@@ -643,7 +466,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:302
 #, no-c-format
 msgid ""
 "have the singleton bean implement <literal>writeResolve()</literal> and "
@@ -652,7 +474,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:308
 #, no-c-format
 msgid ""
 "make sure the client keeps only a transient reference to the singleton bean, "
@@ -660,7 +481,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:313
 #, no-c-format
 msgid ""
 "give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
@@ -668,7 +488,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:320
 #, no-c-format
 msgid ""
 "A fourth, better solution is to instead use <literal>@ApplicationScoped</"
@@ -677,13 +496,11 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:326
 #, no-c-format
 msgid "The dependent pseudo-scope"
 msgstr "依赖的伪范围"
 
 #. Tag: para
-#: scopescontexts.xml:328
 #, fuzzy, no-c-format
 msgid ""
 "Finally, CDI features the so-called <emphasis>dependent pseudo-scope</"
@@ -694,20 +511,12 @@
 "这个范围是没有显式设置范围类型的Web Bean的默认范围。"
 
 #. Tag: para
-#: scopescontexts.xml:333
 #, fuzzy, no-c-format
 msgid ""
 "For example, this bean has the scope type <literal>@Dependent</literal>:"
 msgstr "例如,这个Web Bean有一个范围类型<literal>@Dependent</literal>:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:337
-#, no-c-format
-msgid "<![CDATA[public class Calculator { ... }]]>"
-msgstr "<![CDATA[public class Calculator { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:339
 #, no-c-format
 msgid ""
 "An instance of a dependent bean is never shared between different clients or "
@@ -718,7 +527,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:345
 #, no-c-format
 msgid ""
 "If a Unified EL expression refers to a dependent bean by EL name, an "
@@ -727,7 +535,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:351
 #, no-c-format
 msgid ""
 "If you need to access a bean directly by EL name in a JSF page, you probably "
@@ -742,7 +549,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:361
 #, no-c-format
 msgid ""
 "Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
@@ -750,7 +556,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:366
 #, fuzzy, no-c-format
 msgid ""
 "CDI makes it easy to obtain a dependent instance of a bean, even if the bean "
@@ -760,27 +565,18 @@
 "EJB Bean已经被声明为一个其他范围的Web Bean也没问题。"
 
 #. Tag: title
-#: scopescontexts.xml:374
 #, fuzzy, no-c-format
 msgid "The <literal>@New</literal> qualifier"
 msgstr "<literal>@New</literal>注释"
 
 #. Tag: para
-#: scopescontexts.xml:376
 #, no-c-format
 msgid ""
 "The built-in qualifier <literal>@New</literal> allows us to obtain a "
 "dependent object of a specified class."
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:380
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
-msgstr "<![CDATA[@New Calculator calculator;]]>"
-
 #. Tag: para
-#: scopescontexts.xml:382
 #, no-c-format
 msgid ""
 "The class must be a valid managed bean or session bean, but need not be an "
@@ -788,7 +584,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:384
 #, fuzzy, no-c-format
 msgid ""
 "This works even if <literal>Calculator</literal> is <emphasis>already</"
@@ -797,18 +592,7 @@
 "甚至在<literal>Calculator</literal><emphasis>已经</emphasis>通过不同的范围类"
 "型声明过的情况下也是如此。例如:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-msgstr ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:391
 #, no-c-format
 msgid ""
 "So the following injected attributes each get a different instance of "
@@ -816,24 +600,7 @@
 msgstr ""
 "所以下面注入的属性,每个都获得一个不同的 <literal>Calculator</literal>实例:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:395
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class PaymentCalc {\n"
-"   @Inject Calculator calculator;\n"
-"   @Inject @New Calculator newCalculator;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class PaymentCalc {\n"
-"\n"
-"    @Current Calculator calculator;\n"
-"    @New Calculator newCalculator;\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: scopescontexts.xml:397
 #, no-c-format
 msgid ""
 "The <literal>calculator</literal> field has a conversation-scoped instance "
@@ -847,14 +614,142 @@
 "literal>类上。"
 
 #. Tag: para
-#: scopescontexts.xml:403
 #, no-c-format
 msgid ""
 "This feature is particularly useful with producer methods, as we'll see in "
 "the next chapter."
 msgstr "这个特性对于生产者方法来说特别有用,我们将在下一章看到。"
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@ScopeType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD})\n"
+#~ "public @interface ClusterScoped {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD})\n"
+#~ "@ScopeType\n"
+#~ "public @interface ClusterScoped {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ClusterScoped\n"
+#~ "public class SecondLevelCache { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ClusterScoped\n"
+#~ "public class SecondLevelCache { ... }]]>"
+
+#~ msgid "@RequestScoped"
+#~ msgstr "@RequestScoped"
+
+#~ msgid "@SessionScoped"
+#~ msgstr "@SessionScoped"
+
+#, fuzzy
+#~ msgid "@Inject Conversation conversation;"
+#~ msgstr "@Current Conversation conversation;"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ConversationScoped @Stateful\n"
+#~ "public class OrderBuilder {\n"
+#~ "   private Order order;\n"
+#~ "   private @Inject Conversation conversation;\n"
+#~ "   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
+#~ "   \n"
+#~ "   @Produces public Order getOrder() {\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public Order createOrder() {\n"
+#~ "      order = new Order();\n"
+#~ "      conversation.begin();\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void addLineItem(Product product, int quantity) {\n"
+#~ "      order.add(new LineItem(product, quantity));\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public void saveOrder(Order order) {\n"
+#~ "      em.persist(order);\n"
+#~ "      conversation.end();\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Remove\n"
+#~ "   public void destroy() {}\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@ConversationScoped @Stateful\n"
+#~ "public class OrderBuilder {\n"
+#~ "\n"
+#~ "    private Order order;\n"
+#~ "    private @Current Conversation conversation;\n"
+#~ "    private @PersistenceContext(type=EXTENDED) EntityManager em;\n"
+#~ "    \n"
+#~ "    @Produces public Order getOrder() {\n"
+#~ "        return order;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "    public Order createOrder() {\n"
+#~ "        order = new Order();\n"
+#~ "        conversation.begin();\n"
+#~ "        return order;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void addLineItem(Product product, int quantity) {\n"
+#~ "        order.add( new LineItem(product, quantity) );\n"
+#~ "    }\n"
+#~ "\n"
+#~ "    public void saveOrder(Order order) {\n"
+#~ "        em.persist(order);\n"
+#~ "        conversation.end();\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    @Remove\n"
+#~ "    public void destroy() {}\n"
+#~ "    \n"
+#~ "}"
+
+#~ msgid ""
+#~ "<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</"
+#~ "a>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</"
+#~ "a>]]>"
+
+#~ msgid "conversation.setTimeout(timeoutInMillis);"
+#~ msgstr "conversation.setTimeout(timeoutInMillis);"
+
+#~ msgid "<![CDATA[public class Calculator { ... }]]>"
+#~ msgstr "<![CDATA[public class Calculator { ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
+#~ msgstr "<![CDATA[@New Calculator calculator;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ConversationScoped\n"
+#~ "public class Calculator { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ConversationScoped\n"
+#~ "public class Calculator { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class PaymentCalc {\n"
+#~ "   @Inject Calculator calculator;\n"
+#~ "   @Inject @New Calculator newCalculator;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class PaymentCalc {\n"
+#~ "\n"
+#~ "    @Current Calculator calculator;\n"
+#~ "    @New Calculator newCalculator;\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "holds state associated with a particular web browser tab in a JSF "
 #~ "application."
 #~ msgstr "在一个JSF应用中持有与一个特定的Web浏览标签页关联的状态。"

Modified: doc/trunk/reference/zh-CN/specialization.po
===================================================================
--- doc/trunk/reference/zh-CN/specialization.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/specialization.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-13 16:32+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: specialization.xml:5
 #, no-c-format
 msgid "Specialization, inheritance and alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:7
 #, no-c-format
 msgid ""
 "When you first start developing with CDI, you'll likely be dealing only with "
@@ -35,7 +33,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:16
 #, no-c-format
 msgid ""
 "The CDI specification recognizes two distinct scenarios in which one bean "
@@ -43,7 +40,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:23
 #, no-c-format
 msgid ""
 "The second bean <emphasis>specializes</emphasis> the first bean in certain "
@@ -52,7 +48,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:29
 #, no-c-format
 msgid ""
 "The second bean is simply reusing the Java implementation, and otherwise "
@@ -61,7 +56,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:37
 #, no-c-format
 msgid ""
 "The second case is the default assumed by CDI. It's possible to have two "
@@ -71,7 +65,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:43
 #, no-c-format
 msgid ""
 "The first case is the exception, and also requires more care. In any given "
@@ -83,13 +76,11 @@
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:51
 #, no-c-format
 msgid "Using alternative stereotypes"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:53
 #, fuzzy, no-c-format
 msgid ""
 "CDI lets you <emphasis>override</emphasis> the implementation of a bean type "
@@ -101,23 +92,7 @@
 "emphasis> 一个API实现。例如,下面的企业级Web Bean在生产环境下使提供一个"
 "<literal>PaymentProcessor</literal>接口的实现:"
 
-#. Tag: programlisting
-#: specialization.xml:59
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DefaultPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless\n"
-"public class CreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:61
 #, fuzzy, no-c-format
 msgid ""
 "But in our staging environment, we don't really want to submit payments to "
@@ -127,46 +102,12 @@
 "但在我们的阶段开发环境中,我们可以使用一个不同的Web Bean来重载这个"
 "<literal>PaymentProcessor</literal> 实现:"
 
-#. Tag: programlisting
-#: specialization.xml:66
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless\n"
-"public class CreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:68
 #, no-c-format
-msgid "<para>or</para>"
+msgid "or"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:70
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      extends DefaultPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@Stateless @Staging @Specializes\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        extends CreditCardPaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:72
 #, no-c-format
 msgid ""
 "We've already seen how we can enable this alternative by listing its class "
@@ -174,7 +115,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:77
 #, no-c-format
 msgid ""
 "But suppose we have many alternatives in the staging environment. It would "
@@ -184,67 +124,21 @@
 "this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:84
-#, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Staging {}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:86
 #, no-c-format
 msgid ""
 "Then we replace the <literal>@Alternative</literal> annotation on our bean "
 "with <literal>@Staging</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:90
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Staging\n"
-"public class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless @Staging\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:92
 #, no-c-format
 msgid ""
 "Finally, we activate the <literal>@Staging</literal> stereotype in the "
 "<literal>beans.xml</literal> descriptor:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:96
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <stereotype>org.mycompany.myapp.Staging</stereotype>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:98
 #, no-c-format
 msgid ""
 "Now, no matter how many staging beans we have, they will all be enabled at "
@@ -252,13 +146,11 @@
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:105
 #, no-c-format
 msgid "A minor problem with alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:107
 #, no-c-format
 msgid ""
 "When we enable an alternative, does that mean the default implementation is "
@@ -267,15 +159,7 @@
 "not, you could still inject the default implementation."
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:113
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @LargeTransaction PaymentProcessor paymentProcessor;]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:115
 #, no-c-format
 msgid ""
 "So we haven't completely replaced the default implementation in this "
@@ -288,7 +172,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "CDI provides a special feature, called <emphasis>specialization</emphasis>, "
@@ -301,13 +184,11 @@
 "感激它提供的特殊的安全性。"
 
 #. Tag: title
-#: specialization.xml:132
 #, no-c-format
 msgid "Using specialization"
 msgstr "使用特化"
 
 #. Tag: para
-#: specialization.xml:134
 #, no-c-format
 msgid ""
 "When the goal is to replace one bean implementation with a second, to help "
@@ -315,13 +196,11 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:141
 #, no-c-format
 msgid "directly extend the bean class of the second bean, or"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:146
 #, no-c-format
 msgid ""
 "directly override the producer method, in the case that the second bean is a "
@@ -329,30 +208,12 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:152
 #, fuzzy, no-c-format
 msgid ""
 "explicitly declare that it <emphasis>specializes</emphasis> the second bean:"
 msgstr "我们称更高优先级的Web Bean<emphasis>特化</emphasis>了它的超类。"
 
-#. Tag: programlisting
-#: specialization.xml:154
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Specializes\n"
-"public class MockCreditCardPaymentProcessor \n"
-"      extends CreditCardPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@Stateless @Staging @Specializes\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        extends CreditCardPaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:156
 #, no-c-format
 msgid ""
 "When an enabled bean specializes another bean, the other bean is never "
@@ -361,7 +222,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:161
 #, no-c-format
 msgid ""
 "So why does specialization work, and what does it have to do with "
@@ -369,7 +229,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:165
 #, no-c-format
 msgid ""
 "Since we're informing the container that our alternative bean is meant to "
@@ -381,7 +240,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:172
 #, no-c-format
 msgid ""
 "Furthermore, if the default implementation declares a bean EL name using "
@@ -389,6 +247,75 @@
 "alternative bean."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DefaultPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      extends DefaultPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Stateless @Staging @Specializes\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        extends CreditCardPaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Staging\n"
+#~ "public class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless @Staging\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative @Specializes\n"
+#~ "public class MockCreditCardPaymentProcessor \n"
+#~ "      extends CreditCardPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Stateless @Staging @Specializes\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        extends CreditCardPaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
 #~ msgid "Specialization"
 #~ msgstr "特化"
 

Modified: doc/trunk/reference/zh-CN/stereotypes.po
===================================================================
--- doc/trunk/reference/zh-CN/stereotypes.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/stereotypes.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-13 16:04+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,19 +14,16 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: stereotypes.xml:5
 #, no-c-format
 msgid "Stereotypes"
 msgstr "模板"
 
 #. Tag: para
-#: stereotypes.xml:7
 #, no-c-format
 msgid "The CDI specification defines a stereotype as follows:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:11
 #, fuzzy, no-c-format
 msgid ""
 "In many systems, use of architectural patterns produces a set of recurring "
@@ -39,43 +36,36 @@
 "声明一些通用的元数据。"
 
 #. Tag: para
-#: stereotypes.xml:17
 #, no-c-format
 msgid "A stereotype encapsulates any combination of:"
 msgstr "一个模板封装了下面的任何组合:"
 
 #. Tag: para
-#: stereotypes.xml:21
 #, fuzzy, no-c-format
 msgid "a default scope, and"
 msgstr "一个默认的范围类型,"
 
 #. Tag: para
-#: stereotypes.xml:24
 #, fuzzy, no-c-format
 msgid "a set of interceptor bindings."
 msgstr "一套拦截器绑定注释。"
 
 #. Tag: para
-#: stereotypes.xml:28
 #, no-c-format
 msgid "A stereotype may also specify that:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:34
 #, fuzzy, no-c-format
 msgid "all beans with the stereotype have defaulted bean EL names, or that"
 msgstr "一个模板也可以指定所有使用这个模板的Web Bean拥有的默认的Web Bean名称。"
 
 #. Tag: para
-#: stereotypes.xml:37
 #, no-c-format
 msgid "all beans with the stereotype are alternatives."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:41
 #, no-c-format
 msgid ""
 "A bean may declare zero, one or multiple stereotypes. Stereotype annotations "
@@ -83,7 +73,6 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype is an annotation, annotated <literal>@Stereotype</literal>, "
@@ -91,39 +80,12 @@
 "stereotype identifies action classes in some MVC framework:"
 msgstr "一个模板其实就是一个Java注释类型。这个模板在一些MVC框架中识别动作类:"
 
-#. Tag: programlisting
-#: stereotypes.xml:53
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"...\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:55
 #, fuzzy, no-c-format
 msgid "We use the stereotype by applying the annotation to a bean."
 msgstr "我们注释来让Web Bean应用模板"
 
-#. Tag: programlisting
-#: stereotypes.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-
 #. Tag: para
-#: stereotypes.xml:61
 #, no-c-format
 msgid ""
 "Of course, we need to apply some other annotations to our stereotype or else "
@@ -131,52 +93,23 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:66
 #, fuzzy, no-c-format
 msgid "Default scope for a stereotype"
 msgstr "一个模板默认的范围和部署类型"
 
 #. Tag: para
-#: stereotypes.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype may specify a default scope for beans annotated with the "
 "stereotype. For example:"
 msgstr "一个模板也可以指定所有使用这个模板的Web Bean拥有的默认的Web Bean名称。"
 
-#. Tag: programlisting
-#: stereotypes.xml:72
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:74
 #, fuzzy, no-c-format
 msgid "A particular action may still override this default if necessary:"
 msgstr "当然,如果必要的话,一个特殊的动作类仍旧可以重载这些默认值:"
 
-#. Tag: programlisting
-#: stereotypes.xml:78
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Dependent @Action \n"
-"public class DependentScopedLoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Dependent @Mock @Action \n"
-"public class MockLoginAction { ... }]]>"
-
 #. Tag: para
-#: stereotypes.xml:80
 #, no-c-format
 msgid ""
 "Naturally, overriding a single default isn't much use. But remember, "
@@ -184,42 +117,18 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:88
 #, no-c-format
 msgid "Interceptor bindings for stereotypes"
 msgstr "模板的拦截器绑定"
 
 #. Tag: para
-#: stereotypes.xml:90
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype may specify a set of interceptor bindings to be inherited by "
 "all beans with that stereotype."
 msgstr "一个模板指定一套拦截器绑定让使用该模板的Web Bean继承。"
 
-#. Tag: programlisting
-#: stereotypes.xml:94
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@WebTier\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "This helps us get technical concerns, like transactions and security, even "
@@ -227,13 +136,11 @@
 msgstr "这将能够帮助我们从业务代码中剥离技术关注点!"
 
 #. Tag: title
-#: stereotypes.xml:103
 #, no-c-format
 msgid "Name defaulting with stereotypes"
 msgstr "模板的默认命名"
 
 #. Tag: para
-#: stereotypes.xml:105
 #, fuzzy, no-c-format
 msgid ""
 "We can specify that all beans with a certain stereotype have a defaulted EL "
@@ -244,31 +151,7 @@
 "其设为默认名称。JSP页面中常常引用动作类,所以它们是这个特性的最好的例子。我们"
 "所需做的就是添加一个空的 <literal>@Named</literal> 注释:"
 
-#. Tag: programlisting
-#: stereotypes.xml:110
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@WebTier\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:112
 #, fuzzy, no-c-format
 msgid ""
 "Now, the <literal>LoginAction</literal> bean will have the defaulted name "
@@ -278,13 +161,11 @@
 "literal> Web Bean名称."
 
 #. Tag: title
-#: stereotypes.xml:119
 #, fuzzy, no-c-format
 msgid "Alternative stereotypes"
 msgstr "标准的模板"
 
 #. Tag: para
-#: stereotypes.xml:121
 #, no-c-format
 msgid ""
 "A stereotype can indicate that all beans to which it is applied are "
@@ -292,47 +173,19 @@
 "emphasis> lets us classify beans by deployment scenario."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:126
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Mock {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:128
 #, no-c-format
 msgid ""
 "We can apply an alternative stereotype to a whole set of beans, and activate "
 "them all with one line of code in <literal>beans.xml</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:133
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Mock\n"
-"public class MockLoginAction extends LoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-
 #. Tag: title
-#: stereotypes.xml:141
 #, fuzzy, no-c-format
 msgid "Stereotype stacking"
 msgstr "模板"
 
 #. Tag: para
-#: stereotypes.xml:143
 #, no-c-format
 msgid ""
 "This may blow your mind a bit, but stereotypes may declare other "
@@ -343,39 +196,18 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:150
 #, no-c-format
 msgid ""
 "Here's an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:155
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Auditable\n"
-"@Action\n"
-"@Stereotype\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface AuditableAction {}]]>"
-msgstr ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {} ]]>"
-
 #. Tag: title
-#: stereotypes.xml:160
 #, fuzzy, no-c-format
 msgid "Built-in stereotypes"
 msgstr "标准的模板"
 
 #. Tag: para
-#: stereotypes.xml:162
 #, fuzzy, no-c-format
 msgid ""
 "We've already met two standard stereotypes defined by the CDI specification: "
@@ -385,33 +217,13 @@
 "literal> 和 <literal>@Decorator</literal>。"
 
 #. Tag: para
-#: stereotypes.xml:167
 #, no-c-format
 msgid ""
 "CDI defines one further standard stereotype, <literal>@Model</literal>, "
 "which is expected to be used frequently in web applications:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:172
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {}]]>"
-msgstr ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {} ]]>"
-
 #. Tag: para
-#: stereotypes.xml:174
 #, fuzzy, no-c-format
 msgid ""
 "Instead of using JSF managed beans, just annotate a bean <literal>@Model</"
@@ -421,6 +233,140 @@
 "literal> 注释就可以让这个Web Bean替代JSF的管理Bean。你可以直接在JSF页面中使用"
 "这个Web Bean。"
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "...\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Dependent @Action \n"
+#~ "public class DependentScopedLoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Dependent @Mock @Action \n"
+#~ "public class MockLoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@WebTier\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Named\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Named\n"
+#~ "@WebTier\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Mock {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Mock\n"
+#~ "public class MockLoginAction extends LoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Auditable\n"
+#~ "@Action\n"
+#~ "@Stereotype\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface AuditableAction {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {} ]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {} ]]>"
+
 #~ msgid "According to the Web Beans specification:"
 #~ msgstr "根据Web Bean规范:"
 

Modified: doc/trunk/reference/zh-CN/viewlayers.po
===================================================================
--- doc/trunk/reference/zh-CN/viewlayers.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/viewlayers.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-04-19 20:36+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,19 +15,16 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: viewlayers.xml:5
 #, no-c-format
 msgid "Alternative view layers"
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:8
 #, no-c-format
 msgid "Wicket CDI integration"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:10
 #, no-c-format
 msgid ""
 "Weld provides integration between the Apache Wicket web framework and CDI. "
@@ -37,7 +34,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:16
 #, no-c-format
 msgid ""
 "This section describes some of the utilities provided by the Wicket "
@@ -45,13 +41,11 @@
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:22
 #, no-c-format
 msgid "The <literal>WebApplication</literal> class"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:24
 #, no-c-format
 msgid ""
 "Each wicket application must have a <literal>WebApplication</literal> "
@@ -61,7 +55,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:31
 #, no-c-format
 msgid ""
 "If you would prefer not to subclass <literal>WeldApplication</literal>, you "
@@ -71,31 +64,16 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:38
 #, no-c-format
 msgid "For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: viewlayers.xml:41
-#, no-c-format
-msgid ""
-"<![CDATA[public class SampleApplication extends WeldApplication {\n"
-"   @Override\n"
-"   public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: viewlayers.xml:45
 #, no-c-format
 msgid "Conversations with Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:46
 #, no-c-format
 msgid ""
 "Wicket can also take advantage of the conversation scope from CDI, provided "
@@ -103,7 +81,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:52
 #, no-c-format
 msgid ""
 "Setting up the conversation context at the beginning of a Wicket request, "
@@ -111,7 +88,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:58
 #, no-c-format
 msgid ""
 "Storing the id of any long-running conversation in Wicket's metadata when "
@@ -119,7 +95,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:64
 #, no-c-format
 msgid ""
 "Activating the correct long-running conversation based upon which page is "
@@ -127,7 +102,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:69
 #, no-c-format
 msgid ""
 "Propagating the conversation context for any long-running conversation to "
@@ -135,13 +109,11 @@
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:76
 #, no-c-format
 msgid "Starting and stopping conversations in Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:77
 #, no-c-format
 msgid ""
 "As in JSF applications, a conversation <emphasis>always</emphasis> exists "
@@ -153,27 +125,12 @@
 "</literal> methods:"
 msgstr ""
 
-#. Tag: programlisting
-#: viewlayers.xml:86
-#, no-c-format
-msgid ""
-"<![CDATA[private @Inject Conversation conversation;\n"
-"...\n"
-"// begin a conversation\n"
-"conversation.begin();\n"
-"...\n"
-"// end a conversation\n"
-"conversation.end();]]>"
-msgstr ""
-
 #. Tag: title
-#: viewlayers.xml:91
 #, no-c-format
 msgid "Long running conversation propagation in Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:92
 #, no-c-format
 msgid ""
 "When a conversation is marked as long-running, the id of that conversation "

Modified: doc/trunk/reference/zh-CN/weldexamples.po
===================================================================
--- doc/trunk/reference/zh-CN/weldexamples.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/weldexamples.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: weldexamples.xml:5
 #, no-c-format
 msgid "Diving into the Weld examples"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:7
 #, no-c-format
 msgid ""
 "It's time to pull the covers back and dive into the internals of Weld "
@@ -29,13 +27,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:13
 #, no-c-format
 msgid "The numberguess example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:15
 #, no-c-format
 msgid ""
 "In the numberguess application you get 10 attempts to guess a number between "
@@ -44,16 +40,14 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:20
 #, no-c-format
 msgid ""
 "The numberguess example is comprised of a number of beans, configuration "
-"files and Facelets (JSF) views, packaged as a WAR module. Let's start by "
+"files and Facelets (JSF) views, packaged as a war module. Let's start by "
 "examining the configuration files."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:25
 #, no-c-format
 msgid ""
 "All the configuration files for this example are located in <literal>WEB-INF/"
@@ -64,21 +58,7 @@
 "to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:33
-#, no-c-format
-msgid ""
-"<![CDATA[<faces-config version=\"2.0\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd\">\n"
-"</faces-config>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:35
 #, no-c-format
 msgid ""
 "There's also an empty <literal>beans.xml</literal> file, which tells the "
@@ -87,212 +67,120 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:40
 #, no-c-format
 msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:42
+#. Tag: para
 #, no-c-format
+msgid "Enable and initialize the JSF servlet"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"faces.servlet\" coords=\"10\"/> "
-"<area id=\"faces.servlet.mapping\" coords=\"16\"/> <area id=\"faces.default."
-"suffix\" coords=\"21\"/> <area id=\"session.timeout\" coords=\"26\"/> </"
-"areaspec> <programlisting role=\"XML\"><![CDATA[<web-app version=\"2.5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n"
-"   \n"
-"   <display-name>weld-jsf-numberguess-war</display-name>\n"
-"   <description>Weld JSF numberguess example (WAR)</description>\n"
-"\n"
-"   <servlet>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>\n"
-"      <load-on-startup>1</load-on-startup>\n"
-"   </servlet>\n"
-"\n"
-"   <servlet-mapping>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <url-pattern>*.jsf</url-pattern>\n"
-"   </servlet-mapping>\n"
-"   \n"
-"   <context-param>\n"
-"      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>\n"
-"      <param-value>.xhtml</param-value>\n"
-"   </context-param>\n"
-"\n"
-"   <session-config>\n"
-"      <session-timeout>10</session-timeout>\n"
-"   </session-config>\n"
-"\n"
-"</web-app>]]></programlisting> <calloutlist> <callout arearefs=\"faces."
-"servlet\"> <para> Enable and initialize the JSF servlet </para> </callout> "
-"<callout arearefs=\"faces.servlet.mapping\"> <para> Configure requests for "
-"URLs ending in <literal>.jsf</literal> to be handled by JSF </para> </"
-"callout> <callout arearefs=\"faces.default.suffix\"> <para> Tell JSF that we "
-"will be giving our JSF views (Facelets templates) an extension of <literal>."
-"xhtml</literal> </para> </callout> <callout arearefs=\"session.timeout\"> "
-"<para> Configure a session timeout of 10 minutes </para> </callout> </"
-"calloutlist> </programlistingco> <note> <para> This demo uses JSF 2 as the "
-"view framework, but you can use Weld with any servlet-based web framework, "
-"such as JSF 1.2 or Wicket. </para> </note> <para> Let's take a look at the "
-"main JSF view, <literal>src/main/webapp/home.xhtml</literal>. </para> "
-"<programlistingco> <areaspec> <area id=\"template\" coords=\"8\"/> <area id="
-"\"statusMessages\" coords=\"12\"/> <area id=\"instructions\" coords=\"20\"/> "
-"<area id=\"guess\" coords=\"27\"/> <area id=\"validator\" coords=\"29\"/> "
-"<area id=\"submit\" coords=\"30\"/> </areaspec> <programlisting role=\"XML"
-"\"><![CDATA[<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN"
-"\"\n"
-"   \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
-"<html xmlns=\"http://www.w3.org/1999/xhtml\"\n"
-"   xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n"
-"   xmlns:h=\"http://java.sun.com/jsf/html\"\n"
-"   xmlns:f=\"http://java.sun.com/jsf/core\">\n"
-"\n"
-"   <ui:composition template=\"/template.xhtml\">\n"
-"      <ui:define name=\"content\">\n"
-"         <h1>Guess a number...</h1>\n"
-"         <h:form id=\"numberGuess\">\n"
-"            <div style=\"color: red\">\n"
-"               <h:messages id=\"messages\" globalOnly=\"false\"/>\n"
-"               <h:outputText id=\"Higher\" value=\"Higher!\"\n"
-"                  rendered=\"#{game.number gt game.guess and game.guess ne 0}"
-"\"/>\n"
-"               <h:outputText id=\"Lower\" value=\"Lower!\"\n"
-"                  rendered=\"#{game.number lt game.guess and game.guess ne 0}"
-"\"/>\n"
-"            </div>\n"
-"    \n"
-"            <div>\n"
-"               I'm thinking of a number between #{game.smallest} and #{game."
-"biggest}.\n"
-"               You have #{game.remainingGuesses} guesses remaining.\n"
-"            </div>\n"
-"       \n"
-"            <div>\n"
-"               Your guess: \n"
-"               <h:inputText id=\"inputGuess\" value=\"#{game.guess}\"\n"
-"                  size=\"3\" required=\"true\" disabled=\"#{game.number eq "
-"game.guess}\"\n"
-"                  validator=\"#{game.validateNumberRange}\"/>\n"
-"               <h:commandButton id=\"guessButton\" value=\"Guess\" \n"
-"                  action=\"#{game.check}\" disabled=\"#{game.number eq game."
-"guess}\"/>\n"
-"            </div>\n"
-"            <div>\n"
-"              <h:commandButton id=\"restartButton\" value=\"Reset\" action="
-"\"#{game.reset}\" immediate=\"true\"/>\n"
-"            </div>\n"
-"         </h:form>\n"
-"      </ui:define>\n"
-"   </ui:composition>\n"
-"</html>]]></programlisting> <calloutlist> <callout arearefs=\"template\"> "
-"<para> Facelets is the built-in templating language for JSF. Here we are "
-"wrapping our page in a template which defines the layout. </para> </callout> "
-"<callout arearefs=\"statusMessages\"> <para> There are a number of messages "
-"which can be sent to the user, \"Higher!\", \"Lower!\" and \"Correct!\" </"
-"para> </callout> <callout arearefs=\"instructions\"> <para> As the user "
-"guesses, the range of numbers they can guess gets smaller - this sentence "
-"changes to make sure they know the number range of a valid guess. </para> </"
-"callout> <callout arearefs=\"guess\"> <para> This input field is bound to a "
-"bean property using a value expression. </para> </callout> <callout arearefs="
-"\"validator\"> <para> A validator binding is used to make sure the user "
-"doesn't accidentally input a number outside of the range in which they can "
-"guess - if the validator wasn't here, the user might use up a guess on an "
-"out of bounds number. </para> </callout> <callout arearefs=\"submit\"> "
-"<para> And, of course, there must be a way for the user to send their guess "
-"to the server. Here we bind to an action method on the bean. </para> </"
-"callout> </calloutlist> </programlistingco>"
+"Configure requests for URLs ending in <literal>.jsf</literal> to be handled "
+"by JSF"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:142
 #, no-c-format
 msgid ""
-"The example exists of 4 classes, the first two of which are qualifiers. "
-"First, there is the <literal>@Random</literal> qualifier, used for injecting "
-"a random number:"
+"Tell JSF that we will be giving our JSF views (Facelets templates) an "
+"extension of <literal>.xhtml</literal>"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:147
+#. Tag: para
 #, no-c-format
+msgid "Configure a session timeout of 10 minutes"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Random {}]]>"
+"This demo uses JSF 2 as the view framework, but you can use Weld with any "
+"servlet-based web framework, such as JSF 1.2 or Wicket."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:149
 #, no-c-format
 msgid ""
-"There is also the <literal>@MaxNumber</literal> qualifier, used for "
-"injecting the maximum number that can be injected:"
+"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
+"literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:154
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface MaxNumber {}\n"
-"]]>"
+"Facelets is the built-in templating language for JSF. Here we are wrapping "
+"our page in a template which defines the layout."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:156
 #, no-c-format
 msgid ""
-"The application-scoped <literal>Generator</literal> class is responsible for "
-"creating the random number, via a producer method. It also exposes the "
-"maximum possible number via a producer method:"
+"There are a number of messages which can be sent to the user, \"Higher!\", "
+"\"Lower!\" and \"Correct!\""
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:161
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class Generator implements Serializable {\n"
-"\n"
-"   private java.util.Random random = new java.util.Random(System."
-"currentTimeMillis());\n"
-"   \n"
-"   private int maxNumber = 100;\n"
-"   \n"
-"   java.util.Random getRandom() {\n"
-"      return random;\n"
-"   }\n"
-"   \n"
-"   @Produces @Random int next() { \n"
-"      return getRandom().nextInt(maxNumber); \n"
-"   }\n"
-"   \n"
-"   @Produces @MaxNumber int getMaxNumber() {\n"
-"      return maxNumber;\n"
-"   }\n"
-"\n"
-"}]]>"
+"As the user guesses, the range of numbers they can guess gets smaller - this "
+"sentence changes to make sure they know the number range of a valid guess."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:163
 #, no-c-format
+msgid "This input field is bound to a bean property using a value expression."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
+"A validator binding is used to make sure the user doesn't accidentally input "
+"a number outside of the range in which they can guess - if the validator "
+"wasn't here, the user might use up a guess on an out of bounds number."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"And, of course, there must be a way for the user to send their guess to the "
+"server. Here we bind to an action method on the bean."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The example exists of 4 classes, the first two of which are qualifiers. "
+"First, there is the <literal>@Random</literal> qualifier, used for injecting "
+"a random number:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"There is also the <literal>@MaxNumber</literal> qualifier, used for "
+"injecting the maximum number that can be injected:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The application-scoped <literal>Generator</literal> class is responsible for "
+"creating the random number, via a producer method. It also exposes the "
+"maximum possible number via a producer method:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The <literal>Generator</literal> is application scoped, so we don't get a "
 "different random each time."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:168
 #, no-c-format
 msgid ""
 "The package declaration and imports have been excluded from these listings. "
@@ -300,7 +188,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:174
 #, no-c-format
 msgid ""
 "The final bean in the application is the session-scoped <literal>Game</"
@@ -313,7 +200,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:182
 #, no-c-format
 msgid ""
 "You'll notice that we've also added the <literal>@Named</literal> annotation "
@@ -321,123 +207,32 @@
 "bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:187
-#, no-c-format
-msgid ""
-"<![CDATA[@Named\n"
-"@SessionScoped\n"
-"public class Game implements Serializable {\n"
-"\n"
-"   private int number;\n"
-"   private int guess;\n"
-"   private int smallest;\n"
-"   private int biggest;\n"
-"   private int remainingGuesses;\n"
-"\n"
-"   @Inject @MaxNumber private int maxNumber;\n"
-"   @Inject @Random Instance<Integer> randomNumber;\n"
-"   \n"
-"   public Game() {}\n"
-"   \n"
-"   public void check() {\n"
-"      if (guess > number) {\n"
-"         biggest = guess - 1;\n"
-"      }\n"
-"      else if (guess < number) {\n"
-"         smallest = guess + 1;\n"
-"      }\n"
-"      else if (guess == number) {\n"
-"         FacesContext.getCurrentInstance().addMessage(null, new FacesMessage"
-"(\"Correct!\"));\n"
-"      }\n"
-"      remainingGuesses--;\n"
-"   }\n"
-"   \n"
-"   @PostConstruct\n"
-"   public void reset() {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = randomNumber.get();\n"
-"   }\n"
-"   \n"
-"   public void validateNumberRange(FacesContext context,  UIComponent "
-"toValidate, Object value) {\n"
-"      if (remainingGuesses <= 0) {\n"
-"         FacesMessage message = new FacesMessage(\"No guesses left!\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"         return;\n"
-"      }\n"
-"      int input = (Integer) value;\n"
-"\n"
-"      if (input < smallest || input > biggest) {\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"\n"
-"         FacesMessage message = new FacesMessage(\"Invalid guess\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"      }\n"
-"   }\n"
-"\n"
-"   public int getNumber() {\n"
-"      return number;\n"
-"   }\n"
-"   \n"
-"   public int getGuess() {\n"
-"      return guess;\n"
-"   }\n"
-"   \n"
-"   public void setGuess(int guess) {\n"
-"      this.guess = guess;\n"
-"   }\n"
-"   \n"
-"   public int getSmallest() {\n"
-"      return smallest;\n"
-"   }\n"
-"   \n"
-"   public int getBiggest() {\n"
-"      return biggest;\n"
-"   }\n"
-"   \n"
-"   public int getRemainingGuesses() {\n"
-"      return remainingGuesses;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: weldexamples.xml:190
 #, no-c-format
 msgid "The numberguess example in Apache Tomcat or Jetty"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:192
 #, no-c-format
 msgid ""
 "A couple of modifications must be made to the numberguess artifact in order "
 "to deploy it to Tomcat or Jetty. First, Weld must be deployed as a Web "
 "Application library under <literal>WEB-INF/lib</literal> since the servlet "
 "container does not provide the CDI services. For your convenience we provide "
-"a single JAR suitable for running Weld in any servlet container (including "
+"a single jar suitable for running Weld in any servlet container (including "
 "Jetty), <literal>weld-servlet.jar</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:200
 #, no-c-format
 msgid ""
-"You must also include the JARs for JSF, EL, and the common annotations "
+"You must also include the jars for JSF, EL, and the common annotations "
 "(<literal>jsr250-api.jar</literal>), all of which are provided by the Java "
 "EE platform (a Java EE application server). Are you starting to appreciate "
 "why a Java EE platform is worth using?"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:207
 #, no-c-format
 msgid ""
 "Second, we need to explicitly specify the servlet listener in <literal>web."
@@ -445,18 +240,7 @@
 "The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:213
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:215
 #, no-c-format
 msgid ""
 "When Weld boots, it places the <literal>javax.enterprise.inject.spi."
@@ -467,13 +251,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:226
 #, no-c-format
 msgid "The numberguess example for Apache Wicket"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:227
 #, no-c-format
 msgid ""
 "Weld includes a number of portable extensions for JSR-299, including an "
@@ -483,7 +265,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:234
 #, no-c-format
 msgid ""
 "You may want to review the Wicket documentation at <ulink url=\"http://"
@@ -492,7 +273,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:241
 #, no-c-format
 msgid ""
 "Wicket is another environment that relies on the Weld servlet extension. The "
@@ -503,7 +283,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:249
 #, no-c-format
 msgid ""
 "We'll also be using the Eclipse IDE in these examples. Instructions are "
@@ -513,13 +292,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:257
 #, no-c-format
 msgid "Creating the Eclipse project"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:259
 #, no-c-format
 msgid ""
 "To use the Wicket example in Eclipse, you have one of two choices. You can "
@@ -531,17 +308,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:267
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -> Import... -> Maven Projects</"
-"emphasis>. Then, browse to the location of the Wicket numberguess example. "
-"You should see that Eclipse recognizes the existence of a Maven project."
+"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
+"Projects</emphasis>. Then, browse to the location of the Wicket numberguess "
+"example. You should see that Eclipse recognizes the existence of a Maven "
+"project."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:279
 #, no-c-format
 msgid ""
 "This will create a project in your workspace called <literal>weld-wicket-"
@@ -549,7 +325,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:283
 #, no-c-format
 msgid ""
 "You'll notice after importing, the project has a build error. That's because "
@@ -557,21 +332,24 @@
 "<emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> "
 "tab in the window that appears. In the form field labeled \"Active Maven "
 "Profiles (comma separated):\", type <literal>jetty</literal>. That will "
-"enable some extra dependencies that allow the project to compile. You're now "
-"ready to develop!"
+"enable some extra dependencies that allow the project to compile. "
+"Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven "
+"compile plugin when processing resources (recommended)\". That solves an "
+"incompatiblity between the m2eclipse plugin and the Maven enforcer plugin "
+"that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:292
 #, no-c-format
 msgid ""
-"You are also advised to uncheck the box \"Skip Maven compiler when "
-"processing resources\" in the Maven properties screen because of conflicts "
-"with the Maven enforcer plugin."
+"Be sure to uncheck the box \"Skip Maven compile plugin when processing "
+"resources (recommended)\" in the Maven properties screen or else the example "
+"might not run in Eclipse because beans.xml will be missing from the "
+"classpath! See the <ulink url=\"https://issues.sonatype.org/browse/"
+"MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:298
 #, no-c-format
 msgid ""
 "If you are not using the m2eclipse plugin, you have to follow different "
@@ -580,38 +358,26 @@
 "activated, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:304
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/wicket/numberguess\n"
-"mvn -Pjetty eclipse:eclipse]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:306
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -> Import... -> General -> "
-"Existing Projects into Workspace</emphasis>, select the root directory of "
-"the numberguess example, and click Finish. This will create a project in "
+"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
+"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
+"of the numberguess example, and click Finish. This will create a project in "
 "your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:318
 #, no-c-format
 msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:325
 #, no-c-format
 msgid "Running the example from Eclipse"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:327
 #, no-c-format
 msgid ""
 "This project follows the <literal>wicket-quickstart</literal> approach of "
@@ -626,13 +392,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:338
 #, no-c-format
 msgid "Running the example from the command line in JBoss AS or Tomcat"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:340
 #, no-c-format
 msgid ""
 "This example can also be deployed from the command line in a (similar to the "
@@ -642,26 +406,12 @@
 "run:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:346
-#, no-c-format
-msgid "<![CDATA[$> ant deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:348
 #, no-c-format
 msgid "to deploy the example to JBoss AS, and:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:350
-#, no-c-format
-msgid "<![CDATA[$> ant tomcat.deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:352
 #, no-c-format
 msgid ""
 "to deploy the example to Tomcat. You can then access application at <ulink "
@@ -670,33 +420,23 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:357
 #, no-c-format
 msgid ""
 "Alternatively, you can run the application in place on an embedded Jetty "
 "container using the following Maven command:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:362
-#, no-c-format
-msgid "<![CDATA[$> mvn jetty:run -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:364
 #, no-c-format
 msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:371
 #, no-c-format
 msgid "Understanding the code"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:373
 #, no-c-format
 msgid ""
 "The code in the wicket numberguess example is very similar to the JSF-based "
@@ -710,7 +450,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:382
 #, no-c-format
 msgid ""
 "The integration of Weld with Wicket takes advantage of the same qualifier "
@@ -720,13 +459,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:388
 #, no-c-format
 msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:394
 #, no-c-format
 msgid ""
 "Each wicket application must have a <literal>WeldApplication</literal> "
@@ -734,19 +471,7 @@
 "<literal>NumberGuessApplication</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:398
-#, no-c-format
-msgid ""
-"<![CDATA[public class NumberGuessApplication extends WeldApplication {\n"
-"   @Override public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:399
 #, no-c-format
 msgid ""
 "This class specifies which page Wicket should treat as our home page, in our "
@@ -754,7 +479,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:405
 #, no-c-format
 msgid ""
 "In <literal>HomePage</literal>, we see typical Wicket code to set up page "
@@ -762,52 +486,14 @@
 "literal> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:410
-#, no-c-format
-msgid "<![CDATA[@Inject Game game;]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:412
 #, no-c-format
 msgid ""
 "The <literal>Game</literal> bean is can then be used, for example, by the "
 "code for submitting a guess:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:417
-#, no-c-format
-msgid ""
-"<![CDATA[final Component guessButton = new AjaxButton(\"GuessButton\") {\n"
-"   protected void onSubmit(AjaxRequestTarget target, Form form) {\n"
-"      if (game.check()) {\n"
-"         info(\"Correct!\");\n"
-"         setVisible(false);\n"
-"         prompt.setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == 0) {\n"
-"         info(\"Sorry, the answer was \" + game.getNumber());\n"
-"         setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getNumber() > game.getGuess()) {\n"
-"         info(\"Higher!\");\n"
-"      }\n"
-"      else if (game.getNumber() < game.getGuess()) {\n"
-"         info(\"Lower\");\n"
-"      }\n"
-"      target.addComponent(form);\n"
-"   } \n"
-"};      ]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:420
 #, no-c-format
 msgid ""
 "All injections may be serialized; actual storage of the bean is managed by "
@@ -816,7 +502,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:425
 #, no-c-format
 msgid ""
 "Wicket components allow injection, but they <emphasis>cannot</emphasis> use "
@@ -826,7 +511,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:433
 #, no-c-format
 msgid ""
 "The example uses AJAX for processing of button events, and dynamically hides "
@@ -835,7 +519,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:440
 #, no-c-format
 msgid ""
 "In order to activate Wicket for this webapp, the Wicket filter is added to "
@@ -843,29 +526,7 @@
 "<literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:445
-#, no-c-format
-msgid ""
-"<![CDATA[<filter>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-"
-"class>\n"
-"   <init-param>\n"
-"      <param-name>applicationClassName</param-name>\n"
-"      <param-value>org.jboss.weld.examples.wicket.NumberGuessApplication</"
-"param-value>\n"
-"   </init-param>\n"
-"</filter>\n"
-"\n"
-"<filter-mapping>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <url-pattern>/*</url-pattern>\n"
-"</filter-mapping>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:447
 #, no-c-format
 msgid ""
 "The servlet listener is still required, as in the Tomcat example, to "
@@ -876,26 +537,12 @@
 "descriptor to be appended to the <literal>web.xml</literal> configuration."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:455
-#, no-c-format
-msgid ""
-"<![CDATA[<web-app version=\"2.4\" ...>\n"
-"   <listener>\n"
-"      <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"   </listener>\n"
-"</web-app>]]>"
-msgstr ""
-
 #. Tag: title
-#: weldexamples.xml:464
 #, no-c-format
 msgid "The numberguess example for Java SE with Swing"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:466
 #, no-c-format
 msgid ""
 "This example shows how to use the Weld SE extension to in a Java SE based "
@@ -905,19 +552,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:473
 #, no-c-format
 msgid "To run the example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:479
 #, no-c-format
 msgid "Ensure that Maven 2 (version 2.0.10+) is installed and in your PATH"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:484
 #, no-c-format
 msgid ""
 "Ensure that the <literal>JAVA_HOME</literal> environment variable is "
@@ -925,7 +569,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:490
 #, no-c-format
 msgid ""
 "Open a command line or terminal window in the <literal>examples/se/"
@@ -933,19 +576,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:496
 #, no-c-format
 msgid "Execute the following command"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:499
-#, no-c-format
-msgid "mvn -Drun"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:503
 #, no-c-format
 msgid ""
 "Let's have a look at the significant code and configuration files that make "
@@ -953,7 +588,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:508
 #, no-c-format
 msgid ""
 "As usual, there is an empty <literal>beans.xml</literal> file in the root "
@@ -962,7 +596,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:514
 #, no-c-format
 msgid ""
 "The game's main logic is located in <literal>Game.java</literal>. Here is "
@@ -970,293 +603,170 @@
 "the web application version:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:518
+#. Tag: para
 #, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"scope\" coords=\"1\"/> <area id="
-"\"name\" coords=\"2\"/> <area id=\"messages1\" coords=\"26\"/> <area id="
-"\"validation\" coords=\"41\"/> <area id=\"reset\" coords=\"73\"/> </"
-"areaspec> <programlisting role=\"JAVA\"><![CDATA[@ApplicationScoped\n"
-"public class Game\n"
-"{\n"
-"\n"
-"   public static final int MAX_NUM_GUESSES = 10;\n"
-"\n"
-"   private Integer number;\n"
-"   private int guess = 0;\n"
-"   private int smallest = 0;\n"
-"\n"
-"   @Inject\n"
-"   @MaxNumber\n"
-"   private int maxNumber;\n"
-"\n"
-"   private int biggest;\n"
-"   private int remainingGuesses = MAX_NUM_GUESSES;\n"
-"   private boolean validNumberRange = true;\n"
-"\n"
-"   @Inject\n"
-"   Generator rndGenerator;\n"
-"\n"
-"   public Game()\n"
-"   {\n"
-"   }\n"
-"\n"
-"   ...\n"
-"\n"
-"   public boolean isValidNumberRange()\n"
-"   {\n"
-"      return validNumberRange;\n"
-"   }\n"
-"\n"
-"   public boolean isGameWon()\n"
-"   {\n"
-"      return guess == number;\n"
-"   }\n"
-"\n"
-"   public boolean isGameLost()\n"
-"   {\n"
-"      return guess != number && remainingGuesses <= 0;\n"
-"   }\n"
-"\n"
-"   public boolean check()\n"
-"   {\n"
-"      boolean result = false;\n"
-"\n"
-"      if (checkNewNumberRangeIsValid())\n"
-"      {\n"
-"         if (guess > number)\n"
-"         {\n"
-"            biggest = guess - 1;\n"
-"         }\n"
-"\n"
-"         if (guess < number)\n"
-"         {\n"
-"            smallest = guess + 1;\n"
-"         }\n"
-"\n"
-"         if (guess == number)\n"
-"         {\n"
-"            result = true;\n"
-"         }\n"
-"\n"
-"         remainingGuesses--;\n"
-"      }\n"
-"\n"
-"      return result;\n"
-"   }\n"
-"\n"
-"   private boolean checkNewNumberRangeIsValid()\n"
-"   {\n"
-"      return validNumberRange = ((guess >= smallest) && (guess <= "
-"biggest));\n"
-"   }\n"
-"\n"
-"   @PostConstruct\n"
-"   public void reset()\n"
-"   {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = rndGenerator.next();\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"scope\"> <para> The "
-"bean is application scoped rather than session scoped, since an instance of "
-"a Swing application typically represents a single 'session'. </para> </"
-"callout> <callout arearefs=\"name\"> <para> Notice that the bean is not "
-"named, since it doesn't need to be accessed via EL. </para> </callout> "
-"<callout arearefs=\"messages1\"> <para> In Java SE there is no JSF "
-"<literal>FacesContext</literal> to which messages can be added. Instead the "
-"<literal>Game</literal> class provides additional information about the "
-"state of the current game including: </para> <itemizedlist> <listitem> "
-"<para> If the game has been won or lost </para> </listitem> <listitem> "
-"<para> If the most recent guess was invalid </para> </listitem> </"
-"itemizedlist> <para> This allows the Swing UI to query the state of the "
-"game, which it does indirectly via a class called <literal>MessageGenerator</"
-"literal>, in order to determine the appropriate messages to display to the "
-"user during the game. </para> </callout> <callout arearefs=\"validation\"> "
-"<para> Since there is no dedicated validation phase, validation of user "
-"input is performed during the <literal>check()</literal> method. </para> </"
-"callout> <callout arearefs=\"reset\"> <para> The <literal>reset()</literal> "
-"method makes a call to the injected <literal>rndGenerator</literal> in order "
-"to get the random number at the start of each game. Note that it can't use "
-"<literal>Instance.get()</literal> like the JSF example does because there "
-"will not be any active contexts like there are during a JSF request. </para> "
-"</callout> </calloutlist> </programlistingco> <para> The "
-"<literal>MessageGenerator</literal> class depends on the current instance of "
-"<literal>Game</literal> and queries its state in order to determine the "
-"appropriate messages to provide as the prompt for the user's next guess and "
-"the response to the previous guess. The code for <literal>MessageGenerator</"
-"literal> is as follows: </para> <programlistingco> <areaspec> <area id=\"game"
-"\" coords=\"3\"/> <area id=\"challenge\" coords=\"6\"/> <area id=\"result\" "
-"coords=\"17\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA[public "
-"class MessageGenerator\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   public String getChallengeMessage()\n"
-"   {\n"
-"      StringBuilder challengeMsg = new StringBuilder(\"I'm thinking of a "
-"number between \");\n"
-"      challengeMsg.append(game.getSmallest());\n"
-"      challengeMsg.append(\" and \");\n"
-"      challengeMsg.append(game.getBiggest());\n"
-"      challengeMsg.append(\". Can you guess what it is?\");\n"
-"\n"
-"      return challengeMsg.toString();\n"
-"   }\n"
-"\n"
-"   public String getResultMessage()\n"
-"   {\n"
-"      if (game.isGameWon())\n"
-"      {\n"
-"         return \"You guessed it! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (game.isGameLost())\n"
-"      {\n"
-"         return \"You are fail! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (!game.isValidNumberRange())\n"
-"      {\n"
-"         return \"Invalid number range!\";\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == Game.MAX_NUM_GUESSES)\n"
-"      {\n"
-"         return \"What is your first guess?\";\n"
-"      }\n"
-"      else\n"
-"      {\n"
-"         String direction = null;\n"
-"\n"
-"         if (game.getGuess() < game.getNumber())\n"
-"         {\n"
-"            direction = \"Higher\";\n"
-"         }\n"
-"         else\n"
-"         {\n"
-"            direction = \"Lower\";\n"
-"         }\n"
-"\n"
-"         return direction + \"! You have \" + game.getRemainingGuesses() + "
-"\" guesses left.\";\n"
-"      }\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"game\"> <para> The "
-"instance of <literal>Game</literal> for the application is injected here. </"
-"para> </callout> <callout arearefs=\"challenge\"> <para> The <literal>Game</"
-"literal>'s state is interrogated to determine the appropriate challenge "
-"message ... </para> </callout> <callout arearefs=\"result\"> <para> ... and "
-"again to determine whether to congratulate, console or encourage the user to "
-"continue. </para> </callout> </calloutlist> </programlistingco> <para> "
+"The bean is application scoped rather than session scoped, since an instance "
+"of a Swing application typically represents a single 'session'."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Notice that the bean is not named, since it doesn't need to be accessed via "
+"EL."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"In Java SE there is no JSF <literal>FacesContext</literal> to which messages "
+"can be added. Instead the <literal>Game</literal> class provides additional "
+"information about the state of the current game including:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the game has been won or lost"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the most recent guess was invalid"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This allows the Swing UI to query the state of the game, which it does "
+"indirectly via a class called <literal>MessageGenerator</literal>, in order "
+"to determine the appropriate messages to display to the user during the game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Since there is no dedicated validation phase, validation of user input is "
+"performed during the <literal>check()</literal> method."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>reset()</literal> method makes a call to the injected "
+"<literal>rndGenerator</literal> in order to get the random number at the "
+"start of each game. Note that it can't use <literal>Instance.get()</literal> "
+"like the JSF example does because there will not be any active contexts like "
+"there are during a JSF request."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>MessageGenerator</literal> class depends on the current "
+"instance of <literal>Game</literal> and queries its state in order to "
+"determine the appropriate messages to provide as the prompt for the user's "
+"next guess and the response to the previous guess. The code for "
+"<literal>MessageGenerator</literal> is as follows:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The instance of <literal>Game</literal> for the application is injected here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>Game</literal>'s state is interrogated to determine the "
+"appropriate challenge message ..."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"... and again to determine whether to congratulate, console or encourage the "
+"user to continue."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "Finally we come to the <literal>NumberGuessFrame</literal> class which "
-"provides the Swing front end to our guessing game. </para> "
-"<programlistingco> <areaspec> <area id=\"gameIn\" coords=\"3\"/> <area id="
-"\"messagesIn\" coords=\"6\"/> <area id=\"start\" coords=\"9\"/> <area id="
-"\"init\" coords=\"21\"/> <area id=\"guess1\" coords=\"38\"/> <area id="
-"\"replay\" coords=\"48\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA"
-"[public class NumberGuessFrame extends javax.swing.JFrame\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   @Inject\n"
-"   private MessageGenerator msgGenerator;\n"
-"\n"
-"   public void start(@Observes ContainerInitialized event)\n"
-"   {\n"
-"      java.awt.EventQueue.invokeLater(new Runnable()\n"
-"      {\n"
-"         public void run()\n"
-"         {\n"
-"            initComponents();\n"
-"            setVisible(true);\n"
-"         }\n"
-"      });\n"
-"   }\n"
-"\n"
-"   private void initComponents()\n"
-"   {\n"
-"\n"
-"      buttonPanel = new javax.swing.JPanel();\n"
-"      mainMsgPanel = new javax.swing.JPanel();\n"
-"      mainLabel = new javax.swing.JLabel();\n"
-"      messageLabel = new javax.swing.JLabel();\n"
-"      guessText = new javax.swing.JTextField();\n"
-"      ...\n"
-"      mainLabel.setText(msgGenerator.getChallengeMessage());\n"
-"      mainMsgPanel.add(mainLabel);\n"
-"\n"
-"      messageLabel.setText(msgGenerator.getResultMessage());\n"
-"      mainMsgPanel.add(messageLabel);\n"
-"      ...\n"
-"   }\n"
-"\n"
-"   private void guessButtonActionPerformed( java.awt.event.ActionEvent "
-"evt )\n"
-"   {\n"
-"      int guess =  Integer.parseInt(guessText.getText());\n"
-"      game.setGuess( guess );\n"
-"      game.check();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void replayBtnActionPerformed(java.awt.event.ActionEvent evt)\n"
-"   {\n"
-"      game.reset();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void refreshUI() {\n"
-"      mainLabel.setText( msgGenerator.getChallengeMessage() );\n"
-"      messageLabel.setText( msgGenerator.getResultMessage() );\n"
-"      guessText.setText( \"\" );\n"
-"      guessesLeftBar.setValue( game.getRemainingGuesses() );\n"
-"      guessText.requestFocus();\n"
-"   }\n"
-"\n"
-"   // swing components\n"
-"   private javax.swing.JPanel borderPanel;\n"
-"   ...\n"
-"   private javax.swing.JButton replayBtn;\n"
-"\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"gameIn\"> <para> The "
-"injected instance of the game (logic and state). </para> </callout> <callout "
-"arearefs=\"messagesIn\"> <para> The injected message generator for UI "
-"messages. </para> </callout> <callout arearefs=\"start\"> <para> This "
-"application is started in the prescribed Weld SE way, by observing the "
-"<literal>ContainerInitialized</literal> event. </para> </callout> <callout "
-"arearefs=\"init\"> <para> This method initializes all of the Swing "
-"components. Note the use of the <literal>msgGenerator</literal> here. </"
-"para> </callout> <callout arearefs=\"guess1\"> <para> "
+"provides the Swing front end to our guessing game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected instance of the game (logic and state)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected message generator for UI messages."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This application is started in the prescribed Weld SE way, by observing the "
+"<literal>ContainerInitialized</literal> event."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This method initializes all of the Swing components. Note the use of the "
+"<literal>msgGenerator</literal> here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
-"button is clicked, and it does the following: </para> <itemizedlist> "
-"<listitem> <para> Gets the guess entered by the user and sets it as the "
-"current guess in the <literal>Game</literal> </para> </listitem> <listitem> "
-"<para> Calls <literal>game.check()</literal> to validate and perform one "
-"'turn' of the game </para> </listitem> <listitem> <para> Calls "
-"<literal>refreshUI</literal>. If there were validation errors with the "
+"button is clicked, and it does the following:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Gets the guess entered by the user and sets it as the current guess in the "
+"<literal>Game</literal>"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
+"the game"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>refreshUI</literal>. If there were validation errors with the "
 "input, this will have been captured during <literal>game.check()</literal> "
 "and as such will be reflected in the messages returned by "
 "<literal>MessageGenerator</literal> and subsequently presented to the user. "
 "If there are no validation errors then the user will be told to guess again "
 "(higher or lower) or that the game has ended either in a win (correct guess) "
-"or a loss (ran out of guesses). </para> </listitem> </itemizedlist> </"
-"callout> <callout arearefs=\"replay\"> <para> "
+"or a loss (ran out of guesses)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>replayBtnActionPerformed</literal> simply calls <literal>game.reset"
-"()</literal> to start a new game and refreshes the messages in the UI. </"
-"para> </callout> </calloutlist> </programlistingco>"
+"()</literal> to start a new game and refreshes the messages in the UI."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:716
 #, no-c-format
 msgid "The translator example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:718
 #, no-c-format
 msgid ""
 "The translator example will take any sentences you enter, and translate them "
@@ -1265,52 +775,29 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:723
 #, no-c-format
 msgid ""
-"The translator example is built as an EAR and contains EJBs. As a result, "
+"The translator example is built as an ear and contains EJBs. As a result, "
 "it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:729
 #, no-c-format
 msgid ""
-"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a WAR, which "
+"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a war, which "
 "will make this structure much simpler! Still, there are other advantages of "
-"using an EAR."
+"using an ear."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:735
 #, no-c-format
 msgid ""
-"First, let's take a look at the EAR aggregator, which is located in the "
+"First, let's take a look at the ear aggregator, which is located in the "
 "example's <literal>ear</literal> directory. Maven automatically generates "
 "the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:740
-#, no-c-format
-msgid ""
-"<![CDATA[<plugin>\n"
-"   <groupId>org.apache.maven.plugins</groupId>\n"
-"   <artifactId>maven-ear-plugin</artifactId>\n"
-"   <configuration>\n"
-"      <modules>\n"
-"         <webModule>\n"
-"            <groupId>org.jboss.weld.examples.jsf.translator</groupId>\n"
-"            <artifactId>weld-jsf-translator-war</artifactId>\n"
-"            <contextRoot>/weld-translator</contextRoot>\n"
-"         </webModule>\n"
-"      </modules>\n"
-"   </configuration>\n"
-"</plugin>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:742
 #, no-c-format
 msgid ""
 "This configuration overrides the web context path, resulting in this "
@@ -1319,44 +806,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:748
 #, no-c-format
 msgid ""
 "If you weren't using Maven to generate these files, you would need "
 "<literal>META-INF/application.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:753
-#, no-c-format
-msgid ""
-"<![CDATA[<application version=\"5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/application_5.xsd\">\n"
-"\n"
-"  <display-name>weld-jsf-translator-ear</display-name>\n"
-"  <description>The Weld JSF translator example (EAR)</description>\n"
-"  \n"
-"  <module>\n"
-"    <web>\n"
-"      <web-uri>weld-translator.war</web-uri>\n"
-"      <context-root>/weld-translator</context-root>\n"
-"    </web>\n"
-"  </module>\n"
-"  <module>\n"
-"    <ejb>weld-translator.jar</ejb>\n"
-"  </module>\n"
-"</application>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:756
 #, no-c-format
 msgid ""
-"Next, lets look at the WAR, which is located in the example's <literal>war</"
+"Next, lets look at the war, which is located in the example's <literal>war</"
 "literal> directory. Just as in the numberguess example, we have a "
 "<literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</"
 "literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/"
@@ -1364,7 +823,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:762
 #, no-c-format
 msgid ""
 "More interesting is the JSF view used to translate text. Just as in the "
@@ -1372,41 +830,7 @@
 "here for brevity):"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:767
-#, no-c-format
-msgid ""
-"<![CDATA[<h:form id=\"translator\">\n"
-"\n"
-"   <table>\n"
-"      <tr align=\"center\" style=\"font-weight: bold\">\n"
-"         <td>\n"
-"            Your text\n"
-"         </td>\n"
-"         <td>\n"
-"            Translation\n"
-"         </td>\n"
-"      </tr>\n"
-"      <tr>\n"
-"         <td>\n"
-"            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
-"required=\"true\" rows=\"5\" cols=\"80\"/>\n"
-"         </td>\n"
-"         <td>\n"
-"            <h:outputText value=\"#{translator.translatedText}\"/>\n"
-"         </td>\n"
-"      </tr>\n"
-"   </table>\n"
-"   <div>\n"
-"      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
-"{translator.translate}\"/>\n"
-"   </div>\n"
-"   \n"
-"</h:form>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:769
 #, no-c-format
 msgid ""
 "The user can enter some text in the left-hand textarea, and hit the "
@@ -1414,7 +838,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:774
 #, no-c-format
 msgid ""
 "Finally, let's look at the EJB module, which is located in the example's "
@@ -1424,7 +847,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:780
 #, no-c-format
 msgid ""
 "We've saved the most interesting bit to last, the code! The project has two "
@@ -1436,7 +858,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:787
 #, no-c-format
 msgid ""
 "Both <literal>SentenceParser</literal> and <literal>TextTranslator</literal> "
@@ -1444,33 +865,7 @@
 "injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:792
-#, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator implements Serializable { \n"
-"\n"
-"   private SentenceParser sentenceParser; \n"
-"\n"
-"   @EJB private Translator translator; \n"
-"   \n"
-"   @Inject public TextTranslator(SentenceParser sentenceParser) { \n"
-"      this.sentenceParser = sentenceParser; \n"
-"   }\n"
-"   \n"
-"   public String translate(String text) { \n"
-"      StringBuilder sb = new StringBuilder(); \n"
-"      for (String sentence: sentenceParser.parse(text)) { \n"
-"         sb.append(translator.translate(sentence)).append(\". \"); \n"
-"      } \n"
-"      return sb.toString().trim(); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:794
 #, no-c-format
 msgid ""
 "<literal>TextTranslator</literal> uses the simple bean (really just a plain "
@@ -1481,22 +876,7 @@
 "convincing enough to anyone who doesn't understand Latin!"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:802
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator { \n"
-"\n"
-"   public String translate(String sentence) { \n"
-"      return \"Lorem ipsum dolor sit amet\"; \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:804
 #, no-c-format
 msgid ""
 "Finally, there is UI orientated controller. This is a request scoped, named, "
@@ -1505,44 +885,7 @@
 "and setters for all the fields on the page."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:810
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"@RequestScoped\n"
-"@Named(\"translator\")\n"
-"public class TranslatorControllerBean implements TranslatorController {\n"
-"\n"
-"   @Inject private TextTranslator translator;\n"
-"   \n"
-"   private String inputText;\n"
-"   \n"
-"   private String translatedText;\n"
-"   \n"
-"   public void translate() {\n"
-"      translatedText = translator.translate(inputText);\n"
-"   }\n"
-"   \n"
-"   public String getText() {\n"
-"      return inputText;\n"
-"   }\n"
-"   \n"
-"   public void setText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"   \n"
-"   public String getTranslatedText() {\n"
-"      return translatedText;\n"
-"   }\n"
-"   \n"
-"   @Remove public void remove() {}\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:814
 #, no-c-format
 msgid ""
 "That concludes our short tour of the Weld starter examples. For more "

Modified: doc/trunk/reference/zh-CN/xml.po
===================================================================
--- doc/trunk/reference/zh-CN/xml.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-CN/xml.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-13 15:01+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: xml.xml:5
 #, fuzzy, no-c-format
 msgid "Defining beans using XML"
 msgstr "使用XML定义Web Bean"
 
 #. Tag: para
-#: xml.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "So far, we've seen plenty of examples of beans declared using annotations. "
@@ -31,19 +29,16 @@
 "注释来定义Web Bean,如下列情况:"
 
 #. Tag: para
-#: xml.xml:14
 #, no-c-format
 msgid "when the implementation class comes from some preexisting library, or"
 msgstr "当实现类是从先前已经存在的类库中产生的时候,或者"
 
 #. Tag: para
-#: xml.xml:19
 #, fuzzy, no-c-format
 msgid "when there should be multiple beans with the same implementation class."
 msgstr "多个Web Bean对应同一个实现类的时候。"
 
 #. Tag: para
-#: xml.xml:25
 #, no-c-format
 msgid ""
 "One way to address these problems is to write a producer method. Weld offers "
@@ -53,7 +48,6 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:31
 #, fuzzy, no-c-format
 msgid ""
 "Many frameworks use XML to provide metadata relating to Java classes. "
@@ -67,7 +61,6 @@
 "素名,而不是将类和成员名作为XML元素的字符串值来声明Web Bean。"
 
 #. Tag: para
-#: xml.xml:38
 #, no-c-format
 msgid ""
 "The advantage of this approach is that you can write an XML schema that "
@@ -81,13 +74,11 @@
 "可以直接进行验证,无需使用显式的中间生成步骤。"
 
 #. Tag: title
-#: xml.xml:46
 #, fuzzy, no-c-format
 msgid "Declaring beans"
 msgstr "声明Web Bean类"
 
 #. Tag: para
-#: xml.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "For each Java package, Weld defines a corresponding XML namespace. The "
@@ -101,7 +92,6 @@
 "literal>。"
 
 #. Tag: para
-#: xml.xml:54
 #, no-c-format
 msgid ""
 "Java types belonging to a package are referred to using an XML element in "
@@ -115,7 +105,6 @@
 "释的话,其成员通过这个元素的属性指定。"
 
 #. Tag: para
-#: xml.xml:61
 #, no-c-format
 msgid ""
 "For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
@@ -124,24 +113,7 @@
 "例如, 在下面的XML片段中的元素<literal>&lt;util:Date/&gt;</literal>指的是 "
 "<literal>java.util.Date</literal> 类:"
 
-#. Tag: programlisting
-#: xml.xml:66
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:util=\"urn:java:java.util\">\n"
-"   <util:Date/>\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
-"          xmlns:util=\"urn:java:java.util\">\n"
-"\n"
-"    <util:Date/>\n"
-"\n"
-"</WebBeans>]]>"
-
 #. Tag: para
-#: xml.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "And this is all the code we need to declare that <literal>Date</literal> is "
@@ -151,20 +123,12 @@
 "这个是将<literal>Date</literal> 声明为一个简单web Bean所需的所有代码!现在任"
 "何一个 <literal>Date</literal> 实例都可以被任何其他Web Bean注入了:"
 
-#. Tag: programlisting
-#: xml.xml:73
-#, fuzzy, no-c-format
-msgid "<![CDATA[private @Inject Date date;]]>"
-msgstr "<![CDATA[@Current Date date]]>"
-
 #. Tag: title
-#: xml.xml:78
 #, fuzzy, no-c-format
 msgid "Declaring bean metadata"
 msgstr "声明Web Bean的元数据"
 
 #. Tag: para
-#: xml.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "We can declare the scope, deployment type and interceptor binding types "
@@ -172,66 +136,12 @@
 msgstr ""
 "我们可以直接通过Web Bean声明的子元素来声明范围,部署类型和拦截器绑定类型:"
 
-#. Tag: programlisting
-#: xml.xml:85
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"   <SessionScoped/>\n"
-"   <myfwk:Transactional requiresNew=\"true\"/>\n"
-"   <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
-msgstr ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"    <SessionScoped/>\n"
-"    <myfwk:Transactional requiresNew=\"true\"/>\n"
-"    <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
-
 #. Tag: para
-#: xml.xml:87
 #, fuzzy, no-c-format
 msgid "We use exactly the same approach to specify names and qualifiers:"
 msgstr "我们可以使用相同方法来指定名字和绑定类型:"
 
-#. Tag: programlisting
-#: xml.xml:89
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<util:Date>\n"
-"   <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <SessionScoped/>\n"
-"   <myapp:Login/>\n"
-"   <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:SystemStart/>\n"
-"   <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
-msgstr ""
-"<![CDATA[<util:Date>\n"
-"    <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"    <SessionScoped/>\n"
-"    <myapp:Login/>\n"
-"    <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"    <ApplicationScoped/>\n"
-"    <myapp:SystemStart/>\n"
-"    <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
-
 #. Tag: para
-#: xml.xml:91
 #, fuzzy, no-c-format
 msgid ""
 "Where <literal>@Login</literal> and <literal>@SystemStart</literal> are "
@@ -239,40 +149,12 @@
 msgstr ""
 "<literal>@Login</literal> 和 <literal>@SystemStart</literal> 是绑定注释类型。"
 
-#. Tag: programlisting
-#: xml.xml:95
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[private @Inject Date currentTime;\n"
-"private @Login Date loginTime;\n"
-"private @SystemStart Date systemStartTime;]]>"
-msgstr ""
-"<![CDATA[@Current Date currentTime;\n"
-"@Login Date loginTime;\n"
-"@SystemStart Date systemStartTime;]]>"
-
 #. Tag: para
-#: xml.xml:97
 #, fuzzy, no-c-format
 msgid "As usual, a bean may support multiple qualifier types:"
 msgstr "通常,一个Web Bean可以支持多个绑定类型:"
 
-#. Tag: programlisting
-#: xml.xml:99
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"   <myapp:PayByCheque/>\n"
-"   <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
-msgstr ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"    <myapp:PayByCheque/>\n"
-"    <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
-
 #. Tag: para
-#: xml.xml:101
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors and decorators are beans as well, so they may be declared just "
@@ -281,72 +163,27 @@
 "拦截器和装饰器只不过是简单的Web Beans,所以它们可以像其他简单Web Bean一样被声"
 "明:"
 
-#. Tag: programlisting
-#: xml.xml:105
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"   <Interceptor/>\n"
-"   <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
-msgstr ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"    <Interceptor/>\n"
-"    <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
-
 #. Tag: title
-#: xml.xml:110
 #, fuzzy, no-c-format
 msgid "Declaring bean members"
 msgstr "声明Web Bean成员"
 
 #. Tag: para
-#: xml.xml:112
 #, no-c-format
 msgid "TODO!"
 msgstr "TODO!"
 
 #. Tag: title
-#: xml.xml:119
 #, fuzzy, no-c-format
 msgid "Declaring inline beans"
 msgstr "声明内联的Web Beans"
 
 #. Tag: para
-#: xml.xml:121
 #, fuzzy, no-c-format
 msgid "Weld lets us define a bean at an injection point. For example:"
 msgstr "Web Beans让我们能够在一个注入点定义一个Web Bean。例如:"
 
-#. Tag: programlisting
-#: xml.xml:123
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:System>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:admin>\n"
-"      <myapp:Name>\n"
-"         <myapp:firstname>Gavin</myapp:firstname>\n"
-"         <myapp:lastname>King</myapp:lastname>\n"
-"         <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"      </myapp:Name>\n"
-"   </myapp:admin>\n"
-"</myapp:System>]]>"
-msgstr ""
-"<![CDATA[<myapp:System>\n"
-"    <ApplicationScoped/>\n"
-"    <myapp:admin>\n"
-"        <myapp:Name>\n"
-"            <myapp:firstname>Gavin</myapp:firstname>\n"
-"            <myapp:lastname>King</myapp:lastname>\n"
-"            <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"        </myapp:Name>\n"
-"    </myapp:admin>\n"
-"</myapp:System>]]>"
-
 #. Tag: para
-#: xml.xml:125
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
@@ -361,7 +198,6 @@
 "注入点被注入。"
 
 #. Tag: para
-#: xml.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "This simple but powerful feature allows the Weld XML format to be used to "
@@ -372,13 +208,11 @@
 "图。这并不是完整的数据绑定方案,但是它很接近了!"
 
 #. Tag: title
-#: xml.xml:139
 #, no-c-format
 msgid "Using a schema"
 msgstr "使用一个模式"
 
 #. Tag: para
-#: xml.xml:141
 #, fuzzy, no-c-format
 msgid ""
 "If we want our XML document format to be authored by people who aren't Java "
@@ -388,39 +222,7 @@
 "如果我们希望我们的XML文档格式由非Java开发者或者没有权限访问我们代码的人来制"
 "定,我们需要提供一个模式。在Web Beans中使用模式没有什么特殊的地方。"
 
-#. Tag: programlisting
-#: xml.xml:147
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/beans-"
-"1.0.xsd\n"
-"   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"   <myapp:System>\n"
-"      ...\n"
-"   </myapp:System>\n"
-"\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
-"          xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"          xsi:schemaLocation=\"urn:java:javax.webbeans http://java.sun.com/"
-"jee/web-beans-1.0.xsd\n"
-"                              urn:java:com.mydomain.myapp http://mydomain."
-"com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"    <myapp:System>\n"
-"        ...\n"
-"    </myapp:System>\n"
-"\n"
-"</WebBeans>]]>"
-
 #. Tag: para
-#: xml.xml:149
 #, fuzzy, no-c-format
 msgid ""
 "Writing an XML schema is quite tedious. Therefore, the Weld project will "
@@ -430,6 +232,159 @@
 "编写一个XML模式相当繁琐。因此,Web Bean的参考实现项目提供了一个工具,可以从编"
 "译好的Java代码中自动化生成XML模式。"
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:util=\"urn:java:java.util\">\n"
+#~ "   <util:Date/>\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
+#~ "          xmlns:util=\"urn:java:java.util\">\n"
+#~ "\n"
+#~ "    <util:Date/>\n"
+#~ "\n"
+#~ "</WebBeans>]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[private @Inject Date date;]]>"
+#~ msgstr "<![CDATA[@Current Date date]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "   <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "    <SessionScoped/>\n"
+#~ "    <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "    <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "   <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myapp:Login/>\n"
+#~ "   <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:SystemStart/>\n"
+#~ "   <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "    <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "    <SessionScoped/>\n"
+#~ "    <myapp:Login/>\n"
+#~ "    <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "    <ApplicationScoped/>\n"
+#~ "    <myapp:SystemStart/>\n"
+#~ "    <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[private @Inject Date currentTime;\n"
+#~ "private @Login Date loginTime;\n"
+#~ "private @SystemStart Date systemStartTime;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Current Date currentTime;\n"
+#~ "@Login Date loginTime;\n"
+#~ "@SystemStart Date systemStartTime;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "   <myapp:PayByCheque/>\n"
+#~ "   <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "    <myapp:PayByCheque/>\n"
+#~ "    <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "   <Interceptor/>\n"
+#~ "   <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "    <Interceptor/>\n"
+#~ "    <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:admin>\n"
+#~ "      <myapp:Name>\n"
+#~ "         <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "         <myapp:lastname>King</myapp:lastname>\n"
+#~ "         <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "      </myapp:Name>\n"
+#~ "   </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "    <ApplicationScoped/>\n"
+#~ "    <myapp:admin>\n"
+#~ "        <myapp:Name>\n"
+#~ "            <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "            <myapp:lastname>King</myapp:lastname>\n"
+#~ "            <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "        </myapp:Name>\n"
+#~ "    </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/"
+#~ "beans-1.0.xsd\n"
+#~ "   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "   <myapp:System>\n"
+#~ "      ...\n"
+#~ "   </myapp:System>\n"
+#~ "\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
+#~ "          xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "          xsi:schemaLocation=\"urn:java:javax.webbeans http://java.sun."
+#~ "com/jee/web-beans-1.0.xsd\n"
+#~ "                              urn:java:com.mydomain.myapp http://mydomain."
+#~ "com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "    <myapp:System>\n"
+#~ "        ...\n"
+#~ "    </myapp:System>\n"
+#~ "\n"
+#~ "</WebBeans>]]>"
+
 #~ msgid "In either of these cases, Web Beans gives us two options:"
 #~ msgstr "在上述任何一种情况下,Web Bean给我们两种选择:"
 

Modified: doc/trunk/reference/zh-TW/Author_Group.po
===================================================================
--- doc/trunk/reference/zh-TW/Author_Group.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/Author_Group.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Author_Group\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-08 09:27+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -16,109 +16,128 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#. Tag: author
-#: Author_Group.xml:5
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Gavin</firstname> <surname>King</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+msgid "Gavin"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:8
 #, no-c-format
 msgid "JSR-299: Contexts and Dependency Injection Lead"
 msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:14
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+msgid "Pete"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:17
 #, no-c-format
 msgid "Weld (JSR-299 RI) Lead"
 msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:24
-#, fuzzy, no-c-format
-msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Dan"
+msgstr ""
 
-#. Tag: author
-#: Author_Group.xml:31
-#, fuzzy, no-c-format
-msgid "<firstname>David</firstname> <surname>Allen</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "David"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:35
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
-msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+msgid "Nicola"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:38 Author_Group.xml:67
 #, no-c-format
 msgid "Italian Translation"
 msgstr "義大利文翻譯"
 
-#. Tag: othercredit
-#: Author_Group.xml:40
-#, fuzzy, no-c-format
-msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Gladys"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:43
 #, fuzzy, no-c-format
 msgid "Spanish Translation"
 msgstr "義大利文翻譯"
 
-#. Tag: othercredit
-#: Author_Group.xml:48
-#, fuzzy, no-c-format
-msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Eun-Ju"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:51
 #, fuzzy, no-c-format
 msgid "Korean Translation"
 msgstr "義大利文翻譯"
 
-#. Tag: othercredit
-#: Author_Group.xml:56
-#, fuzzy, no-c-format
-msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Terry"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:59
 #, fuzzy, no-c-format
 msgid "Traditional Chinese Translation"
 msgstr "義大利文翻譯"
 
-#. Tag: othercredit
-#: Author_Group.xml:64
+#. Tag: firstname
 #, no-c-format
-msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
-msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+msgid "Francesco"
+msgstr ""
 
-#. Tag: othercredit
-#: Author_Group.xml:69
-#, fuzzy, no-c-format
-msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+#. Tag: firstname
+#, no-c-format
+msgid "Sean"
+msgstr ""
 
 #. Tag: contrib
-#: Author_Group.xml:72
 #, fuzzy, no-c-format
 msgid "Simplified Chinese Translation"
 msgstr "義大利文翻譯"
 
+#~ msgid "<firstname>Gavin</firstname> <surname>King</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#~ msgid "<firstname>Pete</firstname> <surname>Muir</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
 #, fuzzy
+#~ msgid "<firstname>Dan</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>David</firstname> <surname>Allen</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#~ msgid "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+#~ msgstr "<firstname>Nicola</firstname> <surname>Benaglia</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
+#~ msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
+#~ msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+#~ msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+
+#, fuzzy
+#~ msgid "<firstname>Sean</firstname> <surname>Wu</surname>"
+#~ msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+
+#, fuzzy
 #~ msgid ""
 #~ "<jobtitle>JSR-299 specification lead</jobtitle> <orgname>Red Hat "
 #~ "Middleware LLC</orgname>"

Modified: doc/trunk/reference/zh-TW/Book_Info.po
===================================================================
--- doc/trunk/reference/zh-TW/Book_Info.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/Book_Info.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Book_Info\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-08 09:34+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: Book_Info.xml:4
 #, no-c-format
 msgid "Weld - JSR-299 Reference Implementation"
 msgstr ""
 
 #. Tag: subtitle
-#: Book_Info.xml:5
 #, fuzzy, no-c-format
 msgid ""
 "JSR-299: The new Java standard for dependency injection and contextual "

Modified: doc/trunk/reference/zh-TW/beans.po
===================================================================
--- doc/trunk/reference/zh-TW/beans.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/beans.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: beans.xml:4
 #, no-c-format
 msgid "More about beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:6
 #, no-c-format
 msgid ""
 "A bean is usually an application class that contains business logic. It may "
@@ -32,7 +30,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:13
 #, no-c-format
 msgid ""
 "Let's back up a second. What does it really mean to be <emphasis>contextual</"
@@ -45,7 +42,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:21
 #, no-c-format
 msgid ""
 "However, like a stateless or singleton model, but <emphasis>unlike</"
@@ -55,19 +51,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:29
 #, no-c-format
 msgid "the lifecycle of each instance of the bean and"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:32
 #, no-c-format
 msgid "which clients share a reference to a particular instance of the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:36
 #, no-c-format
 msgid ""
 "For a given thread in a CDI application, there may be an <emphasis>active "
@@ -78,7 +71,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:43
 #, no-c-format
 msgid ""
 "Clients (for example, other beans) executing in the same context will see "
@@ -87,7 +79,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:49
 #, no-c-format
 msgid ""
 "One great advantage of the contextual model is that it allows stateful beans "
@@ -99,46 +90,39 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:58
 #, no-c-format
 msgid "they interact via well-defined public APIs"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:61
 #, no-c-format
 msgid "their lifecycles are completely decoupled"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:65
 #, no-c-format
 msgid ""
 "We can replace one bean with another different bean that implements the same "
 "interface and has a different lifecycle (a different scope) without "
 "affecting the other bean implementation. In fact, CDI defines a simple "
 "facility for overriding bean implementations at deployment time, as we will "
-"see in <xref linkend=\"alternatives\"/>."
+"see in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:71
 #, no-c-format
 msgid ""
 "Note that not all clients of a bean are beans themselves. Other objects such "
-"as servlets or message-driven beans&#8212;which are by nature not "
-"injectable, contextual objects&#8212;may also obtain references to beans by "
-"injection."
+"as servlets or message-driven beans—which are by nature not injectable, "
+"contextual objects—may also obtain references to beans by injection."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:78
 #, no-c-format
 msgid "The anatomy of a bean"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:80
 #, no-c-format
 msgid ""
 "Enough hand-waving. More formally, the anatomy of a bean, according to the "
@@ -146,67 +130,56 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:84
 #, no-c-format
 msgid "A bean comprises the following attributes:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:87
 #, no-c-format
 msgid "A (nonempty) set of bean types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:88
 #, no-c-format
 msgid "A (nonempty) set of qualifiers"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:89
 #, no-c-format
 msgid "A scope"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:90
 #, no-c-format
 msgid "Optionally, a bean EL name"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:91
 #, no-c-format
 msgid "A set of interceptor bindings"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:92
 #, no-c-format
 msgid "A bean implementation"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:95
 #, no-c-format
 msgid "Furthermore, a bean may or may not be an alternative."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:99
 #, no-c-format
 msgid "Let's see what all this new terminology means."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:102
 #, no-c-format
 msgid "Bean types, qualifiers and dependency injection"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:104
 #, no-c-format
 msgid ""
 "Beans usually acquire references to other beans via dependency injection. "
@@ -215,19 +188,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:110
 #, no-c-format
 msgid "a bean type, together with"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:111
 #, no-c-format
 msgid "a set of qualifiers."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:114
 #, no-c-format
 msgid ""
 "A bean type is a user-defined class or interface; a type that is client-"
@@ -237,19 +207,7 @@
 "types:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:120
-#, no-c-format
-msgid ""
-"<![CDATA[public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:122
 #, no-c-format
 msgid ""
 "The bean types are <literal>BookShop</literal>, <literal>Business</literal> "
@@ -259,7 +217,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:128
 #, no-c-format
 msgid ""
 "Meanwhile, this session bean has only the local interfaces "
@@ -268,29 +225,17 @@
 "<literal>BookShopBean</literal> is not a client-visible type."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"public class BookShopBean \n"
-"      extends Business \n"
-"      implements BookShop, Auditable {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:137
 #, no-c-format
 msgid ""
-"Most bean types you can probably figure out. One gotcha is primitive types. "
-"All primitive types are assumed to be identical to their corresponding "
-"wrapper types in <literal>java.lang</literal>."
+"The bean types of a session bean include local interfaces and the bean class "
+"local view (if any). EJB remote interfaces are not considered bean types of "
+"a session bean. You can't inject an EJB using its remote interface unless "
+"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
+"linkend=\"resources\" />."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:143
 #, no-c-format
 msgid ""
 "Bean types may be restricted to an explicit set by annotating the bean with "
@@ -300,20 +245,7 @@
 "<literal>java.lang.Object</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:149
-#, no-c-format
-msgid ""
-"<![CDATA[@Typed(Shop.class)\n"
-"public class BookShop \n"
-"      extends Business \n"
-"      implements Shop<Book> {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:151
 #, no-c-format
 msgid ""
 "Sometimes, a bean type alone does not provide enough information for the "
@@ -328,7 +260,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:160
 #, no-c-format
 msgid ""
 "A qualifier is a user-defined annotation that is itself annotated "
@@ -337,18 +268,7 @@
 "string-based names. Here's an example of a qualifier annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:166
-#, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface CreditCard {}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:168
 #, no-c-format
 msgid ""
 "You may not be used to seeing the definition of an annotation. In fact, this "
@@ -358,7 +278,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:175
 #, no-c-format
 msgid ""
 "Pay attention to the names of the built-in annotations in CDI and EJB. "
@@ -368,7 +287,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:182
 #, no-c-format
 msgid ""
 "Now that we have defined a qualifier annotation, we can use it to "
@@ -377,14 +295,7 @@
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:188
-#, no-c-format
-msgid "<![CDATA[@Inject @CreditCard PaymentProcessor paymentProcessor]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:191
 #, no-c-format
 msgid ""
 "If an injection point does not explicitly specify a qualifier, it has the "
@@ -392,7 +303,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:197
 #, no-c-format
 msgid ""
 "For each injection point, the container searches for a bean which satisfies "
@@ -402,7 +312,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:203
 #, no-c-format
 msgid ""
 "How do we specify that qualifiers of a bean? By annotating the bean class, "
@@ -411,17 +320,7 @@
 "Therefore, it satisfies our qualified injection point:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:209
-#, no-c-format
-msgid ""
-"<![CDATA[@CreditCard\n"
-"public class CreditCardPaymentProcessor \n"
-"    implements PaymentProcessor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:212
 #, no-c-format
 msgid ""
 "If a bean does not explicitly specify a qualifier, it has the default "
@@ -429,23 +328,20 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:225
 #, no-c-format
 msgid ""
 "That's not quite the end of the story. CDI also defines a simple "
 "<emphasis>resolution rule</emphasis> that helps the container decide what to "
 "do if there is more than one bean that satisfies a particular contract. "
-"We'll get into the details in <xref linkend=\"injection\"/>."
+"We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:245
 #, no-c-format
 msgid "Scope"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:248
 #, no-c-format
 msgid ""
 "The <emphasis>scope</emphasis> of a bean defines the lifecycle and "
@@ -456,23 +352,13 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:255
 #, no-c-format
 msgid ""
 "For example, any web application may have <emphasis>session scoped</"
 "emphasis> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:259
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:261
 #, no-c-format
 msgid ""
 "An instance of a session-scoped bean is bound to a user session and is "
@@ -480,7 +366,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:265
 #, no-c-format
 msgid ""
 "Keep in mind that once a bean is bound to a context, it remains in that "
@@ -491,7 +376,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:273
 #, no-c-format
 msgid ""
 "If a scope is not explicitly specified, then the bean belongs to a special "
@@ -501,19 +385,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:279
 #, no-c-format
-msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\"/>."
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:284
 #, no-c-format
 msgid "EL name"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:286
 #, no-c-format
 msgid ""
 "If you want to reference a bean in non-Java code that supports Unified EL "
@@ -522,38 +403,18 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:291
 #, no-c-format
 msgid ""
 "The EL name is specified using the <literal>@Named</literal> annotation, as "
 "shown here:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:295
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named(\"cart\")\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:297
 #, no-c-format
 msgid "Now we can easily use the bean in any JSF or JSP page:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:299
-#, no-c-format
-msgid ""
-"<![CDATA[<h:dataTable value=\"#{cart.lineItems}\" var=\"item\">\n"
-"   ...\n"
-"</h:dataTable>]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:302
 #, no-c-format
 msgid ""
 "The <literal>@Named</literal> annotation is not what makes the class a bean. "
@@ -563,23 +424,13 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:309
 #, no-c-format
 msgid ""
 "We can let CDI choose a name for us by leaving off the value of the "
 "<literal>@Named</literal> annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:313
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Named\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:315
 #, no-c-format
 msgid ""
 "The name defaults to the unqualified class name, decapitalized; in this "
@@ -587,13 +438,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:325
 #, no-c-format
 msgid "Alternatives"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:327
 #, no-c-format
 msgid ""
 "We've already seen how qualifiers let us choose between multiple "
@@ -605,42 +454,30 @@
 "literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:335
-#, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class MockPaymentProcessor extends PaymentProcessorImpl { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:337
 #, no-c-format
 msgid ""
 "We normally annotate a bean <literal>@Alternative</literal> only when there "
 "is some other implementation of an interface it implements (or of any of its "
 "bean types). We can choose between alternatives at deployment time by "
 "<emphasis>selecting</emphasis> an alternative in the CDI deployment "
-"descriptor <literal>META-INF/beans.xml</literal> of the JAR or Java EE "
+"descriptor <literal>META-INF/beans.xml</literal> of the jar or Java EE "
 "module that uses it. Different modules can specify that they use different "
 "alternatives."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:345
 #, no-c-format
 msgid ""
-"We cover alternatives in more detail in <xref linkend=\"alternatives\"/>."
+"We cover alternatives in more detail in <xref linkend=\"alternatives\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:352
 #, no-c-format
 msgid "Interceptor binding types"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:354
 #, no-c-format
 msgid ""
 "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, "
@@ -651,7 +488,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:361
 #, no-c-format
 msgid ""
 "The way that interceptors were defined in Java EE 5 was counter-intuitive. "
@@ -668,7 +504,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:372
 #, no-c-format
 msgid ""
 "CDI provides a new approach to binding interceptors to beans that introduces "
@@ -678,7 +513,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:378
 #, no-c-format
 msgid ""
 "An interceptor binding type is a user-defined annotation that is itself "
@@ -687,51 +521,21 @@
 "two classes."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:383
-#, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Inherited\n"
-"@Target( { TYPE, METHOD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:385
 #, no-c-format
 msgid ""
 "The interceptor that implements transaction management declares this "
 "annotation:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[public @Transactional @Interceptor\n"
-"class TransactionInterceptor { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:391
 #, no-c-format
 msgid ""
 "We can apply the interceptor to a bean by annotating the bean class with the "
 "same interceptor binding type:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:395
-#, no-c-format
-msgid ""
-"<![CDATA[public @SessionScoped @Transactional\n"
-"class ShoppingCart implements Serializable { ... }]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:397
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
@@ -740,32 +544,28 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:402
 #, no-c-format
 msgid ""
 "Interceptors are deployment-specific. (We don't need a "
 "<literal>TransactionInterceptor</literal> in our unit tests!) By default, an "
 "interceptor is disabled. We can enable an interceptor using the CDI "
-"deployment descriptor <literal>META-INF/beans.xml</literal> of the JAR or "
+"deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or "
 "Java EE module. This is also where we specify the interceptor ordering."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:409
 #, no-c-format
 msgid ""
 "We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
-"\"interceptors\"/> and <xref linkend=\"decorators\"/>."
+"\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:419
 #, no-c-format
 msgid "What kinds of classes are beans?"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:421
 #, no-c-format
 msgid ""
 "We've already seen two types of beans: JavaBeans and EJB session beans. Is "
@@ -774,13 +574,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:428
 #, no-c-format
 msgid "Managed beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:430
 #, no-c-format
 msgid ""
 "A managed bean is a Java class. The basic lifecycle and semantics of a "
@@ -792,19 +590,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:441
 #, no-c-format
 msgid "It is not a non-static inner class."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:444
 #, no-c-format
 msgid "It is a concrete class, or is annotated <literal>@Decorator</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:447
 #, no-c-format
 msgid ""
 "It is not annotated with an EJB component-defining annotation or declared as "
@@ -812,7 +607,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:453
 #, no-c-format
 msgid ""
 "It does not implement <literal>javax.enterprise.inject.spi.Extension</"
@@ -820,34 +614,41 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:456
 #, no-c-format
-msgid "It has an appropriate constructor&#8212;either:"
+msgid "It has an appropriate constructor—either:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:461
 #, no-c-format
 msgid "the class has a constructor with no parameters, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:464
 #, no-c-format
 msgid "the class declares a constructor annotated <literal>@Inject</literal>."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:472
 #, no-c-format
 msgid ""
+"According to this definition, JPA entities are technically managed beans. "
+"However, entities have their own special lifecycle, state and identity model "
+"and are usually instantiated by JPA or using <literal>new</literal>. "
+"Therefore we don't recommend directly injecting an entity class. We "
+"especially recommend against assigning a scope other than "
+"<literal>@Dependent</literal> to an entity class, since JPA is not able to "
+"persist injected CDI proxies."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The unrestricted set of bean types for a managed bean contains the bean "
 "class, every superclass and all interfaces it implements directly or "
 "indirectly."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:475
 #, no-c-format
 msgid ""
 "If a managed bean has a public field, it must have the default scope "
@@ -855,7 +656,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:477
 #, no-c-format
 msgid ""
 "Managed beans support the <literal>@PostConstruct</literal> and "
@@ -863,7 +663,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:480
 #, no-c-format
 msgid ""
 "Session beans are also, technically, managed beans. However, since they have "
@@ -873,13 +672,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:489
 #, no-c-format
 msgid "Session beans"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:491
 #, no-c-format
 msgid ""
 "Session beans belong to the EJB specification. They have a special "
@@ -892,7 +689,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:500
 #, no-c-format
 msgid ""
 "Message-driven and entity beans are by nature non-contextual objects and may "
@@ -904,7 +700,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:508
 #, no-c-format
 msgid ""
 "The unrestricted set of bean types for a session bean contains all local "
@@ -916,7 +711,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:516
 #, no-c-format
 msgid ""
 "There's no reason to explicitly declare the scope of a stateless session "
@@ -927,20 +721,18 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:520
 #, no-c-format
 msgid ""
 "Stateful session beans may define a <emphasis>remove method</emphasis>, "
 "annotated <literal>@Remove</literal>, that is used by the application to "
 "indicate that an instance should be destroyed. However, for a contextual "
-"instance of the bean&#8212;an instance under the control of CDI&#8212;this "
-"method may only be called by the application if the bean has scope "
-"<literal>@Dependent</literal>. For beans with other scopes, the application "
-"must let the container destroy the bean."
+"instance of the bean—an instance under the control of CDI—this method may "
+"only be called by the application if the bean has scope <literal>@Dependent</"
+"literal>. For beans with other scopes, the application must let the "
+"container destroy the bean."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:528
 #, no-c-format
 msgid ""
 "So, when should we use a session bean instead of a plain managed bean? "
@@ -948,19 +740,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:535
 #, no-c-format
 msgid "method-level transaction management and security,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:538
 #, no-c-format
 msgid "concurrency management,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:541
 #, no-c-format
 msgid ""
 "instance-level passivation for stateful session beans and instance-pooling "
@@ -968,19 +757,16 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:545
 #, no-c-format
 msgid "remote or web service invocation, or"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:548
 #, no-c-format
 msgid "timers and asynchronous methods,"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:552
 #, no-c-format
 msgid ""
 "When we don't need any of these things, an ordinary managed bean will serve "
@@ -988,7 +774,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:554
 #, no-c-format
 msgid ""
 "Many beans (including any <literal>@SessionScoped</literal> or "
@@ -998,7 +783,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:560
 #, no-c-format
 msgid ""
 "Beans which hold references to heavy-weight resources, or hold a lot of "
@@ -1008,7 +792,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:566
 #, no-c-format
 msgid ""
 "Finally, it's usually obvious when method-level transaction management, "
@@ -1017,7 +800,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:571
 #, no-c-format
 msgid ""
 "The point we're trying to make is: use a session bean when you need the "
@@ -1030,7 +812,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:579
 #, no-c-format
 msgid ""
 "On the other hand, don't be scared to use session beans just because you've "
@@ -1043,13 +824,11 @@
 msgstr ""
 
 #. Tag: title
-#: beans.xml:590
 #, no-c-format
 msgid "Producer methods"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:592
 #, no-c-format
 msgid ""
 "Not everything that needs to be injected can be boiled down to a bean class "
@@ -1061,7 +840,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:600
 #, no-c-format
 msgid ""
 "A <emphasis>producer method</emphasis> is a method that acts as a source of "
@@ -1072,64 +850,31 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:607
 #, no-c-format
 msgid ""
 "A producer method is declared by annotating a method of a bean class with "
 "the <literal>@Produces</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:612
-#, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class RandomNumberGenerator {\n"
-"   \n"
-"   private Random random = new Random(System.currentTimeMillis());\n"
-"       \n"
-"   @Produces @Named @Random int getRandomNumber() {\n"
-"      return random.nextInt(100);\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:614
 #, no-c-format
 msgid ""
 "We can't write a bean class that is itself a random number. But we can "
 "certainly write a method that returns a random number. By making the method "
-"a producer method, we allow the return value of the method&#8212;in this "
-"case an <literal>Integer</literal>&#8212;to be injected. We can even specify "
-"a qualifier&#8212;in this case <literal>@Random</literal>, a scope&#8212;"
-"which in this case defaults to <literal>@Dependent</literal>, and an EL "
-"name&#8212;which in this case defaults to <literal>randomNumber</literal> "
-"according to the JavaBeans property name convention. Now we can get a random "
-"number anywhere:"
+"a producer method, we allow the return value of the method—in this case an "
+"<literal>Integer</literal>—to be injected. We can even specify a qualifier—"
+"in this case <literal>@Random</literal>, a scope—which in this case defaults "
+"to <literal>@Dependent</literal>, and an EL name—which in this case defaults "
+"to <literal>randomNumber</literal> according to the JavaBeans property name "
+"convention. Now we can get a random number anywhere:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:623
-#, no-c-format
-msgid "<![CDATA[@Inject @Random int randomNumber;]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:625
 #, no-c-format
 msgid "Even in a Unified EL expression:"
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:629
-#, no-c-format
-msgid "<![CDATA[<p>Your raffle number is #{randomNumber}.</p>]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:631
 #, no-c-format
 msgid ""
 "A producer method must be a non-abstract method of a managed bean class or "
@@ -1139,13 +884,11 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:637
 #, no-c-format
 msgid "The bean types of a producer method depend upon the method return type:"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:643
 #, no-c-format
 msgid ""
 "If the return type is an interface, the unrestricted set of bean types "
@@ -1154,7 +897,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:649
 #, no-c-format
 msgid ""
 "If a return type is primitive or is a Java array type, the unrestricted set "
@@ -1163,7 +905,6 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:655
 #, no-c-format
 msgid ""
 "If the return type is a class, the unrestricted set of bean types contains "
@@ -1172,59 +913,43 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:662
 #, no-c-format
 msgid ""
-"If the producer method has method parameters, the container will look for a "
-"bean that satisfies the type and qualifiers of each parameter and pass it to "
-"the method automatically&#8212;another form of dependency injection."
+"Producer methods and fields may have a primitive bean type. For the purpose "
+"of resolving dependencies, primitive types are considered to be identical to "
+"their corresponding wrapper types in <literal>java.lang</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:668
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Produces Set<Roles> getRoles(User user) {\n"
-"   return user.getRoles();\n"
-"}]]>"
+"If the producer method has method parameters, the container will look for a "
+"bean that satisfies the type and qualifiers of each parameter and pass it to "
+"the method automatically—another form of dependency injection."
 msgstr ""
 
 #. Tag: para
-#: beans.xml:670
 #, no-c-format
 msgid ""
 "We'll talk much more about producer methods in <xref linkend="
-"\"producermethods\"/>."
+"\"producermethods\" />."
 msgstr ""
 
 #. Tag: title
-#: beans.xml:675
 #, no-c-format
 msgid "Producer fields"
 msgstr ""
 
 #. Tag: para
-#: beans.xml:677
 #, no-c-format
 msgid ""
 "A <emphasis>producer field</emphasis> is a simpler alternative to a producer "
 "method. A producer field is declared by annotating a field of a bean class "
-"with the <literal>@Produces</literal> annotation&#8212;the same annotation "
-"used for producer methods."
+"with the <literal>@Produces</literal> annotation—the same annotation used "
+"for producer methods."
 msgstr ""
 
-#. Tag: programlisting
-#: beans.xml:683
-#, no-c-format
-msgid ""
-"<![CDATA[public class Shop {\n"
-"   @Produces PaymentProcessor paymentProcessor = ....;\n"
-"   @Produces @Catalog List<Product> products = ....;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: beans.xml:685
 #, no-c-format
 msgid ""
 "The rules for determining the bean types of a producer field parallel the "
@@ -1232,415 +957,12 @@
 msgstr ""
 
 #. Tag: para
-#: beans.xml:689
 #, no-c-format
 msgid ""
 "A producer field is really just a shortcut that lets us avoid writing a "
 "useless getter method. However, in addition to convenience, producer fields "
 "serve a specific purpose as an adaptor for Java EE component environment "
 "injection, but to learn more about that, you'll have to wait until <xref "
-"linkend=\"resources\"/>. Because we can't wait to get to work on some "
+"linkend=\"resources\" />. Because we can't wait to get to work on some "
 "examples."
 msgstr ""
-
-#. Tag: title
-#: beans.xml:701
-#, no-c-format
-msgid "The (minimal) bean descriptor"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:703
-#, no-c-format
-msgid ""
-"First, it's important to understand that the XML bean descriptor in CDI "
-"(beans.xml) is not there to define beans in XML, like in other popular bean "
-"containers. Rather, you use this file to enable CDI services for the current "
-"bean archive that is difficult to define consistently in Java or which you "
-"don't want to define in Java (e.g., to accomodate testing)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:710
-#, no-c-format
-msgid ""
-"For example, the XML is used to enable interceptors (which are disabled by "
-"default) and define interceptor ordering. So the bean descriptor "
-"<emphasis>complements</emphasis> the metadata that is provided in the Java "
-"language syntax. (You may still want to define beans in XML for other "
-"reasons, but that is the concern of an extension)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:717
-#, no-c-format
-msgid ""
-"Let's first ask why the beans.xml is required, then look at what services it "
-"is used used to enable."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:722
-#, no-c-format
-msgid "Why is beans.xml required?"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:724
-#, no-c-format
-msgid ""
-"You may be wondering, if beans are not described using XML, why do we need "
-"beans.xml at all, particularly if you don't have anything that you would "
-"need the bean descriptor to enable (alternatives, interceptors or "
-"decorators)?"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:730
-#, no-c-format
-msgid "There are two things about CDI that we need to keep in mind:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:736
-#, no-c-format
-msgid ""
-"CDI does not require any special declaration for a Java class to be injected "
-"- that's right, no annotation or XML declaration at all!"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:742
-#, no-c-format
-msgid ""
-"CDI does not define any special kind of module - CDI beans can be deployed "
-"in a library JAR, EJB JAR, WAR, RAR, or JVM classpath directory."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:749
-#, no-c-format
-msgid ""
-"The CDI specification calls the process of identifying beans in modules "
-"<emphasis>bean discovery</emphasis>."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:753
-#, no-c-format
-msgid ""
-"So there are potentially a lot of classes in the classpath which might be "
-"beans! We don't want to force the container to scan every one of those "
-"classes at startup and build its internal metamodel for each of them. This "
-"really could make bean discovery very slow."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:759
-#, no-c-format
-msgid ""
-"But there's another reason we need to give the user some control over which "
-"classes are available for injection. We don't want every class in the "
-"classpath to potentially match an injection point, including classes that "
-"were never intended to be injected into things. This would force the "
-"developer to have to use qualifiers much more often to disambiguate "
-"injection points."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:766
-#, no-c-format
-msgid "So we have two choices. We could have the developer:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:772
-#, no-c-format
-msgid "explicitly exclude modules which do not contain beans, or"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:775
-#, no-c-format
-msgid "explicitly declare modules which do contain beans."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:779
-#, no-c-format
-msgid ""
-"It should be clear that the second option is a much better way to go. Thus, "
-"CDI has the notion of a bean archive. A bean archive is just a module that "
-"has a file named beans.xml in the META-INF directory. The container looks "
-"for beans in bean archives. It ignores other modules."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:785
-#, no-c-format
-msgid ""
-"Now, you might be wondering if we've got the granularity wrong here. Why "
-"should module be the right criteria to use for including/excluding a class. "
-"Why not consider:"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:792
-#, no-c-format
-msgid "a class-level annotation,"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:795
-#, no-c-format
-msgid "the package,"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:798
-#, no-c-format
-msgid "some type it implements or extends, or"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:801
-#, no-c-format
-msgid "some naming convention."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:805
-#, no-c-format
-msgid ""
-"We've got the first option covered. Annotate a bean <literal>@Alternative</"
-"literal>, or with an alternative stereotype, and it will be considered "
-"disabled by CDI, as long as you don't explicitly enable it in beans.xml. "
-"That's not quite the same thing as excluding the class from scanning "
-"altogether, but it's close. (One difference is that a portable extension "
-"with still get a <literal>ProcessAnnotatedType</literal> event for that "
-"class)."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:813
-#, no-c-format
-msgid ""
-"A future version of CDI might allow you to declare excluded packages in "
-"beans.xml. Excluding a bean by type or naming convention isn't really that "
-"appealing. In the world of CDI, we use stereotypes for identifying "
-"architectural roles. We don't use marker interfaces or naming conventions. "
-"Names really shouldn't affect functionality as it is too fragile."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:820
-#, no-c-format
-msgid "Enough theory, what elements are available in beans.xml?"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:826
-#, no-c-format
-msgid "Bean descriptor schema"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:828
-#, no-c-format
-msgid ""
-"If you don't need to activate any interceptors, decorators or alternatives "
-"(you just have plain beans that you need to use in an archive), the beans."
-"xml file can be <emphasis>empty</emphasis>. If you do have one of these "
-"requirements, then you need to start popularing the descriptor."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:834
-#, no-c-format
-msgid ""
-"The root element of a beans.xml file is <literal>beans</literal>, with the "
-"following <ulink url=\"http://anonsvn.jboss.org/repos/weld/api/trunk/cdi/src/"
-"main/resources/beans.xsd\">schema</ulink>:"
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:839
-#, no-c-format
-msgid ""
-"<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<beans xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee \n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"</beans>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:841
-#, no-c-format
-msgid ""
-"The <literal>beans</literal> element can have one or more of each of the "
-"following children:"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:847
-#, no-c-format
-msgid "interceptors"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:850
-#, no-c-format
-msgid "decorators"
-msgstr ""
-
-#. Tag: literal
-#: beans.xml:853
-#, no-c-format
-msgid "alternatives"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:857
-#, no-c-format
-msgid "Let's look at each element in detail."
-msgstr ""
-
-#. Tag: title
-#: beans.xml:862
-#, no-c-format
-msgid "&lt;interceptors&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:864
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled interceptors bound via interceptor "
-"bindings. An interceptor must be explicitly enabled by listing the fully "
-"qualified class name in a child &lt;class&gt; element of &lt;"
-"interceptors&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:870
-#, no-c-format
-msgid ""
-"There may be zero or more interceptor class elements. The order of the class "
-"declarations determines the interceptor ordering. Interceptors which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an interceptor "
-"class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:877
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.intercept.SecurityInterceptor</class>\n"
-"   <class>com.acme.intercept.TransactionInterceptor</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:883
-#, no-c-format
-msgid "&lt;decorators&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:885
-#, no-c-format
-msgid ""
-"By default, a bean archive has no enabled decorators. A decorator must be "
-"explicitly enabled by listing the fully qualified class name in a child &lt;"
-"class&gt; element of &lt;decorators&gt;."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:891
-#, no-c-format
-msgid ""
-"There may be zero or more decorator class elements. The order of the class "
-"declarations determines the decorator ordering. Decorators which occur "
-"earlier in the list are called first. The same class may not be listed "
-"twice. And of course, the class must exist and it must be an decorator class."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:898
-#, no-c-format
-msgid ""
-"<![CDATA[<interceptors>\n"
-"   <class>com.acme.decorate.BigAccountDecorator</class>\n"
-"   <class>com.acme.decorate.SpecialGiftDecorator</class>\n"
-"</interceptors>]]>"
-msgstr ""
-
-#. Tag: title
-#: beans.xml:903
-#, no-c-format
-msgid "&lt;alternatives&gt;"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:905
-#, no-c-format
-msgid ""
-"An alternative is a bean that must be explicitly declared in the beans.xml "
-"file if it should be available for lookup, injection or EL resolution. By "
-"default, a bean archive has no active alternatives. An alternative must be "
-"explicitly declared using the fully qualified bean class name or stereotype "
-"class name in either a child &lt;class&gt; or &lt;stereotype&gt; element of "
-"&lt;alternatives&gt;, respectively."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:913
-#, no-c-format
-msgid ""
-"An alternative is selected for the bean archive if either: the alternative "
-"is a managed bean or session bean and the bean class of the bean is listed, "
-"or the alternative is a producer method, field or resource, and the bean "
-"class that declares the method or field is listed, or any "
-"<literal>@Alternative</literal> stereotype of the alternative is listed."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:920
-#, no-c-format
-msgid ""
-"There may be zero or more alternative bean class elements. The same class "
-"may not be listed twice. And of course, the class must exist and it must be "
-"an alternative bean class."
-msgstr ""
-
-#. Tag: para
-#: beans.xml:925
-#, no-c-format
-msgid ""
-"There may also be zero or more <literal>@Alternative</literal> stereotype "
-"elements. The same stereotype may not be listed twice. And of course, the "
-"stereotype class must exist and it must be an stereotype annotation."
-msgstr ""
-
-#. Tag: programlisting
-#: beans.xml:931
-#, no-c-format
-msgid ""
-"<![CDATA[<stereotypes>\n"
-"   <class>com.acme.business.MockPaymentProcessor</class>\n"
-"   <stereotype>com.acme.stereotype.Mock</stereotype>\n"
-"</stereotypes>]]>"
-msgstr ""
-
-#. Tag: para
-#: beans.xml:935
-#, no-c-format
-msgid ""
-"And that's it! A very simple schema, used only to activate and order CDI "
-"services."
-msgstr ""

Modified: doc/trunk/reference/zh-TW/decorators.po
===================================================================
--- doc/trunk/reference/zh-TW/decorators.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/decorators.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: decorators\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-08 12:39+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: decorators.xml:5
 #, no-c-format
 msgid "Decorators"
 msgstr "裝飾器(Decorators)"
 
 #. Tag: para
-#: decorators.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors are a powerful way to capture and separate concerns which are "
@@ -41,7 +39,6 @@
 "合作為一個區分涉及商業問題的工具。意"
 
 #. Tag: para
-#: decorators.xml:15
 #, fuzzy, no-c-format
 msgid ""
 "The reverse is true of <emphasis>decorators</emphasis>. A decorator "
@@ -60,31 +57,11 @@
 "同類型的技術問題。"
 
 #. Tag: para
-#: decorators.xml:24
 #, no-c-format
 msgid "Suppose we have an interface that represents accounts:"
 msgstr "假設我們有個顯示帳號的介面:"
 
-#. Tag: programlisting
-#: decorators.xml:26
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface Account {\n"
-"   public BigDecimal getBalance();\n"
-"   public User getOwner();\n"
-"   public void withdraw(BigDecimal amount);\n"
-"   public void deposit(BigDecimal amount);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface Account {\n"
-"    public BigDecimal getBalance();\n"
-"    public User getOwner();\n"
-"    public void withdraw(BigDecimal amount);\n"
-"    public void deposit(BigDecimal amount);\n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:28
 #, fuzzy, no-c-format
 msgid ""
 "Several different beans in our system implement the <literal>Account</"
@@ -97,7 +74,6 @@
 "都必須被系統記錄於一個特殊的日誌中。這是一項適合裝飾器的工作。"
 
 #. Tag: para
-#: decorators.xml:34
 #, fuzzy, no-c-format
 msgid ""
 "A decorator is a bean (possibly even an abstract class) that implements the "
@@ -106,74 +82,14 @@
 "裝飾器(decorator)是個單純的 Web Bean,它可實做它所裝飾的類型並且會被標記為 "
 "<literal>@Decorator</literal>。"
 
-#. Tag: programlisting
-#: decorators.xml:39
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[<Decorators>\n"
-"    <myapp:LargeTransactionDecorator/>\n"
-"</Decorators>]]>"
-
 #. Tag: para
-#: decorators.xml:41
 #, no-c-format
 msgid ""
 "The decorator implements the methods of the decorated type that it wants to "
 "intercept."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:45
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      ...\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator \n"
-"        implements Account {\n"
-"    \n"
-"    @Decorates Account account;\n"
-"    \n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    public void withdraw(BigDecimal amount) {\n"
-"        account.withdraw(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedWithdrawl(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"    public void deposit(BigDecimal amount);\n"
-"        account.deposit(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedDeposit(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: decorators.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "Unlike other beans, a decorator may be an abstract class. Therefore, if "
@@ -185,7 +101,6 @@
 "method。"
 
 #. Tag: para
-#: decorators.xml:52
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors for a method are called before decorators that apply to the "
@@ -193,13 +108,11 @@
 msgstr "一個 method 的攔截器會於套用至該 method 的裝飾器之前先被調用。"
 
 #. Tag: title
-#: decorators.xml:57
 #, fuzzy, no-c-format
 msgid "Delegate object"
 msgstr "Delegate(類別;表示委派)屬性"
 
 #. Tag: para
-#: decorators.xml:59
 #, no-c-format
 msgid ""
 "Decorators have a special injection point, called the <emphasis>delegate "
@@ -209,38 +122,22 @@
 "method parameter or injected field."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:67
 #, fuzzy, no-c-format
 msgid "A decorator is bound to any bean which:"
 msgstr "一個裝飾器會綁定至任何符合以下條件的 Web Bean:"
 
 #. Tag: para
-#: decorators.xml:71
 #, fuzzy, no-c-format
 msgid "has the type of the delegate injection point as a bean type, and"
 msgstr "擁有一個 API 類型的 delegate 屬性類型,以及"
 
 #. Tag: para
-#: decorators.xml:74
 #, fuzzy, no-c-format
 msgid "has all qualifiers that are declared at the delegate injection point."
 msgstr "擁有 delegate 屬性所宣告的所有綁定類型。"
 
 #. Tag: para
-#: decorators.xml:78
 #, fuzzy, no-c-format
 msgid ""
 "This delegate injection point specifies that the decorator is bound to all "
@@ -249,14 +146,7 @@
 "下列 delegate 屬性指出裝飾器已綁定至所有實做 <literal>Account</literal> 的 "
 "Web Bean:"
 
-#. Tag: programlisting
-#: decorators.xml:83
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
-msgstr "<![CDATA[@Decorates Account account;]]>"
-
 #. Tag: para
-#: decorators.xml:85
 #, fuzzy, no-c-format
 msgid ""
 "A delegate injection point may specify any number of qualifier annotations. "
@@ -265,14 +155,7 @@
 "Delegate 屬性可指定一個 binding annotation(綁定註解)。如此一來裝飾器便只會"
 "綁定至含有相同 binding 的 Web Bean。"
 
-#. Tag: programlisting
-#: decorators.xml:90
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
-msgstr "<![CDATA[@Decorates @Foreign Account account;]]>"
-
 #. Tag: para
-#: decorators.xml:92
 #, fuzzy, no-c-format
 msgid ""
 "The decorator may invoke the delegate object, which has much the same effect "
@@ -283,64 +166,12 @@
 "裝飾器能夠引動 delegate 屬性,這和透過一個攔截器調用 "
 "<literal>InvocationContext.proceed()</literal> 的效果大致相同。"
 
-#. Tag: programlisting
-#: decorators.xml:98
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator\n"
-"      implements Account {\n"
-"   @Inject @Delegate @Any Account account;\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   public void withdraw(BigDecimal amount) {\n"
-"      account.withdraw(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedWithdrawl(amount) );\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void deposit(BigDecimal amount);\n"
-"      account.deposit(amount);\n"
-"      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"         em.persist( new LoggedDeposit(amount) );\n"
-"      }\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Decorator\n"
-"public abstract class LargeTransactionDecorator \n"
-"        implements Account {\n"
-"    \n"
-"    @Decorates Account account;\n"
-"    \n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    public void withdraw(BigDecimal amount) {\n"
-"        account.withdraw(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedWithdrawl(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"    public void deposit(BigDecimal amount);\n"
-"        account.deposit(amount);\n"
-"        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
-"            em.persist( new LoggedDeposit(amount) );\n"
-"        }\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: title
-#: decorators.xml:103
 #, no-c-format
 msgid "Enabling decorators"
 msgstr "啟用裝飾器"
 
 #. Tag: para
-#: decorators.xml:105
 #, no-c-format
 msgid ""
 "By default, all decorators are disabled. We need to <emphasis>enable</"
@@ -348,24 +179,7 @@
 "bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: decorators.xml:111
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <decorators>\n"
-"         <class>org.mycompany.myapp.LargeTransactionDecorator</class>\n"
-"   </decorators>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: decorators.xml:113
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
@@ -375,7 +189,6 @@
 "literal> 宣告對於攔截器的目的是相同的:"
 
 #. Tag: para
-#: decorators.xml:120
 #, no-c-format
 msgid ""
 "it enables us to specify a total ordering for all decorators in our system, "
@@ -385,12 +198,137 @@
 "定性的特性,並且"
 
 #. Tag: para
-#: decorators.xml:126
 #, no-c-format
 msgid "it lets us enable or disable decorator classes at deployment time."
 msgstr "它讓我們能夠在建置時啟用或停用裝飾器類別。"
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "   public BigDecimal getBalance();\n"
+#~ "   public User getOwner();\n"
+#~ "   public void withdraw(BigDecimal amount);\n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface Account {\n"
+#~ "    public BigDecimal getBalance();\n"
+#~ "    public User getOwner();\n"
+#~ "    public void withdraw(BigDecimal amount);\n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[<Decorators>\n"
+#~ "    <myapp:LargeTransactionDecorator/>\n"
+#~ "</Decorators>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator \n"
+#~ "        implements Account {\n"
+#~ "    \n"
+#~ "    @Decorates Account account;\n"
+#~ "    \n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    public void withdraw(BigDecimal amount) {\n"
+#~ "        account.withdraw(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "        account.deposit(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedDeposit(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
+#~ msgstr "<![CDATA[@Decorates Account account;]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
+#~ msgstr "<![CDATA[@Decorates @Foreign Account account;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator\n"
+#~ "      implements Account {\n"
+#~ "   @Inject @Delegate @Any Account account;\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   public void withdraw(BigDecimal amount) {\n"
+#~ "      account.withdraw(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void deposit(BigDecimal amount);\n"
+#~ "      account.deposit(amount);\n"
+#~ "      if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "         em.persist( new LoggedDeposit(amount) );\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Decorator\n"
+#~ "public abstract class LargeTransactionDecorator \n"
+#~ "        implements Account {\n"
+#~ "    \n"
+#~ "    @Decorates Account account;\n"
+#~ "    \n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    public void withdraw(BigDecimal amount) {\n"
+#~ "        account.withdraw(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedWithdrawl(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void deposit(BigDecimal amount);\n"
+#~ "        account.deposit(amount);\n"
+#~ "        if ( amount.compareTo(LARGE_AMOUNT)>0 ) {\n"
+#~ "            em.persist( new LoggedDeposit(amount) );\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "All decorators have a <emphasis>delegate attribute</emphasis>. The type "
 #~ "and binding types of the delegate attribute determine which Web Beans the "
 #~ "decorator is bound to. The delegate attribute type must implement or "

Modified: doc/trunk/reference/zh-TW/dependencies.po
===================================================================
--- doc/trunk/reference/zh-TW/dependencies.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/dependencies.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: dependencies.xml:5
 #, no-c-format
 msgid "Weld project dependencies"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:7
 #, no-c-format
 msgid ""
 "This section lists compile-time and runtime dependencies for Weld. This list "
@@ -30,105 +28,88 @@
 msgstr ""
 
 #. Tag: title
-#: dependencies.xml:13
 #, no-c-format
 msgid "Artifacts coming from Sun"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:21 dependencies.xml:110
 #, no-c-format
 msgid "Artifact"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:24 dependencies.xml:113
 #, no-c-format
 msgid "Scope"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:33
+#. Tag: para
 #, no-c-format
-msgid "javax.ejb:ejb-api:3.1"
+msgid "<literal>javax.ejb:ejb-api:3.1</literal>"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:36 dependencies.xml:44 dependencies.xml:52
-#: dependencies.xml:60 dependencies.xml:68 dependencies.xml:76
-#: dependencies.xml:128
 #, no-c-format
 msgid "compile"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:41
+#. Tag: para
 #, no-c-format
-msgid "javax.faces:jsf-api:2.0"
+msgid "<literal>javax.faces:jsf-api:2.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:49
+#. Tag: para
 #, no-c-format
-msgid "javax.el:el-api:2.1"
+msgid "<literal>javax.el:el-api:2.1</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:57
+#. Tag: para
 #, no-c-format
-msgid "javax.persistence:persistence-api:2.0"
+msgid "<literal>javax.persistence:persistence-api:2.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:65
+#. Tag: para
 #, no-c-format
-msgid "javax.servlet:servlet-api:3.0"
+msgid "<literal>javax.servlet:servlet-api:3.0</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:73
+#. Tag: para
 #, no-c-format
-msgid "javax.interceptor:interceptor-api:1.1"
+msgid "<literal>javax.interceptor:interceptor-api:1.1</literal>"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:81
+#. Tag: para
 #, no-c-format
-msgid "org.glasfish.web:el-impl:2.1.2"
+msgid "<literal>org.glasfish.web:el-impl:2.1.2</literal>"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:84 dependencies.xml:92
 #, no-c-format
 msgid "runtime"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:89
+#. Tag: para
 #, no-c-format
-msgid "javax.faces:jsf-impl:2.0.x"
+msgid "<literal>javax.faces:jsf-impl:2.0.x</literal>"
 msgstr ""
 
 #. Tag: title
-#: dependencies.xml:101
 #, no-c-format
 msgid "Artifacts coming from Hibernate"
 msgstr ""
 
 #. Tag: para
-#: dependencies.xml:116
 #, no-c-format
 msgid "Notes"
 msgstr ""
 
-#. Tag: literal
-#: dependencies.xml:125
+#. Tag: para
 #, no-c-format
-msgid "javax.validation:validation-api"
+msgid "<literal>javax.validation:validation-api</literal>"
 msgstr ""
 
-#. Tag: ulink
-#: dependencies.xml:131
+#. Tag: para
 #, no-c-format
-msgid "BVAL-193"
+msgid ""
+"<ulink url=\"http://opensource.atlassian.com/projects/hibernate/browse/BVAL-"
+"193\">BVAL-193</ulink>"
 msgstr ""

Modified: doc/trunk/reference/zh-TW/ee.po
===================================================================
--- doc/trunk/reference/zh-TW/ee.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/ee.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ee\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-15 12:12+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: ee.xml:4
 #, no-c-format
 msgid "Java EE integration"
 msgstr "Java EE 整合"
 
 #. Tag: para
-#: ee.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "CDI is fully integrated into the Java EE environment. Beans have access to "
@@ -38,13 +36,11 @@
 "Beans)。"
 
 #. Tag: title
-#: ee.xml:13
 #, no-c-format
 msgid "Built-in beans"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:15
 #, no-c-format
 msgid ""
 "In the Java EE environment, the container provides the following built-in "
@@ -52,20 +48,17 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:22
 #, no-c-format
 msgid "the current JTA <literal>UserTransaction</literal>,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:27
 #, no-c-format
 msgid ""
 "a <literal>Principal</literal> representing the current caller identity,"
 msgstr ""
 
 #. Tag: para
-#: ee.xml:32
 #, no-c-format
 msgid ""
 "the default <ulink url=\"http://jcp.org/en/jsr/detail?id=303\">Bean "
@@ -73,7 +66,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:38
 #, no-c-format
 msgid ""
 "a <literal>Validator</literal> for the default <literal>ValidationFactory</"
@@ -81,7 +73,6 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:45
 #, no-c-format
 msgid ""
 "The CDI specification does not require the servlet context objects, "
@@ -97,32 +88,18 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:57
 #, no-c-format
 msgid ""
 "Oh, you <emphasis>really</emphasis> want to inject the "
 "<literal>FacesContext</literal>? Alright then, try this producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[class FacesContextProducer {\n"
-"   @Produces @RequestScoped FacesContext getFacesContext() {\n"
-"      return FacesContext.getCurrentInstance();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: ee.xml:67
 #, fuzzy, no-c-format
 msgid "Injecting Java EE resources into a bean"
 msgstr "將 Java EE 資源注入 Web Bean 中"
 
 #. Tag: para
-#: ee.xml:69
 #, fuzzy, no-c-format
 msgid ""
 "All managed beans may take advantage of Java EE component environment "
@@ -136,51 +113,7 @@
 "用 Java 依賴注入(dependency injection)。我們早已見過了這方面的範例,不過當"
 "時我們並未詳細討論到:"
 
-#. Tag: programlisting
-#: ee.xml:76
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @Resource UserTransaction transaction;\n"
-"\n"
-"   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"throws Exception { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource Transaction transaction;\n"
-"\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"    \n"
-"}]]>"
-
-#. Tag: programlisting
-#: ee.xml:78
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Login implements Serializable {\n"
-"   @Inject Credentials credentials;\n"
-"   @PersistenceContext EntityManager userDatabase;\n"
-"    ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped\n"
-"public class Login {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @PersistenceContext EntityManager userDatabase;\n"
-"    \n"
-"    ...\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: ee.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "The Java EE <literal>@PostConstruct</literal> and <literal>@PreDestroy</"
@@ -193,7 +126,6 @@
 "literal> 這個 method 會在<emphasis>所有</emphasis>注入被進行後才會被調用。"
 
 #. Tag: para
-#: ee.xml:86
 #, no-c-format
 msgid ""
 "Of course, we advise that component environment injection be used to define "
@@ -201,13 +133,11 @@
 msgstr ""
 
 #. Tag: title
-#: ee.xml:94
 #, fuzzy, no-c-format
 msgid "Calling a bean from a servlet"
 msgstr "透過一個 Servlet 來調用 Web Bean"
 
 #. Tag: para
-#: ee.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
@@ -216,55 +146,7 @@
 "在 Java EE 6 中透過 Servlet 來使用 Web Bean 相當地簡單。只要使用 Web Bean 欄"
 "位或是 initializer method 注入來注入 Web Bean 即可。"
 
-#. Tag: programlisting
-#: ee.xml:101
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Login extends HttpServlet {\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject Login login;\n"
-"\n"
-"   @Override\n"
-"   public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"      throws ServletException, IOException {\n"
-"      credentials.setUsername(request.getParameter(\"username\")):\n"
-"      credentials.setPassword(request.getParameter(\"password\")):\n"
-"      login.login();\n"
-"      if ( login.isLoggedIn() ) {\n"
-"         response.sendRedirect(\"/home.jsp\");\n"
-"      }\n"
-"      else {\n"
-"         response.sendRedirect(\"/loginError.jsp\");\n"
-"      }\n"
-"   }\n"
-"            \n"
-"}]]>"
-msgstr ""
-"public class Login extends HttpServlet {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @Current Login login;\n"
-"\n"
-"    @Override\n"
-"    public void service(HttpServletRequest request, HttpServletResponse "
-"response)\n"
-"        throws ServletException, IOException {\n"
-"        credentials.setUsername( request.getAttribute(\"username\") ):\n"
-"        credentials.setPassword( request.getAttribute(\"password\") ):\n"
-"        login.login();\n"
-"        if ( login.isLoggedIn() ) {\n"
-"            response.sendRedirect(\"/home.jsp\");\n"
-"        }\n"
-"        else {\n"
-"            response.sendRedirect(\"/loginError.jsp\");\n"
-"        }\n"
-"    }\n"
-"            \n"
-"}"
-
 #. Tag: para
-#: ee.xml:103
 #, fuzzy, no-c-format
 msgid ""
 "Since instances of servlets are shared across all incoming threads, the bean "
@@ -277,13 +159,11 @@
 "routing method 調用。"
 
 #. Tag: title
-#: ee.xml:112
 #, fuzzy, no-c-format
 msgid "Calling a bean from a message-driven bean"
 msgstr "透過訊息導向的 Bean 來調用 Web Bean"
 
 #. Tag: para
-#: ee.xml:114
 #, no-c-format
 msgid ""
 "CDI injection applies to all EJBs, even when they aren't managed beans. In "
@@ -292,39 +172,11 @@
 msgstr ""
 
 #. Tag: para
-#: ee.xml:119
 #, fuzzy, no-c-format
 msgid "You can even use CDI interceptor bindings for message-driven Beans."
 msgstr "針對於訊息導向的 Bean,您甚至可使用 Web Bean 攔截器綁定。"
 
-#. Tag: programlisting
-#: ee.xml:121
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"   @Inject Inventory inventory;\n"
-"   @PersistenceContext EntityManager em;\n"
-"\n"
-"   public void onMessage(Message message) {\n"
-"      ...\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"@Transactional @MessageDriven\n"
-"public class ProcessOrder implements MessageListener {\n"
-"\n"
-"    @Current Inventory inventory;\n"
-"    @PersistenceContext EntityManager em;\n"
-"\n"
-"    public void onMessage(Message message) {\n"
-"        ...\n"
-"    }\n"
-"            \n"
-"}"
-
 #. Tag: para
-#: ee.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "Please note that there is no session or conversation context available when "
@@ -338,19 +190,16 @@
 "Web Bean 可使用。"
 
 #. Tag: para
-#: ee.xml:129
 #, no-c-format
 msgid "But how about beans which <emphasis>send</emphasis> JMS messages?"
 msgstr ""
 
 #. Tag: title
-#: ee.xml:136
 #, no-c-format
 msgid "JMS endpoints"
 msgstr "JMS 端點"
 
 #. Tag: para
-#: ee.xml:138
 #, no-c-format
 msgid ""
 "Sending messages using JMS can be quite complex, because of the number of "
@@ -373,96 +222,20 @@
 "己各別的生命週期和執行緒模型(threading model)。"
 
 #. Tag: para
-#: ee.xml:147
 #, no-c-format
 msgid ""
 "You can use producer fields and methods to prepare all of these resources "
 "for injection into a bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[public class OrderResources {\n"
-"   @Resource(name=\"jms/ConnectionFactory\")\n"
-"   private ConnectionFactory connectionFactory;\n"
-"  \n"
-"   @Resource(name=\"jms/OrderQueue\")\n"
-"   private Queue orderQueue;\n"
-"  \n"
-"   @Produces @OrderConnection\n"
-"   public Connection createOrderConnection() throws JMSException {\n"
-"    return connectionFactory.createConnection();\n"
-"   }\n"
-"  \n"
-"   public void closeOrderConnection(@Disposes @OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      connection.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderSession\n"
-"   public Session createOrderSession(@OrderConnection Connection "
-"connection)\n"
-"         throws JMSException {\n"
-"      return connection.createSession(true, Session.AUTO_ACKNOWLEDGE);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderSession(@Disposes @OrderSession Session session)\n"
-"         throws JMSException {\n"
-"      session.close();\n"
-"   }\n"
-"  \n"
-"   @Produces @OrderMessageProducer\n"
-"   public MessageProducer createOrderMessageProducer(@OrderSession Session "
-"session)\n"
-"         throws JMSException {\n"
-"      return session.createProducer(orderQueue);\n"
-"   }\n"
-"  \n"
-"   public void closeOrderMessageProducer(@Disposes @OrderMessageProducer "
-"MessageProducer producer)\n"
-"         throws JMSException {\n"
-"      producer.close();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: ee.xml:153
 #, no-c-format
 msgid ""
 "In this example, we can just inject the prepared <literal>MessageProducer</"
 "literal>, <literal>Connection</literal> or <literal>QueueSession</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: ee.xml:158
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject Order order;\n"
-"@Inject @OrderMessageProducer MessageProducer producer;\n"
-"@Inject @OrderSession QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"   MapMessage msg = orderSession.createMapMessage();\n"
-"   msg.setLong(\"orderId\", order.getId());\n"
-"   ...\n"
-"   producer.send(msg);\n"
-"}]]>"
-msgstr ""
-"@OrderProcessor QueueSender orderSender;\n"
-"@OrderProcessor QueueSession orderSession;\n"
-"\n"
-"public void sendMessage() {\n"
-"    MapMessage msg = orderSession.createMapMessage();\n"
-"    ...\n"
-"    orderSender.send(msg);\n"
-"}"
-
 #. Tag: para
-#: ee.xml:164
 #, fuzzy, no-c-format
 msgid ""
 "The lifecycle of the injected JMS objects is completely controlled by the "
@@ -470,22 +243,20 @@
 msgstr "被注入的 JMS 物件的生命週期完全由 Web Bean 管理員所控制。"
 
 #. Tag: title
-#: ee.xml:171
 #, no-c-format
 msgid "Packaging and deployment"
 msgstr "封裝和建置"
 
 #. Tag: para
-#: ee.xml:173
 #, fuzzy, no-c-format
 msgid ""
 "CDI doesn't define any special deployment archive. You can package beans in "
-"JARs, EJB-JARs or WARs&#8212;any deployment location in the application "
-"classpath. However, the archive must be a \"bean archive\". That means each "
-"archive that contains beans <emphasis>must</emphasis> include a file named "
+"jars, ejb jars or wars—any deployment location in the application classpath. "
+"However, the archive must be a \"bean archive\". That means each archive "
+"that contains beans <emphasis>must</emphasis> include a file named "
 "<literal>beans.xml</literal> in the <literal>META-INF</literal> directory of "
 "the classpath or <literal>WEB-INF</literal> directory of the web root (for "
-"WAR archives). The file may be empty. Beans deployed in archives that do not "
+"war archives). The file may be empty. Beans deployed in archives that do not "
 "have a <literal>beans.xml</literal> file will not be available for use in "
 "the application."
 msgstr ""
@@ -497,7 +268,6 @@
 "archive 中的 Web Bean 將無法使用於應用程式中。"
 
 #. Tag: para
-#: ee.xml:182
 #, fuzzy, no-c-format
 msgid ""
 "In an embeddable EJB container, beans may be deployed in any location in "
@@ -508,7 +278,137 @@
 "讓可崁入的 EJB Lite container 執行。再次強調,各個位置都必須包含著一個 "
 "<literal>web-beans.xml</literal> 檔案。"
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "   @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "throws Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource Transaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login implements Serializable {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @PersistenceContext EntityManager userDatabase;\n"
+#~ "    ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Login {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @PersistenceContext EntityManager userDatabase;\n"
+#~ "    \n"
+#~ "    ...\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Login extends HttpServlet {\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject Login login;\n"
+#~ "\n"
+#~ "   @Override\n"
+#~ "   public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "      throws ServletException, IOException {\n"
+#~ "      credentials.setUsername(request.getParameter(\"username\")):\n"
+#~ "      credentials.setPassword(request.getParameter(\"password\")):\n"
+#~ "      login.login();\n"
+#~ "      if ( login.isLoggedIn() ) {\n"
+#~ "         response.sendRedirect(\"/home.jsp\");\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "            \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "public class Login extends HttpServlet {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @Current Login login;\n"
+#~ "\n"
+#~ "    @Override\n"
+#~ "    public void service(HttpServletRequest request, HttpServletResponse "
+#~ "response)\n"
+#~ "        throws ServletException, IOException {\n"
+#~ "        credentials.setUsername( request.getAttribute(\"username\") ):\n"
+#~ "        credentials.setPassword( request.getAttribute(\"password\") ):\n"
+#~ "        login.login();\n"
+#~ "        if ( login.isLoggedIn() ) {\n"
+#~ "            response.sendRedirect(\"/home.jsp\");\n"
+#~ "        }\n"
+#~ "        else {\n"
+#~ "            response.sendRedirect(\"/loginError.jsp\");\n"
+#~ "        }\n"
+#~ "    }\n"
+#~ "            \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "   @Inject Inventory inventory;\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "   public void onMessage(Message message) {\n"
+#~ "      ...\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Transactional @MessageDriven\n"
+#~ "public class ProcessOrder implements MessageListener {\n"
+#~ "\n"
+#~ "    @Current Inventory inventory;\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "\n"
+#~ "    public void onMessage(Message message) {\n"
+#~ "        ...\n"
+#~ "    }\n"
+#~ "            \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Order order;\n"
+#~ "@Inject @OrderMessageProducer MessageProducer producer;\n"
+#~ "@Inject @OrderSession QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "   MapMessage msg = orderSession.createMapMessage();\n"
+#~ "   msg.setLong(\"orderId\", order.getId());\n"
+#~ "   ...\n"
+#~ "   producer.send(msg);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@OrderProcessor QueueSender orderSender;\n"
+#~ "@OrderProcessor QueueSession orderSession;\n"
+#~ "\n"
+#~ "public void sendMessage() {\n"
+#~ "    MapMessage msg = orderSession.createMapMessage();\n"
+#~ "    ...\n"
+#~ "    orderSender.send(msg);\n"
+#~ "}"
+
+#~ msgid ""
 #~ "There is one restriction to be aware of here: <literal>@PersistenceContext"
 #~ "(type=EXTENDED)</literal> is not supported for simple Web Beans."
 #~ msgstr ""

Modified: doc/trunk/reference/zh-TW/environments.po
===================================================================
--- doc/trunk/reference/zh-TW/environments.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/environments.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,22 +15,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: environments.xml:4
 #, no-c-format
 msgid "Application servers and environments supported by Weld"
 msgstr ""
 
 #. Tag: title
-#: environments.xml:7
 #, no-c-format
 msgid "Using Weld with JBoss AS"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:9
 #, no-c-format
 msgid ""
-"If you are using JBoss AS 5.2, no additional configuration is required to "
+"If you are using JBoss AS 6.0, no additional configuration is required to "
 "use Weld (or CDI for that matter). All you need to do is make your "
 "application a bean bean archive by adding <literal>META-INF/beans.xml</"
 "literal> to the classpath or <literal>WEB-INF/beans.xml</literal> to the web "
@@ -38,50 +35,39 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:15
 #, no-c-format
 msgid ""
 "Unfortunately, you can't use Weld with earlier versions of JBoss AS since "
 "they are missing key libraries. If you want to learn how to upgrade the "
-"built-in support on JBoss AS 5.2, then read on."
+"built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:20
 #, no-c-format
 msgid ""
-"Upgrading the Weld add-on is easy. The Weld distribution has a build that "
-"can take care of this task for you in a single command. First, we need to "
-"tell Weld where JBoss AS is located. Create a new file named <literal>local."
-"build.properties</literal> in the examples directory of the Weld "
-"distribution and assign the path of your JBoss AS installation to the "
-"property key <literal>jboss.home</literal>, as follows:"
+"If there is a newer release of Weld than what is included in the latest "
+"JBoss AS 6 release, upgrading the Weld add-on is easy. The Weld distribution "
+"includes a build script that can take care of this task for you in a single "
+"command."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:27
+#. Tag: para
 #, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"
+msgid ""
+"First, we need to tell Weld where JBoss AS is located. This information is "
+"communicated by assigning the <literal>JBOSS_HOME</literal> environment "
+"variable. In a bash shell, you can assign the environment variable as "
+"follows:"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:29
 #, no-c-format
 msgid ""
 "Now we can install the Weld deployer from the <literal>jboss-as</literal> "
 "directory of the Weld distribution:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:33
-#, no-c-format
-msgid ""
-"$> cd jboss-as\n"
-"$> ant update"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:36
 #, no-c-format
 msgid ""
 "A new deployer, <literal>weld.deployer</literal> is added to JBoss AS. This "
@@ -92,13 +78,11 @@
 msgstr ""
 
 #. Tag: title
-#: environments.xml:46
 #, no-c-format
 msgid "GlassFish"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:48
 #, no-c-format
 msgid ""
 "Weld is also built into GlassFish from V3 onwards. Since GlassFish V3 is the "
@@ -109,13 +93,11 @@
 msgstr ""
 
 #. Tag: title
-#: environments.xml:56
 #, no-c-format
 msgid "Servlet containers (such as Tomcat or Jetty)"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:58
 #, no-c-format
 msgid ""
 "While JSR-299 does not require support for servlet environments, Weld can be "
@@ -123,7 +105,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:64
 #, no-c-format
 msgid ""
 "There is a major limitation to using a servlet container. Weld doesn't "
@@ -134,7 +115,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:72
 #, no-c-format
 msgid ""
 "Weld should be used as a web application library in a servlet container. You "
@@ -145,62 +125,52 @@
 "could use its component jars:"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:84
+#. Tag: para
 #, no-c-format
-msgid "jsr299-api.jar"
+msgid "<literal>jsr299-api.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:89
+#. Tag: para
 #, no-c-format
-msgid "weld-api.jar"
+msgid "<literal>weld-api.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:94
+#. Tag: para
 #, no-c-format
-msgid "weld-spi.jar"
+msgid "<literal>weld-spi.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:99
+#. Tag: para
 #, no-c-format
-msgid "weld-core.jar"
+msgid "<literal>weld-core.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:104
+#. Tag: para
 #, no-c-format
-msgid "weld-logging.jar"
+msgid "<literal>weld-logging.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:109
+#. Tag: para
 #, no-c-format
-msgid "weld-servlet-int.jar"
+msgid "<literal>weld-servlet-int.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:114
+#. Tag: para
 #, no-c-format
-msgid "javassist.jar"
+msgid "<literal>javassist.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:119
+#. Tag: para
 #, no-c-format
-msgid "dom4j.jar"
+msgid "<literal>dom4j.jar</literal>"
 msgstr ""
 
-#. Tag: literal
-#: environments.xml:124
+#. Tag: para
 #, no-c-format
-msgid "google-collections.jar"
+msgid "<literal>google-collections.jar</literal>"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:129
 #, no-c-format
 msgid ""
 "You also need to explicitly specify the servlet listener (used to boot Weld, "
@@ -208,24 +178,12 @@
 "literal> in the web root:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:137
 #, no-c-format
 msgid "Tomcat"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:139
 #, no-c-format
 msgid ""
 "Tomcat has a read-only JNDI, so Weld can't automatically bind the "
@@ -234,40 +192,14 @@
 "following contents:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:145
-#, no-c-format
-msgid ""
-"<![CDATA[<Context>\n"
-"   <Resource name=\"BeanManager\" \n"
-"      auth=\"Container\"\n"
-"      type=\"javax.enterprise.inject.spi.BeanManager\"\n"
-"      factory=\"org.jboss.weld.resources.ManagerObjectFactory\"/>\n"
-"</Context>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:147
 #, no-c-format
 msgid ""
 "and make it available to your deployment by adding this to the bottom of "
 "<literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:151
-#, no-c-format
-msgid ""
-"<![CDATA[<resource-env-ref>\n"
-"   <resource-env-ref-name>BeanManager</resource-env-ref-name>\n"
-"   <resource-env-ref-type>\n"
-"      javax.enterprise.inject.spi.BeanManager\n"
-"   </resource-env-ref-type>\n"
-"</resource-env-ref>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:153
 #, no-c-format
 msgid ""
 "Tomcat only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -276,7 +208,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:158
 #, no-c-format
 msgid ""
 "Weld also supports Servlet injection in Tomcat. To enable this, place the "
@@ -284,22 +215,12 @@
 "literal>, and add the following to <literal>META-INF/context.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:164
-#, no-c-format
-msgid ""
-"<![CDATA[<Listener className=\"org.jboss.weld.environment.tomcat."
-"WeldLifecycleListener\"/>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:169
 #, no-c-format
 msgid "Jetty"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:171
 #, no-c-format
 msgid ""
 "Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind "
@@ -307,32 +228,7 @@
 "INF/jetty-env.xml</literal> with the following contents:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:176
-#, no-c-format
-msgid ""
-"<![CDATA[<!DOCTYPE Configure PUBLIC \"-//Mort Bay Consulting//DTD Configure//"
-"EN\"\n"
-"   \"http://jetty.mortbay.org/configure.dtd\">\n"
-"<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext"
-"\">\n"
-"   <New id=\"BeanManager\" class=\"org.mortbay.jetty.plus.naming.Resource"
-"\">\n"
-"      <Arg><Ref id=\"webAppCtx\"/></Arg> \n"
-"      <Arg>BeanManager</Arg>\n"
-"      <Arg>\n"
-"         <New class=\"javax.naming.Reference\">\n"
-"            <Arg>javax.enterprise.inject.spi.BeanManager</Arg> \n"
-"            <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>\n"
-"            <Arg/>\n"
-"         </New>\n"
-"      </Arg>\n"
-"   </New>\n"
-"</Configure>]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:178
 #, no-c-format
 msgid ""
 "Notice that Jetty doesn't not have built-in support for an <literal>javax."
@@ -342,7 +238,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:184
 #, no-c-format
 msgid ""
 "Jetty only allows you to bind entries to <literal>java:comp/env</literal>, "
@@ -351,19 +246,16 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:189
 #, no-c-format
 msgid "Weld does not currently support Servlet injection in Jetty."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:198
 #, no-c-format
 msgid "Java SE"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:200
 #, no-c-format
 msgid ""
 "In addition to improved integration of the Enterprise Java stack, the "
@@ -376,7 +268,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:208
 #, no-c-format
 msgid ""
 "When executing in the SE environment the following features of Weld are "
@@ -384,7 +275,6 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:214
 #, no-c-format
 msgid ""
 "Managed beans with <literal>@PostConstruct</literal> and "
@@ -392,13 +282,11 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:220
 #, no-c-format
 msgid "Dependency injection with qualifiers and alternatives"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:225
 #, no-c-format
 msgid ""
 "<literal>@Application</literal>, <literal>@Dependent</literal> and "
@@ -406,43 +294,36 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:231
 #, no-c-format
 msgid "Interceptors and decorators"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:236
 #, no-c-format
 msgid "Stereotypes"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:241
 #, no-c-format
 msgid "Events"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:246
 #, no-c-format
 msgid "Portable extension support"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:252
 #, no-c-format
 msgid "EJB beans are not supported."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:257
 #, no-c-format
 msgid "CDI SE Module"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:259
 #, no-c-format
 msgid ""
 "Weld provides an extension which will boot a CDI bean manager in Java SE, "
@@ -450,26 +331,12 @@
 "command line parameters can be injected using either of the following:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:264
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters List<String> params;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: environments.xml:266
-#, no-c-format
-msgid "<![CDATA[@Inject @Parameters String[] paramsArray;]]>"
-msgstr ""
-
 #. Tag: para
-#: environments.xml:268
 #, no-c-format
 msgid "The second form is useful for compatibility with existing classes."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:273
 #, no-c-format
 msgid ""
 "The command line parameters do not become available for injection until the "
@@ -480,45 +347,26 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:282
 #, no-c-format
 msgid "Here's an example of a simple CDI SE application:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:286
-#, no-c-format
-msgid ""
-"<![CDATA[@Singleton\n"
-"public class HelloWorld\n"
-"{\n"
-"   public void printHello(@Observes ContainerInitialized event, @Parameters "
-"List<String> parameters) {\n"
-"       System.out.println(\"Hello \" + parameters.get(0));\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:292
 #, no-c-format
 msgid "Bootstrapping CDI SE"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:294
 #, no-c-format
 msgid "CDI SE applications can be bootstrapped in the following ways."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:300
 #, no-c-format
 msgid "The ContainerInitialized Event"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:302
 #, no-c-format
 msgid ""
 "Thanks to the power of CDI's typesafe event model, application developers "
@@ -530,27 +378,18 @@
 msgstr ""
 
 #. Tag: para
-#: environments.xml:310
 #, no-c-format
 msgid ""
 "In this case your application can be started by calling the provided main "
 "method like so:"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:313
-#, no-c-format
-msgid "<![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]>"
-msgstr ""
-
 #. Tag: title
-#: environments.xml:319
 #, no-c-format
 msgid "Programatic Bootstrap API"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:321
 #, no-c-format
 msgid ""
 "For added flexibility, CDI SE also comes with a bootstrap API which can be "
@@ -559,90 +398,65 @@
 "classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:327
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class Weld\n"
-"{\n"
-"\n"
-"   /** Boots Weld and creates and returns a WeldContainer instance, through "
-"which\n"
-"    * beans and events can be accesed. */\n"
-"   public WeldContainer initialize() {...}\n"
-"\n"
-"   /** Convenience method for shutting down the container. */\n"
-"   public void shutdown() {...}\n"
-"\n"
-"}]]>"
+"Here's an example application main method which uses this API to initialize "
+"a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:329
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public class WeldContainer\n"
-"{\n"
-"\n"
-"   /** Provides access to all beans within the application. */\n"
-"   public Instance<Object> instance() {...}\n"
-"\n"
-"   /** Provides access to all events within the application. */\n"
-"   public Event<Object> event() {...}\n"
-"\n"
-"   /** Provides direct access to the BeanManager. */\n"
-"   public BeanManager getBeanManager() {...}\n"
-"\n"
-"}]]>"
+"Alternatively the application could be started by firing a custom event "
+"which would then be observed by another simple bean. The following example "
+"fires <literal>MyEvent</literal> on startup."
 msgstr ""
 
-#. Tag: para
-#: environments.xml:331
+#. Tag: title
 #, no-c-format
-msgid ""
-"Here's an example application main method which uses this API to initialize "
-"a bean of type <literal>MyApplicationBean</literal>."
+msgid "Thread Context"
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:334
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.instance().select(MyApplicationBean.class).get();\n"
-"   weld.shutdown();\n"
-"}]]>"
+"In contrast to Java EE applications, Java SE applications place no "
+"restrictions on developers regarding the creation and usage of threads. "
+"Therefore Weld SE provides a custom scope annotation, "
+"<literal>@ThreadScoped</literal>, and corresponding context implementation "
+"which can be used to bind bean instances to the current thread. It is "
+"intended to be used in scenarios where you might otherwise use "
+"<literal>ThreadLocal</literal>, and does in fact use <literal>ThreadLocal</"
+"literal> under the hood."
 msgstr ""
 
 #. Tag: para
-#: environments.xml:336
 #, no-c-format
 msgid ""
-"Alternatively the application could be started by firing a custom event "
-"which would then be observed by another simple bean. The following example "
-"fires <literal>MyEvent</literal> on startup."
+"To use the @ThreadScoped annotation you need to enable the "
+"<literal>RunnableDecorator</literal> which 'listens' for all executions of "
+"<literal>Runnable.run()</literal> and decorates them by setting up the "
+"thread context beforehand, bound to the current thread, and destroying the "
+"context afterwards."
 msgstr ""
 
-#. Tag: programlisting
-#: environments.xml:340
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[public static void main(String[] args) {\n"
-"   WeldContainer weld = new Weld().initialize();\n"
-"   weld.event().select(MyEvent.class).fire( new MyEvent() );\n"
-"   weld.shutdown();\n"
-"}]]>"
+"It is not necessary to use @ThreadScoped in all multithreaded applications. "
+"The thread context is not intended as a replacement for defining your own "
+"application-specific contexts. It is generally only useful in situtations "
+"where you would otherwise have used ThreadLocal directly, which are "
+"typically rare."
 msgstr ""
 
 #. Tag: title
-#: environments.xml:348
 #, no-c-format
 msgid "Setting the Classpath"
 msgstr ""
 
 #. Tag: para
-#: environments.xml:350
 #, no-c-format
 msgid ""
 "Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld "

Modified: doc/trunk/reference/zh-TW/events.po
===================================================================
--- doc/trunk/reference/zh-TW/events.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/events.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: events\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-15 12:08+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: events.xml:4
 #, no-c-format
 msgid "Events"
 msgstr "事件(Events)"
 
 #. Tag: para
-#: events.xml:6
 #, no-c-format
 msgid ""
 "Dependency injection enables loose-coupling by allowing the implementation "
@@ -34,7 +32,6 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:13
 #, no-c-format
 msgid ""
 "This basic schema might sound like the familiar observer/observable pattern, "
@@ -42,7 +39,6 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:18
 #, no-c-format
 msgid ""
 "not only are event producers decoupled from observers; observers are "
@@ -51,7 +47,6 @@
 "不只是事件產生器由觀察器被 decouple;觀察器也完全地由產生器被 decouple 了,"
 
 #. Tag: para
-#: events.xml:22
 #, no-c-format
 msgid ""
 "observers can specify a combination of \"selectors\" to narrow the set of "
@@ -61,7 +56,6 @@
 "通知數量,並且"
 
 #. Tag: para
-#: events.xml:28
 #, fuzzy, no-c-format
 msgid ""
 "observers can be notified immediately, or can specify that delivery of the "
@@ -71,7 +65,6 @@
 "作邏輯單元)結束之後"
 
 #. Tag: para
-#: events.xml:35
 #, no-c-format
 msgid ""
 "The CDI event notification facility uses more or less the same typesafe "
@@ -79,13 +72,11 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:39
 #, fuzzy, no-c-format
 msgid "Event payload"
 msgstr "事件產生器(Event producers)"
 
 #. Tag: para
-#: events.xml:41
 #, no-c-format
 msgid ""
 "The event object carries state from producer to consumer. The event object "
@@ -97,35 +88,18 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:48
 #, no-c-format
 msgid ""
 "An event qualifier is just a normal qualifier, defined using "
 "<literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({FIELD, PARAMETER})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated {}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Updated { ... }]]>"
-
 #. Tag: title
-#: events.xml:57
 #, no-c-format
 msgid "Event observers"
 msgstr "事件觀察器(Event observers)"
 
 #. Tag: para
-#: events.xml:59
 #, fuzzy, no-c-format
 msgid ""
 "An <emphasis>observer method</emphasis> is a method of a bean with a "
@@ -134,18 +108,7 @@
 "<emphasis>observer method</emphasis> 是個 Web Bean 的 method 並有個標記為 "
 "<literal>@Observes</literal> 的參數。"
 
-#. Tag: programlisting
-#: events.xml:64
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }]]>"
-
 #. Tag: para
-#: events.xml:66
 #, fuzzy, no-c-format
 msgid ""
 "The annotated parameter is called the <emphasis>event parameter</emphasis>. "
@@ -159,23 +122,12 @@
 "(binding types)的 instance。當有個綁定類型被用來作為一個事件選擇器時,它就"
 "會被稱為是一個<emphasis>事件綁定類型(event binding type)</emphasis>。"
 
-#. Tag: programlisting
-#: events.xml:72 events.xml:240
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:74
 #, fuzzy, no-c-format
 msgid ""
-"An observer method need not specify any event qualifiers&#8212;in this case "
-"it is interested in <emphasis>all</emphasis> events of a particular type. If "
-"it does specify qualifiers, it's only interested in events which have those "
+"An observer method need not specify any event qualifiers—in this case it is "
+"interested in <emphasis>all</emphasis> events of a particular type. If it "
+"does specify qualifiers, it's only interested in events which have those "
 "qualifiers."
 msgstr ""
 "一個 observer method 不需要指定任何的事件綁定 &#151; 在此情況下它會專注於特"
@@ -183,7 +135,6 @@
 "於也具有這些事件綁定的事件。"
 
 #. Tag: para
-#: events.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "The observer method may have additional parameters, which are injection "
@@ -192,24 +143,12 @@
 "Observer method 能夠含有額外的參數,這些參數會被根據一般的 Web Bean method 參"
 "數注入語意(parameter injection semantic)來注入:"
 
-#. Tag: programlisting
-#: events.xml:84
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document, User user) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document, User user) { ... }]]>"
-
 #. Tag: title
-#: events.xml:89
 #, no-c-format
 msgid "Event producers"
 msgstr "事件產生器(Event producers)"
 
 #. Tag: para
-#: events.xml:91
 #, no-c-format
 msgid ""
 "Event producers fire events using an instance of the parameterized "
@@ -217,14 +156,7 @@
 "obtained by injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:96
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
-msgstr "<![CDATA[@Observable Event<Document> documentEvent]]>"
-
 #. Tag: para
-#: events.xml:98
 #, fuzzy, no-c-format
 msgid ""
 "A producer raises events by calling the <literal>fire()</literal> method of "
@@ -233,20 +165,12 @@
 "產生器可藉由調用 <literal>Event</literal> 介面的 <literal>fire()</literal> "
 "method,並傳送一個 <emphasis>event object</emphasis> 來產生事件:"
 
-#. Tag: programlisting
-#: events.xml:103
-#, no-c-format
-msgid "<![CDATA[documentEvent.fire(document);]]>"
-msgstr "<![CDATA[documentEvent.fire(document);]]>"
-
 #. Tag: para
-#: events.xml:105
 #, fuzzy, no-c-format
 msgid "This particular event will be delivered to every observer method that:"
 msgstr "事件會被傳送給符合下列條件的每個觀察器 method:"
 
 #. Tag: para
-#: events.xml:111
 #, fuzzy, no-c-format
 msgid ""
 "has an event parameter to which the event object (the <literal>Document</"
@@ -254,13 +178,11 @@
 msgstr "含有可指派 event object 的事件參數,以及"
 
 #. Tag: para
-#: events.xml:115
 #, fuzzy, no-c-format
 msgid "specifies no qualifiers."
 msgstr "沒有指定事件綁定的 observer method。"
 
 #. Tag: para
-#: events.xml:119
 #, fuzzy, no-c-format
 msgid ""
 "The container simply calls all the observer methods, passing the event "
@@ -274,19 +196,16 @@
 "literal> method 重新回傳。"
 
 #. Tag: para
-#: events.xml:125
 #, no-c-format
 msgid "Qualifiers can be applied to an event in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: events.xml:131
 #, no-c-format
 msgid "by annotating the <literal>Event</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: events.xml:134
 #, no-c-format
 msgid ""
 "by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
@@ -294,19 +213,11 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:138
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is far simpler:"
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:142
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
-msgstr "<![CDATA[@Observable @Updated Event<Document> documentUpdatedEvent]]>"
-
 #. Tag: para
-#: events.xml:144
 #, fuzzy, no-c-format
 msgid ""
 "Then, every event fired via this instance of <literal>Event</literal> has "
@@ -317,13 +228,11 @@
 "被標記的事件綁定。事件會被傳送給符合下列條件的每個觀察器 method:"
 
 #. Tag: para
-#: events.xml:151
 #, no-c-format
 msgid "has an event parameter to which the event object is assignable, and"
 msgstr "含有可指派 event object 的事件參數,以及"
 
 #. Tag: para
-#: events.xml:154
 #, fuzzy, no-c-format
 msgid ""
 "does not have any event qualifier <emphasis>except</emphasis> for the event "
@@ -334,7 +243,6 @@
 "literal> 的事件綁定。"
 
 #. Tag: para
-#: events.xml:161
 #, no-c-format
 msgid ""
 "The downside of annotating the injection point is that we can't specify the "
@@ -344,18 +252,7 @@
 "<literal>Event</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:167
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
-"(document);]]>"
-msgstr ""
-"<![CDATA[documentEvent.fire( document, new AnnotationLiteral<Updated>()"
-"{} );]]>"
-
 #. Tag: para
-#: events.xml:169
 #, no-c-format
 msgid ""
 "Events can have multiple event qualifiers, assembled using any combination "
@@ -364,13 +261,11 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:178
 #, fuzzy, no-c-format
 msgid "Conditional observer methods"
 msgstr "交易觀察器(Transactional observers)"
 
 #. Tag: para
-#: events.xml:180
 #, no-c-format
 msgid ""
 "By default, if there is no instance of an observer in the current context, "
@@ -380,25 +275,13 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:186
 #, no-c-format
 msgid ""
 "A conditional observer is specified by adding <literal>receive = IF_EXISTS</"
 "literal> to the <literal>@Observes</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: events.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = IF_EXISTS) "
-"@Updated Document d) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
-"document) { ... }]]>"
-
 #. Tag: para
-#: events.xml:193
 #, no-c-format
 msgid ""
 "A bean with scope <literal>@Dependent</literal> cannot be a conditional "
@@ -406,55 +289,23 @@
 msgstr ""
 
 #. Tag: title
-#: events.xml:200
 #, fuzzy, no-c-format
 msgid "Event qualifiers with members"
 msgstr "member 的事件綁定"
 
 #. Tag: para
-#: events.xml:202
 #, fuzzy, no-c-format
 msgid "An event qualifier type may have annotation members:"
 msgstr "事件綁定類型能夠有下列標記成員:"
 
-#. Tag: programlisting
-#: events.xml:204
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"   RoleType value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Target({PARAMETER, FIELD})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Role {\n"
-"    RoleType value();\n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:206
 #, no-c-format
 msgid ""
 "The member value is used to narrow the messages delivered to the observer:"
 msgstr ""
 "member value(這是個編譯期常數)會被使用來過濾並減少傳送至觀察器的訊息數量:"
 
-#. Tag: programlisting
-#: events.xml:208
-#, no-c-format
-msgid ""
-"<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
-"{ ... }]]>"
-
 #. Tag: para
-#: events.xml:210
 #, fuzzy, no-c-format
 msgid ""
 "Event qualifier type members may be specified statically by the event "
@@ -462,14 +313,7 @@
 msgstr ""
 "事件綁定類型的成員可由事件產生器在事件通知器的注入點透過標記來靜態地指定:"
 
-#. Tag: programlisting
-#: events.xml:215
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
-msgstr "<![CDATA[@Observable @Role(ADMIN) Event<LoggedIn> LoggedInEvent;}}]]>"
-
 #. Tag: para
-#: events.xml:217
 #, fuzzy, no-c-format
 msgid ""
 "Alternatively, the value of the event qualifier type member may be "
@@ -479,20 +323,7 @@
 "另外,事件綁定類型成員的值亦可藉由事件產生器來動態式地判斷出。我們首先先從編"
 "寫一個 <literal>AnnotationLiteral</literal> 的 abstract subclass 開始:"
 
-#. Tag: programlisting
-#: events.xml:222
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[abstract class RoleBinding \n"
-"   extends AnnotationLiteral<Role> \n"
-"   implements Role {}]]>"
-msgstr ""
-"<![CDATA[abstract class RoleBinding \n"
-"    extends AnnotationLiteral<Role> \n"
-"    implements Role {}]]>"
-
 #. Tag: para
-#: events.xml:224
 #, fuzzy, no-c-format
 msgid ""
 "The event producer passes an instance of this class to <literal>select()</"
@@ -500,89 +331,29 @@
 msgstr ""
 "事件產生器會將這個 class 的一個 instance 傳送至 <literal>fire()</literal>:"
 
-#. Tag: programlisting
-#: events.xml:226
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[documentEvent.select(new RoleBinding() {\n"
-"   public void value() { return user.getRole(); }\n"
-"}).fire(document);]]>"
-msgstr ""
-"<![CDATA[documentEvent.fire( document, new RoleBinding() { public void value"
-"() { return user.getRole(); } } );]]>"
-
 #. Tag: title
-#: events.xml:231
 #, fuzzy, no-c-format
 msgid "Multiple event qualifiers"
 msgstr "多重事件綁定(Multiple event binding)"
 
 #. Tag: para
-#: events.xml:233
 #, fuzzy, no-c-format
 msgid "Event qualifier types may be combined, for example:"
 msgstr "事件綁定類型可被合併,例如:"
 
-#. Tag: programlisting
-#: events.xml:235
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>(){})."
-"fire(document);]]>"
-msgstr ""
-"<![CDATA[@Observable @Blog Event<Document> blogEvent;\n"
-"...\n"
-"if (document.isBlog()) blogEvent.fire(document, new "
-"AnnotationLiteral<Updated>(){});]]>"
-
 #. Tag: para
-#: events.xml:237
 #, no-c-format
 msgid ""
 "When this event occurs, all of the following observer methods will be "
 "notified:"
 msgstr "當這個事件發生時,下列所有 observer method 都會被通知:"
 
-#. Tag: programlisting
-#: events.xml:239
-#, no-c-format
-msgid ""
-"<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
-"document) { ... }]]>"
-msgstr ""
-"<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
-"document) { ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:241
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
-"{ ... }]]>"
-msgstr ""
-"<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
-"{ ... }]]>"
-
-#. Tag: programlisting
-#: events.xml:242
-#, no-c-format
-msgid ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }}}]]>"
-msgstr ""
-"<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
-"{ ... }}}]]>"
-
 #. Tag: title
-#: events.xml:247
 #, no-c-format
 msgid "Transactional observers"
 msgstr "交易觀察器(Transactional observers)"
 
 #. Tag: para
-#: events.xml:249
 #, no-c-format
 msgid ""
 "Transactional observers receive their event notifications during the before "
@@ -595,31 +366,18 @@
 "下列 observer method 需要更新一組快取儲存於應用程式 context 中的查詢結果,不"
 "過只有更新了 <literal>Category</literal> tree 的交易會成功:"
 
-#. Tag: programlisting
-#: events.xml:256
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public void refreshCategoryTree(@Observes(during = AFTER_SUCCESS) "
-"CategoryUpdateEvent event) { ... }]]>"
-msgstr ""
-"<![CDATA[public void refreshCategoryTree(@AfterTransactionSuccess @Observes "
-"CategoryUpdateEvent event) { ... }]]>"
-
 #. Tag: para
-#: events.xml:258
 #, fuzzy, no-c-format
 msgid "There are five kinds of transactional observers:"
 msgstr "交易觀察器分為三種類型:"
 
 #. Tag: para
-#: events.xml:262
 #, no-c-format
 msgid ""
 "<literal>IN_PROGESS</literal> observers are called immediately (default)"
 msgstr ""
 
 #. Tag: para
-#: events.xml:265
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_SUCCESS</literal> observers are called during the after "
@@ -630,7 +388,6 @@
 "被調用,不過僅限於交易成功完成的情況下"
 
 #. Tag: para
-#: events.xml:271
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_FAILURE</literal> observers are called during the after "
@@ -641,7 +398,6 @@
 "被調用,不過僅限於交易無法成功完成的情況下"
 
 #. Tag: para
-#: events.xml:277
 #, fuzzy, no-c-format
 msgid ""
 "<literal>AFTER_COMPLETION</literal> observers are called during the after "
@@ -651,7 +407,6 @@
 "會被調用"
 
 #. Tag: para
-#: events.xml:283
 #, fuzzy, no-c-format
 msgid ""
 "<literal>BEFORE_COMPLETION</literal> observers are called during the before "
@@ -661,7 +416,6 @@
 "被調用"
 
 #. Tag: para
-#: events.xml:290
 #, fuzzy, no-c-format
 msgid ""
 "Transactional observers are very important in a stateful object model "
@@ -671,56 +425,12 @@
 "般被保持的時間比單一 atomic transaction(不可分割的交易)還要長。"
 
 #. Tag: para
-#: events.xml:295
 #, no-c-format
 msgid ""
 "Imagine that we have cached a JPA query result set in the application scope:"
 msgstr "想像我們已快取了一個設置於應用程式 scope 中的 JPA 查詢結果:"
 
-#. Tag: programlisting
-#: events.xml:297
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"   @PersistenceContext EntityManager em;\n"
-"    \n"
-"   List<Product> products;\n"
-"\n"
-"   @Produces @Catalog \n"
-"   List<Product> getCatalog() {\n"
-"      if (products==null) {\n"
-"         products = em.createQuery(\"select p from Product p where p.deleted "
-"= false\")\n"
-"            .getResultList();\n"
-"      }\n"
-"      return products;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"    @PersistenceContext EntityManager em;\n"
-"    \n"
-"    List<Product> products;\n"
-"\n"
-"    @Produces @Catalog \n"
-"    List<Product> getCatalog() {\n"
-"        if (products==null) {\n"
-"            products = em.createQuery(\"select p from Product p where p."
-"deleted = false\")\n"
-"                .getResultList();\n"
-"        }\n"
-"        return products;\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:299
 #, no-c-format
 msgid ""
 "From time to time, a <literal>Product</literal> is created or deleted. When "
@@ -733,100 +443,283 @@
 "<emphasis>之後</emphasis>才去進行這項更新!"
 
 #. Tag: para
-#: events.xml:305
 #, fuzzy, no-c-format
 msgid ""
 "The bean that creates and deletes <literal>Product</literal>s could raise "
 "events, for example:"
 msgstr "建立和刪除 <literal>Product</literal> 的 Web Bean 可產生事件,例如:"
 
-#. Tag: programlisting
-#: events.xml:309
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"   @PersistenceContext EntityManager em;\n"
-"   @Inject @Any Event<Product> productEvent;\n"
-"\n"
-"   public void delete(Product product) {\n"
-"      em.delete(product);\n"
-"      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
-"(product);\n"
-"   }\n"
-"    \n"
-"   public void persist(Product product) {\n"
-"      em.persist(product);\n"
-"      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
-"(product);\n"
-"   }\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateless\n"
-"public class ProductManager {\n"
-"\n"
-"    @PersistenceContext EntityManager em;\n"
-"    @Observable Event<Product> productEvent;\n"
-"\n"
-"    public void delete(Product product) {\n"
-"        em.delete(product);\n"
-"        productEvent.fire(product, new AnnotationLiteral<Deleted>(){});\n"
-"    }\n"
-"    \n"
-"    public void persist(Product product) {\n"
-"        em.persist(product);\n"
-"        productEvent.fire(product, new AnnotationLiteral<Created>(){});\n"
-"    }\n"
-"    \n"
-"    ...\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: events.xml:311
 #, no-c-format
 msgid ""
 "And now <literal>Catalog</literal> can observe the events after successful "
 "completion of the transaction:"
 msgstr "而現在,<literal>Catalog</literal> 可在交易成功完成之後觀察事件:"
 
-#. Tag: programlisting
-#: events.xml:315
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"   ...\n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
-"product) {\n"
-"      products.add(product);\n"
-"   }\n"
-"    \n"
-"   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
-"product) {\n"
-"      products.remove(product);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Singleton\n"
-"public class Catalog {\n"
-"\n"
-"    ...\n"
-"    \n"
-"    void addProduct(@AfterTransactionSuccess @Observes @Created Product "
-"product) {\n"
-"        products.add(product);\n"
-"    }\n"
-"    \n"
-"    void addProduct(@AfterTransactionSuccess @Observes @Deleted Product "
-"product) {\n"
-"        products.remove(product);\n"
-"    }\n"
-"    \n"
-"}]]>"
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({FIELD, PARAMETER})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Updated { ... }]]>"
 
 #~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document, User user) { ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Any Event<Document> documentEvent;]]>"
+#~ msgstr "<![CDATA[@Observable Event<Document> documentEvent]]>"
+
+#~ msgid "<![CDATA[documentEvent.fire(document);]]>"
+#~ msgstr "<![CDATA[documentEvent.fire(document);]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Updated Event<Document> documentUpdatedEvent;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Updated Event<Document> documentUpdatedEvent]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new AnnotationLiteral<Updated>(){}).fire"
+#~ "(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.fire( document, new AnnotationLiteral<Updated>()"
+#~ "{} );]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public void refreshOnDocumentUpdate(@Observes(receive = "
+#~ "IF_EXISTS) @Updated Document d) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterDocumentUpdate(@Observes @Updated Document "
+#~ "document) { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "   RoleType value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Target({PARAMETER, FIELD})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Role {\n"
+#~ "    RoleType value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void adminLoggedIn(@Observes @Role(ADMIN) LoggedIn event) "
+#~ "{ ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Role(ADMIN) Event<LoggedIn> loggedInEvent;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Role(ADMIN) Event<LoggedIn> LoggedInEvent;}}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "   extends AnnotationLiteral<Role> \n"
+#~ "   implements Role {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[abstract class RoleBinding \n"
+#~ "    extends AnnotationLiteral<Role> \n"
+#~ "    implements Role {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[documentEvent.select(new RoleBinding() {\n"
+#~ "   public void value() { return user.getRole(); }\n"
+#~ "}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[documentEvent.fire( document, new RoleBinding() { public void "
+#~ "value() { return user.getRole(); } } );]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.select(new AnnotationLiteral<Updated>()"
+#~ "{}).fire(document);]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Observable @Blog Event<Document> blogEvent;\n"
+#~ "...\n"
+#~ "if (document.isBlog()) blogEvent.fire(document, new "
+#~ "AnnotationLiteral<Updated>(){});]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void afterBlogUpdate(@Observes @Updated @Blog Document "
+#~ "document) { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyBlogEvent(@Observes @Blog Document document) "
+#~ "{ ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void onAnyDocumentEvent(@Observes Document document) "
+#~ "{ ... }}}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public void refreshCategoryTree(@Observes(during = "
+#~ "AFTER_SUCCESS) CategoryUpdateEvent event) { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public void refreshCategoryTree(@AfterTransactionSuccess "
+#~ "@Observes CategoryUpdateEvent event) { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "   List<Product> products;\n"
+#~ "\n"
+#~ "   @Produces @Catalog \n"
+#~ "   List<Product> getCatalog() {\n"
+#~ "      if (products==null) {\n"
+#~ "         products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "            .getResultList();\n"
+#~ "      }\n"
+#~ "      return products;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    \n"
+#~ "    List<Product> products;\n"
+#~ "\n"
+#~ "    @Produces @Catalog \n"
+#~ "    List<Product> getCatalog() {\n"
+#~ "        if (products==null) {\n"
+#~ "            products = em.createQuery(\"select p from Product p where p."
+#~ "deleted = false\")\n"
+#~ "                .getResultList();\n"
+#~ "        }\n"
+#~ "        return products;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "   @PersistenceContext EntityManager em;\n"
+#~ "   @Inject @Any Event<Product> productEvent;\n"
+#~ "\n"
+#~ "   public void delete(Product product) {\n"
+#~ "      em.delete(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Deleted>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void persist(Product product) {\n"
+#~ "      em.persist(product);\n"
+#~ "      productEvent.select(new AnnotationLiteral<Created>(){}).fire"
+#~ "(product);\n"
+#~ "   }\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class ProductManager {\n"
+#~ "\n"
+#~ "    @PersistenceContext EntityManager em;\n"
+#~ "    @Observable Event<Product> productEvent;\n"
+#~ "\n"
+#~ "    public void delete(Product product) {\n"
+#~ "        em.delete(product);\n"
+#~ "        productEvent.fire(product, new AnnotationLiteral<Deleted>(){});\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void persist(Product product) {\n"
+#~ "        em.persist(product);\n"
+#~ "        productEvent.fire(product, new AnnotationLiteral<Created>(){});\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    ...\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "   ...\n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Created Product "
+#~ "product) {\n"
+#~ "      products.add(product);\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   void addProduct(@Observes(during = AFTER_SUCCESS) @Deleted Product "
+#~ "product) {\n"
+#~ "      products.remove(product);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Singleton\n"
+#~ "public class Catalog {\n"
+#~ "\n"
+#~ "    ...\n"
+#~ "    \n"
+#~ "    void addProduct(@AfterTransactionSuccess @Observes @Created Product "
+#~ "product) {\n"
+#~ "        products.add(product);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    void addProduct(@AfterTransactionSuccess @Observes @Deleted Product "
+#~ "product) {\n"
+#~ "        products.remove(product);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "The Web Beans event notification facility allows Web Beans to interact in "
 #~ "a totally decoupled manner. Event <emphasis>producers</emphasis> raise "
 #~ "events that are then delivered to event <emphasis>observers</emphasis> by "

Modified: doc/trunk/reference/zh-TW/example.po
===================================================================
--- doc/trunk/reference/zh-TW/example.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/example.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: example\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-15 12:13+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: example.xml:4
 #, no-c-format
 msgid "JSF web application example"
 msgstr "JSF 網站應用程式範例"
 
 #. Tag: para
-#: example.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "Let's illustrate these ideas with a full example. We're going to implement "
@@ -36,112 +34,17 @@
 "實做用戶的登錄/登出。首先,我們將要定義一個 Web Bean 來在登錄時保持已輸入的用"
 "戶名稱與密碼:"
 
-#. Tag: programlisting
-#: example.xml:12
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    @NotNull @Length(min=3, max=25)\n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    @NotNull @Length(min=6, max=20)\n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"        \n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:14
 #, fuzzy, no-c-format
 msgid "This bean is bound to the login prompt in the following JSF form:"
 msgstr "這個 Web Bean 已透過下列 JSF 格式綁定至登錄提示:"
 
-#. Tag: programlisting
-#: example.xml:16
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<h:form>\n"
-"   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"      <f:validateBean>\n"
-"         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"         <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"         <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"      </f:validateBean>\n"
-"   </h:panelGrid>\n"
-"   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-msgstr ""
-"<![CDATA[<h:form>\n"
-"    <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
-"        <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
-"        <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
-"        <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
-"        <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
-"    </h:panelGrid>\n"
-"    <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#{!"
-"login.loggedIn}\"/>\n"
-"    <h:commandButton value=\"Logout\" acion=\"#{login.logout}\" rendered=\"#"
-"{login.loggedIn}\"/>\n"
-"</h:form>]]>"
-
 #. Tag: para
-#: example.xml:18
 #, no-c-format
 msgid "Users are represented by a JPA entity:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:22
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Entity\n"
-"public class User {\n"
-"   private @NotNull @Length(min=3, max=25) @Id String username;\n"
-"   private @NotNull @Length(min=6, max=20) String password;\n"
-"   \n"
-"   public String getUsername() { return username; }\n"
-"   public void setUsername(String username) { this.username = username; }\n"
-"   public String setPassword(String password) { this.password = password; }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class Credentials {\n"
-"        \n"
-"    private String username;\n"
-"    private String password;\n"
-"    \n"
-"    public String getUsername() { return username; }\n"
-"    public void setUsername(String username) { this.username = username; }\n"
-"    \n"
-"    public String getPassword() { return password; }\n"
-"    public void setPassword(String password) { this.password = password; }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:24
 #, no-c-format
 msgid ""
 "(Note that we're also going to need a <literal>persistence.xml</literal> "
@@ -150,7 +53,6 @@
 msgstr ""
 
 #. Tag: para
-#: example.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "The actual work is done by a session-scoped bean that maintains information "
@@ -161,192 +63,33 @@
 "前已登入用戶的相關資料並將 <literal>User</literal> 這個 entity 提供給其它 "
 "Web Bean:"
 
-#. Tag: programlisting
-#: example.xml:34
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login implements Serializable {\n"
-"\n"
-"   @Inject Credentials credentials;\n"
-"   @Inject @UserDatabase EntityManager userDatabase;\n"
-"\n"
-"   private User user;\n"
-"    \n"
-"   public void login() {\n"
-"      List<User> results = userDatabase.createQuery(\n"
-"         \"select u from User u where u.username = :username and u.password "
-"= :password\")\n"
-"         .setParameter(\"username\", credentials.getUsername())\n"
-"         .setParameter(\"password\", credentials.getPassword())\n"
-"         .getResultList();\n"
-"        \n"
-"      if (!results.isEmpty()) {\n"
-"         user = results.get(0);\n"
-"      }\n"
-"      else {\n"
-"         // perhaps add code here to report a failed login\n"
-"      }\n"
-"   }\n"
-"    \n"
-"   public void logout() {\n"
-"      user = null;\n"
-"   }\n"
-"    \n"
-"   public boolean isLoggedIn() {\n"
-"      return user != null;\n"
-"   }\n"
-"    \n"
-"   @Produces @LoggedIn User getCurrentUser() {\n"
-"      return user;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@SessionScoped @Named\n"
-"public class Login {\n"
-"\n"
-"    @Current Credentials credentials;\n"
-"    @PersistenceContext EntityManager userDatabase;\n"
-"\n"
-"    private User user;\n"
-"    \n"
-"    public void login() {\n"
-"            \n"
-"        List<User> results = userDatabase.createQuery(\n"
-"           \"select u from User u where u.username=:username and u.password=:"
-"password\")\n"
-"           .setParameter(\"username\", credentials.getUsername())\n"
-"           .setParameter(\"password\", credentials.getPassword())\n"
-"           .getResultList();\n"
-"        \n"
-"        if ( !results.isEmpty() ) {\n"
-"           user = results.get(0);\n"
-"        }\n"
-"        \n"
-"    }\n"
-"    \n"
-"    public void logout() {\n"
-"        user = null;\n"
-"    }\n"
-"    \n"
-"    public boolean isLoggedIn() {\n"
-"       return user!=null;\n"
-"    }\n"
-"    \n"
-"    @Produces @LoggedIn User getCurrentUser() {\n"
-"        return user;\n"
-"    }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:36
 #, no-c-format
 msgid ""
 "<literal>@LoggedIn</literal> and <literal>@UserDatabase</literal> are custom "
 "qualifier annotations:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:38
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
-"public @interface LoggedIn {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD})\n"
-"@BindingType\n"
-"public @interface LoggedIn {}]]>"
-
-#. Tag: programlisting
-#: example.xml:40
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, PARAMETER, FIELD})\n"
-"public @interface UserDatabase {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD})\n"
-"@BindingType\n"
-"public @interface LoggedIn {}]]>"
-
 #. Tag: para
-#: example.xml:42
 #, no-c-format
 msgid ""
 "We need an adaptor bean to expose our typesafe <literal>EntityManager</"
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:46
-#, no-c-format
-msgid ""
-"<![CDATA[class UserDatabaseProducer {\n"
-"   @Produces @UserDatabase @PersistenceContext \n"
-"   static EntityManager userDatabase;\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "Now <literal>DocumentEditor</literal>, or any other bean, can easily inject "
 "the current user:"
 msgstr "現在,任何其它 Web Bean 都可輕易地注入目前的用戶:"
 
-#. Tag: programlisting
-#: example.xml:50
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DocumentEditor {\n"
-"   @Inject Document document;\n"
-"   @Inject @LoggedIn User currentUser;\n"
-"   @Inject @DocumentDatabase EntityManager docDatabase;\n"
-"    \n"
-"   public void save() {\n"
-"      document.setCreatedBy(currentUser);\n"
-"      docDatabase.persist(document);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class DocumentEditor {\n"
-"\n"
-"    @Current Document document;\n"
-"    @LoggedIn User currentUser;\n"
-"    @PersistenceContext EntityManager docDatabase;\n"
-"    \n"
-"    public void save() {\n"
-"        document.setCreatedBy(currentUser);\n"
-"        docDatabase.persist(document);\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: example.xml:52
 #, no-c-format
 msgid "Or we can reference the current user in a JSF view:"
 msgstr ""
 
-#. Tag: programlisting
-#: example.xml:54
-#, no-c-format
-msgid ""
-"<![CDATA[<h:panelGroup rendered=\"#{login.loggedIn}\">\n"
-"   signed in as #{currentUser.username}\n"
-"</h:panelGroup>]]>"
-msgstr ""
-
 #. Tag: para
-#: example.xml:56
 #, fuzzy, no-c-format
 msgid ""
 "Hopefully, this example gave you a taste of the CDI programming model. In "
@@ -356,5 +99,228 @@
 "下個章節當中,我們將會更深入地探討 Web Bean 依賴注入(Web Beans dependency "
 "injection)。"
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=3, max=25)\n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    @NotNull @Length(min=6, max=20)\n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "        \n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<h:form>\n"
+#~ "   <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "      <f:validateBean>\n"
+#~ "         <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"username\" value=\"#{credentials.username}\"/"
+#~ ">\n"
+#~ "         <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "         <h:inputText id=\"password\" value=\"#{credentials.password}\"/"
+#~ ">\n"
+#~ "      </f:validateBean>\n"
+#~ "   </h:panelGrid>\n"
+#~ "   <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered=\"#"
+#~ "{!login.loggedIn}\"/>\n"
+#~ "   <h:commandButton value=\"Logout\" action=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</h:form>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<h:form>\n"
+#~ "    <h:panelGrid columns=\"2\" rendered=\"#{!login.loggedIn}\">\n"
+#~ "        <h:outputLabel for=\"username\">Username:</h:outputLabel>\n"
+#~ "        <h:inputText id=\"username\" value=\"#{credentials.username}\"/>\n"
+#~ "        <h:outputLabel for=\"password\">Password:</h:outputLabel>\n"
+#~ "        <h:inputText id=\"password\" value=\"#{credentials.password}\"/>\n"
+#~ "    </h:panelGrid>\n"
+#~ "    <h:commandButton value=\"Login\" action=\"#{login.login}\" rendered="
+#~ "\"#{!login.loggedIn}\"/>\n"
+#~ "    <h:commandButton value=\"Logout\" acion=\"#{login.logout}\" rendered="
+#~ "\"#{login.loggedIn}\"/>\n"
+#~ "</h:form>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Entity\n"
+#~ "public class User {\n"
+#~ "   private @NotNull @Length(min=3, max=25) @Id String username;\n"
+#~ "   private @NotNull @Length(min=6, max=20) String password;\n"
+#~ "   \n"
+#~ "   public String getUsername() { return username; }\n"
+#~ "   public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "   public String setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named @RequestScoped\n"
+#~ "public class Credentials {\n"
+#~ "        \n"
+#~ "    private String username;\n"
+#~ "    private String password;\n"
+#~ "    \n"
+#~ "    public String getUsername() { return username; }\n"
+#~ "    public void setUsername(String username) { this.username = "
+#~ "username; }\n"
+#~ "    \n"
+#~ "    public String getPassword() { return password; }\n"
+#~ "    public void setPassword(String password) { this.password = "
+#~ "password; }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login implements Serializable {\n"
+#~ "\n"
+#~ "   @Inject Credentials credentials;\n"
+#~ "   @Inject @UserDatabase EntityManager userDatabase;\n"
+#~ "\n"
+#~ "   private User user;\n"
+#~ "    \n"
+#~ "   public void login() {\n"
+#~ "      List<User> results = userDatabase.createQuery(\n"
+#~ "         \"select u from User u where u.username = :username and u."
+#~ "password = :password\")\n"
+#~ "         .setParameter(\"username\", credentials.getUsername())\n"
+#~ "         .setParameter(\"password\", credentials.getPassword())\n"
+#~ "         .getResultList();\n"
+#~ "        \n"
+#~ "      if (!results.isEmpty()) {\n"
+#~ "         user = results.get(0);\n"
+#~ "      }\n"
+#~ "      else {\n"
+#~ "         // perhaps add code here to report a failed login\n"
+#~ "      }\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public void logout() {\n"
+#~ "      user = null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public boolean isLoggedIn() {\n"
+#~ "      return user != null;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "      return user;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@SessionScoped @Named\n"
+#~ "public class Login {\n"
+#~ "\n"
+#~ "    @Current Credentials credentials;\n"
+#~ "    @PersistenceContext EntityManager userDatabase;\n"
+#~ "\n"
+#~ "    private User user;\n"
+#~ "    \n"
+#~ "    public void login() {\n"
+#~ "            \n"
+#~ "        List<User> results = userDatabase.createQuery(\n"
+#~ "           \"select u from User u where u.username=:username and u."
+#~ "password=:password\")\n"
+#~ "           .setParameter(\"username\", credentials.getUsername())\n"
+#~ "           .setParameter(\"password\", credentials.getPassword())\n"
+#~ "           .getResultList();\n"
+#~ "        \n"
+#~ "        if ( !results.isEmpty() ) {\n"
+#~ "           user = results.get(0);\n"
+#~ "        }\n"
+#~ "        \n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void logout() {\n"
+#~ "        user = null;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public boolean isLoggedIn() {\n"
+#~ "       return user!=null;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    @Produces @LoggedIn User getCurrentUser() {\n"
+#~ "        return user;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface LoggedIn {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD})\n"
+#~ "@BindingType\n"
+#~ "public @interface LoggedIn {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, PARAMETER, FIELD})\n"
+#~ "public @interface UserDatabase {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD})\n"
+#~ "@BindingType\n"
+#~ "public @interface LoggedIn {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "   @Inject Document document;\n"
+#~ "   @Inject @LoggedIn User currentUser;\n"
+#~ "   @Inject @DocumentDatabase EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "   public void save() {\n"
+#~ "      document.setCreatedBy(currentUser);\n"
+#~ "      docDatabase.persist(document);\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DocumentEditor {\n"
+#~ "\n"
+#~ "    @Current Document document;\n"
+#~ "    @LoggedIn User currentUser;\n"
+#~ "    @PersistenceContext EntityManager docDatabase;\n"
+#~ "    \n"
+#~ "    public void save() {\n"
+#~ "        document.setCreatedBy(currentUser);\n"
+#~ "        docDatabase.persist(document);\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
 #~ msgid "Of course, <literal>@LoggedIn</literal> is a binding annotation:"
 #~ msgstr "當然,<literal>@LoggedIn</literal> 是個綁定標記:"

Modified: doc/trunk/reference/zh-TW/extend.po
===================================================================
--- doc/trunk/reference/zh-TW/extend.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/extend.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: extend\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-13 11:07+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: extend.xml:5
 #, no-c-format
 msgid "Portable extensions"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "CDI is intended to be a foundation for frameworks, extensions and "
@@ -36,13 +34,11 @@
 "型的延伸為 Web Bean 設計人員所設想的:"
 
 #. Tag: para
-#: extend.xml:15
 #, no-c-format
 msgid "integration with Business Process Management engines,"
 msgstr "和商業流程管理上的整合、"
 
 #. Tag: para
-#: extend.xml:18
 #, no-c-format
 msgid ""
 "integration with third-party frameworks such as Spring, Seam, GWT or Wicket, "
@@ -50,31 +46,26 @@
 msgstr "和第三方架構(例如 Spring、Seam、GWT 或 Wicket)上的整合,以及"
 
 #. Tag: para
-#: extend.xml:23
 #, fuzzy, no-c-format
 msgid "new technology based upon the CDI programming model."
 msgstr "基於 Web Bean 程式撰寫模型(Programming Model)的新技術。"
 
 #. Tag: para
-#: extend.xml:27
 #, no-c-format
 msgid "More formally, according to the spec:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:32
 #, no-c-format
 msgid "A portable extension may integrate with the container by:"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:35
 #, no-c-format
 msgid "Providing its own beans, interceptors and decorators to the container"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:40
 #, no-c-format
 msgid ""
 "Injecting dependencies into its own objects using the dependency injection "
@@ -82,13 +73,11 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:45
 #, no-c-format
 msgid "Providing a context implementation for a custom scope"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:50
 #, no-c-format
 msgid ""
 "Augmenting or overriding the annotation-based metadata with metadata from "
@@ -96,13 +85,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:58
 #, fuzzy, no-c-format
 msgid "Creating an <literal>Extension</literal>"
 msgstr "<literal>Bean</literal> class"
 
 #. Tag: para
-#: extend.xml:60
 #, no-c-format
 msgid ""
 "The first step in creating a portable extension is to write a class that "
@@ -111,14 +98,7 @@
 "service provider architecture."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:66
-#, no-c-format
-msgid "class MyExtension implements Extension { ... }"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:68
 #, no-c-format
 msgid ""
 "Next, we need to register our extension as a service provider by creating a "
@@ -126,14 +106,7 @@
 "literal>, which contains the name of our extension class:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:74
-#, no-c-format
-msgid "org.mydomain.extension.MyExtension"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:76
 #, no-c-format
 msgid ""
 "An extension is not a bean, exactly, since it is instantiated by the "
@@ -142,18 +115,7 @@
 "process is complete."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:82
-#, no-c-format
-msgid ""
-"@Inject \n"
-"MyBean(MyExtension myExtension) {\n"
-"   myExtension.doSomething();\n"
-"}"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:84
 #, no-c-format
 msgid ""
 "And, like beans, extensions can have observer methods. Usually, the observer "
@@ -161,33 +123,28 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:92
 #, no-c-format
 msgid "Container lifecycle events"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:94
 #, no-c-format
 msgid ""
 "During the initialization process, the container fires a series of events, "
 "including:"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:101
-#, no-c-format
-msgid "BeforeBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>BeforeBeanDiscovery</literal>"
+msgstr "<literal>Manager</literal> 物件"
 
-#. Tag: literal
-#: extend.xml:106
-#, no-c-format
-msgid "ProcessAnnotatedType"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>ProcessAnnotatedType</literal>"
+msgstr "<literal>Manager</literal> 物件"
 
 #. Tag: para
-#: extend.xml:110
 #, no-c-format
 msgid ""
 "<literal>ProcessInjectionTarget</literal> and <literal>ProcessProducer</"
@@ -195,54 +152,27 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:115
 #, no-c-format
 msgid ""
 "<literal>ProcessBean</literal> and <literal>ProcessObserverMethod</literal>"
 msgstr ""
 
-#. Tag: literal
-#: extend.xml:121
-#, no-c-format
-msgid "AfterBeanDiscovery"
-msgstr ""
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>AfterBeanDiscovery</literal>"
+msgstr "<literal>Manager</literal> 物件"
 
-#. Tag: literal
-#: extend.xml:126
+#. Tag: para
 #, no-c-format
-msgid "AfterDeploymentValidation"
+msgid "<literal>AfterDeploymentValidation</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:131
 #, no-c-format
 msgid "Extensions may observe these events:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:135
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"   \n"
-"   void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bbd) {\n"
-"      Logger.global.debug(\"beginning the scanning process\");\n"
-"   }\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      Logger.global.debug(\"scanning type: \" + pat.getAnnotatedType()."
-"getJavaClass().getName());\n"
-"   } \n"
-"\n"
-"   void afterBeanDiscovery(@Observes AfterBeanDiscovery abd) {\n"
-"      Logger.global.debug(\"finished the scanning process\");\n"
-"   }\n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:137
 #, no-c-format
 msgid ""
 "In fact, the extension can do a lot more than just observe. The extension is "
@@ -250,43 +180,17 @@
 "example:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:142
-#, no-c-format
-msgid ""
-"<![CDATA[class MyExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"      //tell the container to ignore the type if it is annotated @Ignore\n"
-"      if ( pat.getAnnotatedType().isAnnotionPresent(Ignore.class) ) pat.veto"
-"();   \n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:144
 #, fuzzy, no-c-format
 msgid "The observer method may inject a <literal>BeanManager</literal>"
 msgstr "延伸 Web Bean 的神經中樞為 <literal>Manager</literal> 這個物件。"
 
-#. Tag: programlisting
-#: extend.xml:148
-#, no-c-format
-msgid ""
-"<![CDATA[<T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> "
-"pat, BeanManager beanManager) { ... }]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:153
 #, fuzzy, no-c-format
 msgid "The <literal>BeanManager</literal> object"
 msgstr "<literal>Manager</literal> 物件"
 
 #. Tag: para
-#: extend.xml:155
 #, fuzzy, no-c-format
 msgid ""
 "The nerve center for extending CDI is the <literal>BeanManager</literal> "
@@ -296,68 +200,14 @@
 "<literal>Manager</literal> 介面能讓我們程式性地註冊並取得 Web Bean、攔截器"
 "(interceptor)、裝飾器(decorator)、觀察器(observer),以及 context。"
 
-#. Tag: programlisting
-#: extend.xml:161
-#, no-c-format
-msgid ""
-"<![CDATA[public interface BeanManager {\n"
-"   public Object getReference(Bean<?> bean, Type beanType, "
-"CreationalContext<?> ctx);\n"
-"   public Object getInjectableReference(InjectionPoint ij, "
-"CreationalContext<?> ctx);\n"
-"   public <T> CreationalContext<T> createCreationalContext(Contextual<T> "
-"contextual);\n"
-"   public Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers);\n"
-"   public Set<Bean<?>> getBeans(String name);\n"
-"   public Bean<?> getPassivationCapableBean(String id);\n"
-"   public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);\n"
-"   public void validate(InjectionPoint injectionPoint);\n"
-"   public void fireEvent(Object event, Annotation... qualifiers);\n"
-"   public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, "
-"Annotation... qualifiers);\n"
-"   public List<Decorator<?>> resolveDecorators(Set<Type> types, "
-"Annotation... qualifiers);\n"
-"   public List<Interceptor<?>> resolveInterceptors(InterceptionType type, "
-"Annotation... interceptorBindings);\n"
-"   public boolean isScope(Class<? extends Annotation> annotationType);\n"
-"   public boolean isNormalScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isPassivatingScope(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isQualifier(Class<? extends Annotation> annotationType);\n"
-"   public boolean isInterceptorBinding(Class<? extends Annotation> "
-"annotationType);\n"
-"   public boolean isStereotype(Class<? extends Annotation> annotationType);\n"
-"   public Set<Annotation> getInterceptorBindingDefinition(Class<? extends "
-"Annotation> bindingType);\n"
-"   public Set<Annotation> getStereotypeDefinition(Class<? extends "
-"Annotation> stereotype);\n"
-"   public Context getContext(Class<? extends Annotation> scopeType);\n"
-"   public ELResolver getELResolver();\n"
-"   public ExpressionFactory wrapExpressionFactory(ExpressionFactory "
-"expressionFactory);\n"
-"   public <T> AnnotatedType<T> createAnnotatedType(Class<T> type);\n"
-"   public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> "
-"type);\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:163
 #, fuzzy, no-c-format
 msgid ""
 "Any bean or other Java EE component which supports injection can obtain an "
 "instance of <literal>BeanManager</literal> via injection:"
 msgstr "我們可透過注入來取得 <literal>Manager</literal> 的一個 instance:"
 
-#. Tag: programlisting
-#: extend.xml:166
-#, fuzzy, no-c-format
-msgid "@Inject BeanManager beanManager;"
-msgstr "@Current Manager 管理員"
-
 #. Tag: para
-#: extend.xml:168
 #, no-c-format
 msgid ""
 "Java EE components may obtain an instance of <literal>BeanManager</literal> "
@@ -367,7 +217,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:174
 #, fuzzy, no-c-format
 msgid ""
 "Let's study some of the interfaces exposed by the <literal>BeanManager</"
@@ -375,13 +224,11 @@
 msgstr "延伸 Web Bean 的神經中樞為 <literal>Manager</literal> 這個物件。"
 
 #. Tag: title
-#: extend.xml:179
 #, fuzzy, no-c-format
 msgid "The <literal>InjectionTarget</literal> interface"
 msgstr "<literal>Context</literal> 介面"
 
 #. Tag: para
-#: extend.xml:181
 #, no-c-format
 msgid ""
 "The first thing that a framework developer is going to look for in the "
@@ -391,7 +238,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:188
 #, no-c-format
 msgid ""
 "We recommend that frameworks let CDI take over the job of actually "
@@ -402,50 +248,12 @@
 "field injection will be supported."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:196
-#, no-c-format
-msgid ""
-"<![CDATA[//get the BeanManager from JNDI\n"
-"BeanManager beanManager = (BeanManager) new InitialContext().lookup(\"java:"
-"comp/BeanManager\");\n"
-"\n"
-"//CDI uses an AnnotatedType object to read the annotations of a class\n"
-"AnnotatedType<SomeFrameworkComponent> type = beanManager.createAnnotatedType"
-"(SomeFrameworkComponent.class);\n"
-"\n"
-"//The extension uses an InjectionTarget to delegate instantiation, "
-"dependency injection \n"
-"//and lifecycle callbacks to the CDI container\n"
-"InjectionTarget<SomeFrameworkComponent> it = beanManager."
-"createInjectionTarget(type);\n"
-"\n"
-"//each instance needs its own CDI CreationalContext\n"
-"CreationalContext ctx = beanManager.createCreationalContext(null);\n"
-"\n"
-"//instantiate the framework component and inject its dependencies\n"
-"SomeFrameworkComponent instance = it.produce(ctx);  //call the constructor\n"
-"it.inject(instance, ctx);  //call initializer methods and perform field "
-"injection\n"
-"it.postConstruct(instance);  //call the @PostConstruct method\n"
-"\n"
-"...\n"
-"\n"
-"//destroy the framework component instance and clean up dependent objects\n"
-"it.preDestroy(instance);  //call the @PreDestroy method\n"
-"it.dispose(instance);  //it is now safe to discard the instance\n"
-"ctx.release();  //clean up dependent objects\n"
-"]]>"
-msgstr ""
-
 #. Tag: title
-#: extend.xml:201
 #, fuzzy, no-c-format
 msgid "The <literal>Bean</literal> interface"
 msgstr "<literal>Context</literal> 介面"
 
 #. Tag: para
-#: extend.xml:203
 #, fuzzy, no-c-format
 msgid ""
 "Instances of the interface <literal>Bean</literal> represent beans. There is "
@@ -459,46 +267,18 @@
 "<literal>Bean</literal> instance。"
 
 #. Tag: para
-#: extend.xml:210
 #, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface exposes all the interesting things we "
-"dicussed in <xref linkend=\"bean-anatomy\"/>."
+"dicussed in <xref linkend=\"bean-anatomy\" />."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:215
-#, no-c-format
-msgid ""
-"<![CDATA[public interface Bean<T> extends Contextual<T> {\n"
-"   public Set<Type> getTypes();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public String getName();\n"
-"   public Set<Class<? extends Annotation>> getStereotypes();\n"
-"   public Class<?> getBeanClass();\n"
-"   public boolean isAlternative();\n"
-"   public boolean isNullable();\n"
-"   public Set<InjectionPoint> getInjectionPoints();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:217
 #, no-c-format
 msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:221
-#, no-c-format
-msgid ""
-"<![CDATA[Set<Bean<?>> allBeans = beanManager.getBeans(Obect.class, new "
-"AnnotationLiteral<Any>() {});]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:223
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Bean</literal> interface makes it possible for a portable "
@@ -514,13 +294,11 @@
 "Web Bean 之中。"
 
 #. Tag: title
-#: extend.xml:233
 #, fuzzy, no-c-format
 msgid "Registering a <literal>Bean</literal>"
 msgstr "<literal>Bean</literal> class"
 
 #. Tag: para
-#: extend.xml:235
 #, no-c-format
 msgid ""
 "The most common kind of CDI portable extension registers a bean (or beans) "
@@ -528,7 +306,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:239
 #, no-c-format
 msgid ""
 "In this example, we make a framework class, <literal>SecurityManager</"
@@ -538,101 +315,7 @@
 "<literal>SecurityManager</literal> instance."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[public class SecurityManagerExtension implements Extension {\n"
-"    \n"
-"    void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager "
-"bm) {\n"
-"            \n"
-"        //use this to read annotations of the class\n"
-"        AnnotatedType<SecurityManager> at = bm.createAnnotatedType"
-"(SecurityManager.class); \n"
-"\n"
-"        //use this to instantiate the class and inject dependencies\n"
-"        final InjectionTarget<SecurityManager> it = bm.createInjectionTarget"
-"(at); \n"
-"\n"
-"        abd.addBean( new Bean<SecurityManager>() {\n"
-"\n"
-"            @Override\n"
-"            public Class<?> getBeanClass() {\n"
-"                return SecurityManager.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public String getName() {\n"
-"                return \"securityManager\";\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getQualifiers() {\n"
-"                Set<Annotation> qualifiers = new HashSet<Annotation>();\n"
-"                qualifiers.add( new AnnotationLiteral<Default>() {} );\n"
-"                qualifiers.add( new AnnotationLiteral<Any>() {} );\n"
-"                return qualifiers;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<? extends Annotation> getScope() {\n"
-"                return SessionScoped.class;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Class<? extends Annotation>> getStereotypes() {\n"
-"                return Collections.emptySet();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypes() {\n"
-"                Set<Type> types = new HashSet<Type>();\n"
-"                types.add(SecurityManager.class);\n"
-"                types.add(Object.class);\n"
-"                return types;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAlternative() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isNullable() {\n"
-"                return false;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public SecurityManager create(CreationalContext<SecurityManager> "
-"ctx) {\n"
-"                SecurityManager instance = it.produce(ctx);\n"
-"                it.inject(instance, ctx);\n"
-"                it.postConstruct(instance);\n"
-"                return instance;\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void destroy(SecurityManager instance, \n"
-"                                CreationalContext<SecurityManager> ctx) {\n"
-"                it.preDestroy(instance);\n"
-"                it.dispose(instance);\n"
-"                ctx.release();\n"
-"            }\n"
-"            \n"
-"        } );\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:248
 #, no-c-format
 msgid ""
 "But a portable extension can also mess with beans that are discovered "
@@ -640,13 +323,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:255
 #, no-c-format
 msgid "Wrapping an <literal>AnnotatedType</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:257
 #, no-c-format
 msgid ""
 "One of the most interesting things that an extension class can do is process "
@@ -655,7 +336,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:262
 #, no-c-format
 msgid ""
 "Let's start with an example of an extension that provides support for the "
@@ -666,101 +346,7 @@
 "<literal>value()</literal> of the <literal>@Named</literal> annotation."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:270
-#, no-c-format
-msgid ""
-"<![CDATA[public class QualifiedNameExtension implements Extension {\n"
-"\n"
-"    <X> void processAnnotatedType(@Observes ProcessAnnotatedType<X> pat) {\n"
-"\n"
-"        //wrap this to override the annotations of the class\n"
-"        final AnnotatedType<X> at = pat.getAnnotatedType();\n"
-"        \n"
-"        AnnotatedType<X> wrapped = new AnnotatedType<X>() {\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedConstructor<X>> getConstructors() {\n"
-"                return at.getConstructors();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedField<? super X>> getFields() {\n"
-"                return at.getFields();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Class<X> getJavaClass() {\n"
-"                return at.getJavaClass();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<AnnotatedMethod<? super X>> getMethods() {\n"
-"                return at.getMethods();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public <T extends Annotation> T getAnnotation(final Class<T> "
-"annType) {\n"
-"                if ( Named.class.equals(annType) ) {\n"
-"                    class NamedLiteral \n"
-"                            extends AnnotationLiteral<Named> \n"
-"                            implements Named {\n"
-"                        @Override\n"
-"                        public String value() {\n"
-"                            Package pkg = at.getClass().getPackage();\n"
-"                            String unqualifiedName = at.getAnnotation(Named."
-"class).value();\n"
-"                            final String qualifiedName;\n"
-"                            if ( pkg.isAnnotationPresent(Named.class) ) {\n"
-"                                qualifiedName = pkg.getAnnotation(Named."
-"class).value() \n"
-"                                      + '.' + unqualifiedName;\n"
-"                            }\n"
-"                            else {\n"
-"                                qualifiedName = unqualifiedName;\n"
-"                            }\n"
-"                            return qualifiedName;\n"
-"                        }\n"
-"                    }\n"
-"                    return (T) new NamedLiteral();\n"
-"                }\n"
-"                else {\n"
-"                    return at.getAnnotation(annType);\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Annotation> getAnnotations() {\n"
-"                return at.getAnnotations();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Type getBaseType() {\n"
-"                return at.getBaseType();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<Type> getTypeClosure() {\n"
-"                return at.getTypeClosure();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annType) {\n"
-"                return at.isAnnotationPresent(annType);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pat.setAnnotatedType(wrapped);\n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:272
 #, no-c-format
 msgid ""
 "Here's a second example, which adds the <literal>@Alternative</literal> "
@@ -768,41 +354,7 @@
 "literal> interface."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:277
-#, no-c-format
-msgid ""
-"<![CDATA[class ServiceAlternativeExtension implements Extension {\n"
-"      \n"
-"   <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) {\n"
-"   \n"
-"      final AnnotatedType<T> type = pat.getAnnotatedType();\n"
-"      \n"
-"      if ( Service.class.isAssignableFrom( type.getJavaClass() ) ) {\n"
-"      \n"
-"         //if the class implements Service, make it an @Alternative\n"
-"         AnnotatedType<T> wrapped = new AnnotatedType<T>() {\n"
-"         \n"
-"            @Override\n"
-"            public boolean isAnnotationPresent(Class<? extends Annotation> "
-"annotationType) {\n"
-"               return annotationType.equals(Alternative.class) ? \n"
-"                  true : type.isAnnotationPresent(annotationType);\n"
-"            }\n"
-"            \n"
-"            //remaining methods of AnnotatedType\n"
-"            ...\n"
-"         }\n"
-"         \n"
-"         pat.setAnnotatedType(wrapped);\n"
-"      }\n"
-"   } \n"
-"   \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:283
 #, no-c-format
 msgid ""
 "The <literal>AnnotatedType</literal> is not the only thing that can be "
@@ -810,13 +362,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:288
 #, no-c-format
 msgid "Wrapping an <literal>InjectionTarget</literal>"
 msgstr ""
 
 #. Tag: para
-#: extend.xml:290
 #, no-c-format
 msgid ""
 "The <literal>InjectionTarget</literal> interface exposes operations for "
@@ -828,7 +378,6 @@
 msgstr ""
 
 #. Tag: para
-#: extend.xml:297
 #, no-c-format
 msgid ""
 "Here's a CDI portable extension that reads values from properties files and "
@@ -840,16 +389,7 @@
 "<literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:305
-#, no-c-format
-msgid ""
-"firstName=Gavin\n"
-"lastName=King"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:307
 #, no-c-format
 msgid ""
 "The portable extension works by wrapping the containers "
@@ -857,121 +397,7 @@
 "<literal>inject()</literal> method."
 msgstr ""
 
-#. Tag: programlisting
-#: extend.xml:310
-#, no-c-format
-msgid ""
-"<![CDATA[public class ConfigExtension implements Extension {\n"
-"\n"
-"        <X> void processInjectionTarget(@Observes ProcessInjectionTarget<X> "
-"pit) {\n"
-"                \n"
-"                //wrap this to intercept the component lifecycle\n"
-"            final InjectionTarget<X> it = pit.getInjectionTarget();\n"
-"            \n"
-"        final Map<Field, Object> configuredValues = new HashMap<Field, "
-"Object>();\n"
-"        \n"
-"        //use this to read annotations of the class and its members\n"
-"        AnnotatedType<X> at = pit.getAnnotatedType();\n"
-"        \n"
-"        //read the properties file\n"
-"        String propsFileName = at.getClass().getSimpleName() + \".properties"
-"\";\n"
-"        InputStream stream = at.getJavaClass().getResourceAsStream"
-"(propsFileName);\n"
-"        if (stream!=null) {\n"
-"            \n"
-"            try {\n"
-"                Properties props = new Properties();\n"
-"                props.load(stream);\n"
-"                for (Map.Entry<Object, Object> property : props.entrySet()) "
-"{\n"
-"                    String fieldName = property.getKey().toString();\n"
-"                    Object value = property.getValue();\n"
-"                    try {\n"
-"                        Field field = at.getJavaClass().getField"
-"(fieldName);\n"
-"                        field.setAccessible(true);\n"
-"                        if ( field.getType().isAssignableFrom( value.getClass"
-"() ) ) {\n"
-"                            configuredValues.put(field, value);\n"
-"                        }\n"
-"                        else {\n"
-"                            //TODO: do type conversion automatically\n"
-"                            pit.addDefinitionError( new InjectionException(\n"
-"                                   \"field is not of type String: \" + "
-"field ) );\n"
-"                        }\n"
-"                    }\n"
-"                    catch (NoSuchFieldException nsfe) {\n"
-"                        pit.addDefinitionError(nsfe);\n"
-"                    }\n"
-"                    finally {\n"
-"                        stream.close();\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"            catch (IOException ioe) {\n"
-"                pit.addDefinitionError(ioe);\n"
-"            }\n"
-"        }\n"
-"        \n"
-"        InjectionTarget<X> wrapped = new InjectionTarget<X>() {\n"
-"\n"
-"            @Override\n"
-"            public void inject(X instance, CreationalContext<X> ctx) {\n"
-"                it.inject(instance, ctx);\n"
-"                \n"
-"                //set the values onto the new instance of the component\n"
-"                for (Map.Entry<Field, Object> configuredValue: "
-"configuredValues.entrySet()) {\n"
-"                    try {\n"
-"                        configuredValue.getKey().set(instance, "
-"configuredValue.getValue());\n"
-"                    }\n"
-"                    catch (Exception e) {\n"
-"                        throw new InjectionException(e);\n"
-"                    }\n"
-"                }\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void postConstruct(X instance) {\n"
-"                it.postConstruct(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void preDestroy(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public void dispose(X instance) {\n"
-"                it.dispose(instance);\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public Set<InjectionPoint> getInjectionPoints() {\n"
-"                return it.getInjectionPoints();\n"
-"            }\n"
-"\n"
-"            @Override\n"
-"            public X produce(CreationalContext<X> ctx) {\n"
-"                return it.produce(ctx);\n"
-"            }\n"
-"            \n"
-"        };\n"
-"        \n"
-"        pit.setInjectionTarget(wrapped);\n"
-"        \n"
-"    }\n"
-"    \n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extend.xml:312
 #, no-c-format
 msgid ""
 "There's a lot more to the portable extension SPI than what we've discussed "
@@ -980,13 +406,11 @@
 msgstr ""
 
 #. Tag: title
-#: extend.xml:320
 #, no-c-format
 msgid "The <literal>Context</literal> interface"
 msgstr "<literal>Context</literal> 介面"
 
 #. Tag: para
-#: extend.xml:322
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Context</literal> interface supports addition of new scopes to "
@@ -995,30 +419,7 @@
 "<literal>Context</literal> 介面支援新增額外的 Web Bean 功能,或針對新環境為內"
 "建功能進行延伸。"
 
-#. Tag: programlisting
-#: extend.xml:327
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface Context {\n"
-"   public Class<? extends Annotation> getScope();\n"
-"   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
-"creationalContext);\n"
-"   public <T> T get(Contextual<T> contextual);\n"
-"   boolean isActive();\n"
-"}]]>"
-msgstr ""
-"public interface Context {\n"
-"    \n"
-"    public Class&lt;? extends Annotation&gt; getScopeType();\n"
-"    \n"
-"    public &lt;T&gt; T get(Bean&lt;T&gt; bean, boolean create);\n"
-"    \n"
-"    boolean isActive();\n"
-"    \n"
-"}"
-
 #. Tag: para
-#: extend.xml:329
 #, fuzzy, no-c-format
 msgid ""
 "For example, we might implement <literal>Context</literal> to add a business "
@@ -1029,7 +430,31 @@
 "Web Bean,或是為一個使用 Wicket 的應用程式新增對話功能上的支援。"
 
 #, fuzzy
+#~ msgid "@Inject BeanManager beanManager;"
+#~ msgstr "@Current Manager 管理員"
+
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public interface Context {\n"
+#~ "   public Class<? extends Annotation> getScope();\n"
+#~ "   public <T> T get(Contextual<T> contextual, CreationalContext<T> "
+#~ "creationalContext);\n"
+#~ "   public <T> T get(Contextual<T> contextual);\n"
+#~ "   boolean isActive();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "public interface Context {\n"
+#~ "    \n"
+#~ "    public Class&lt;? extends Annotation&gt; getScopeType();\n"
+#~ "    \n"
+#~ "    public &lt;T&gt; T get(Bean&lt;T&gt; bean, boolean create);\n"
+#~ "    \n"
+#~ "    boolean isActive();\n"
+#~ "    \n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
 #~ "There are two subinterfaces of <literal>Bean</literal> defined by the CDI "
 #~ "specification: <literal>Interceptor</literal> and <literal>Decorator</"
 #~ "literal>."

Modified: doc/trunk/reference/zh-TW/extensions.po
===================================================================
--- doc/trunk/reference/zh-TW/extensions.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/extensions.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,25 +15,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: extensions.xml:8
 #, no-c-format
 msgid "CDI extensions available as part of Weld"
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:11
 #, no-c-format
 msgid "These modules are usable on any JSR-299 implementation, not just Weld!"
 msgstr ""
 
 #. Tag: title
-#: extensions.xml:17
 #, no-c-format
 msgid "Weld Logger"
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:19
 #, no-c-format
 msgid ""
 "Adding logging to your application is now even easier with simple injection "
@@ -42,26 +38,7 @@
 "will be injected into any instance of the bean."
 msgstr ""
 
-#. Tag: programlisting
-#: extensions.xml:25
-#, no-c-format
-msgid ""
-"<![CDATA[import org.slf4j.Logger;\n"
-"import javax.inject.Inject;\n"
-"\n"
-"public class Checkout {\n"
-"   private @Inject Logger log;\n"
-"\n"
-"   public void invoiceItems() {\n"
-"      ShoppingCart cart;\n"
-"      ...\n"
-"      log.debug(\"Items invoiced for {}\", cart);\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: extensions.xml:27
 #, no-c-format
 msgid ""
 "The example shows how objects can be interpolated into a message. If you use "
@@ -71,7 +48,6 @@
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:34
 #, no-c-format
 msgid ""
 "You can add Weld logging to your project by including weld-logger.jar, sl4j-"
@@ -81,7 +57,6 @@
 msgstr ""
 
 #. Tag: para
-#: extensions.xml:39
 #, no-c-format
 msgid ""
 "If you are using Weld as your JSR-299 implementation, there's no need to "

Modified: doc/trunk/reference/zh-TW/gettingstarted.po
===================================================================
--- doc/trunk/reference/zh-TW/gettingstarted.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/gettingstarted.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ri\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-19 18:21+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,27 +17,24 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: gettingstarted.xml:5
 #, no-c-format
 msgid "Getting started with Weld"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:7
 #, no-c-format
 msgid ""
 "Weld comes with two starter example applications, in addition to more "
 "specialized examples. The first, <literal>weld-numberguess</literal>, is a "
-"web (WAR) example containing only non-transactional managed beans. This "
+"web (war) example containing only non-transactional managed beans. This "
 "example can be run on a wide range of servers, including JBoss AS, "
 "GlassFish, Apache Tomcat, Jetty, Google App Engine, and any compliant Java "
 "EE 6 container. The second example, <literal>weld-translator</literal>, is "
-"an enterprise (EAR) example that contains session beans. This example must "
-"be run on JBoss AS 5.2, Glassfish 3.0 or any compliant Java EE 6 container."
+"an enterprise (ear) example that contains session beans. This example must "
+"be run on JBoss AS 6.0, Glassfish 3.0 or any compliant Java EE 6 container."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:16
 #, no-c-format
 msgid ""
 "Both examples use JSF 2.0 as the web framework and, as such, can be found in "
@@ -45,13 +42,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:22
 #, no-c-format
 msgid "Prerequisites"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:24
 #, no-c-format
 msgid ""
 "To run the examples with the provided build scripts, you'll need the "
@@ -59,58 +54,47 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:30
 #, fuzzy, no-c-format
 msgid "the latest release of Weld, which contains the examples"
 msgstr "最新版本的 Web Beans RI、"
 
 #. Tag: para
-#: gettingstarted.xml:33
 #, no-c-format
 msgid "Ant 1.7.0, to build and deploy the examples"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:36
 #, no-c-format
 msgid "a supported runtime environment (minimum versions shown)"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:39
-#, no-c-format
-msgid ""
-"JBoss AS 5.2.0 (currently only nightly builds of JBoss AS 5.2.0.Beta1 are "
-"available),"
-msgstr ""
+#, fuzzy, no-c-format
+msgid "JBoss AS 6.0.0,"
+msgstr "JBoss AS 5.0.0.GA,以及"
 
 #. Tag: para
-#: gettingstarted.xml:42
 #, no-c-format
 msgid "GlassFish 3.0,"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:45
 #, no-c-format
-msgid "Apache Tomcat 6.0.x (WAR example only), or"
+msgid "Apache Tomcat 6.0.x (war example only), or"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:48
 #, no-c-format
-msgid "Jetty 6.1.x (WAR example only)"
+msgid "Jetty 6.1.x (war example only)"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:53
 #, no-c-format
 msgid ""
 "(optionally) Maven 2.x, to run the examples in an embedded servlet container"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:58
 #, no-c-format
 msgid ""
 "You'll need a full install of Ant 1.7.0. Some linux distributions only "
@@ -119,27 +103,24 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:64
 #, no-c-format
 msgid ""
 "In the next few sections, you'll be using the Ant command (<literal>ant</"
 "literal>) to invoke the Ant build script in each example to compile, "
-"assemble and deploy the example to JBoss AS and, for the WAR example, Apache "
-"Tomcat. You can also deploy the generated artifact (WAR or EAR) to any other "
+"assemble and deploy the example to JBoss AS and, for the war example, Apache "
+"Tomcat. You can also deploy the generated artifact (war or ear) to any other "
 "container that supports Java EE 6, such as GlassFish 3."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:71
 #, no-c-format
 msgid ""
 "If you have Maven installed, you can use the Maven command (<literal>mvn</"
-"literal>) to compile and assemble the standalone artifact (WAR or EAR) and, "
-"for the WAR example, run it in an embedded container."
+"literal>) to compile and assemble the standalone artifact (war or ear) and, "
+"for the war example, run it in an embedded container."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:76
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
@@ -147,28 +128,25 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:81
 #, no-c-format
 msgid "Deploying to JBoss AS"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:83
 #, no-c-format
 msgid ""
 "To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss."
-"org/jbossas/\">JBoss AS 5.2.0.Beta1</ulink> or above. If a release of the "
-"JBoss AS 5.2 line isn't yet available, you can download a <ulink url="
-"\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-5.x-sun16/"
-"\">nightly snapshot</ulink>. The reason JBoss AS 5.2.0.Beta1 or above is "
-"required is because it's the first release that has both CDI and Bean "
-"Validation support built-in, making it close enough to Java EE 6 to run the "
-"examples. The good news is that there are no additional modifications you "
-"have to make to the server. It's ready to go!"
+"org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS "
+"6.0 line isn't yet available, you can download a <ulink url=\"http://hudson."
+"jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</"
+"ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the "
+"first release that has both CDI and Bean Validation support built-in, making "
+"it close enough to Java EE 6 to run the examples. The good news is that "
+"there are no additional modifications you have to make to the server. It's "
+"ready to go!"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:92
 #, no-c-format
 msgid ""
 "After you have downloaded JBoss AS, extract it. (We recommended renaming the "
@@ -178,16 +156,7 @@
 "installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[$> unzip jboss-5.2.*.zip\n"
-"$> mv jboss-5.2.*/ jboss-as-5.2]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:101
 #, no-c-format
 msgid ""
 "In order for the build scripts to know where to deploy the example, you have "
@@ -198,74 +167,36 @@
 "<literal>jboss.home</literal>, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:108
-#, fuzzy, no-c-format
-msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
-msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
-
 #. Tag: para
-#: gettingstarted.xml:110
 #, fuzzy, no-c-format
 msgid "You're now ready to deploy your first example!"
 msgstr "現在,您已準備好建置您的第一個範例!"
 
 #. Tag: para
-#: gettingstarted.xml:114
 #, no-c-format
 msgid ""
 "Switch to the <literal>examples/jsf/numberguess</literal> directory and "
 "execute the Ant <literal>deploy</literal> target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:119
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant deploy]]>"
-msgstr ""
-"$ cd examples/numberguess\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:121
 #, no-c-format
 msgid ""
 "If you haven't already, start JBoss AS. You can either start JBoss AS from a "
 "Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:125
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/jboss-as-5.2\n"
-"$> ./bin/run.sh]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:127 gettingstarted.xml:369
 #, no-c-format
 msgid "a Windows command window:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:131
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\jboss-as-5.2\\bin\n"
-"$> run]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:133 gettingstarted.xml:375
 #, no-c-format
 msgid "or you can start the server using an IDE, like Eclipse."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:138
 #, no-c-format
 msgid ""
 "If you are using Eclipse, you should seriously consider installing the "
@@ -275,7 +206,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:145
 #, fuzzy, no-c-format
 msgid ""
 "Wait a few seconds for the application to deploy (or the application server "
@@ -289,7 +219,6 @@
 "translator</ulink>)。"
 
 #. Tag: para
-#: gettingstarted.xml:152
 #, no-c-format
 msgid ""
 "The Ant build script includes additional targets for JBoss AS to deploy and "
@@ -298,7 +227,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:158
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant restart</literal> - deploy the example in exploded format to "
@@ -306,7 +234,6 @@
 msgstr "<literal>ant restart</literal> - 以分解的格式來建置範例"
 
 #. Tag: para
-#: gettingstarted.xml:163
 #, no-c-format
 msgid ""
 "<literal>ant explode</literal> - update an exploded example, without "
@@ -315,7 +242,6 @@
 "<literal>ant explode</literal> - 在不重新建置的情況下更新一個已分解的範例"
 
 #. Tag: para
-#: gettingstarted.xml:168
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant deploy</literal> - deploy the example in compressed jar format "
@@ -323,19 +249,16 @@
 msgstr "<literal>ant deploy</literal> - 以 jar 格式來建置範例"
 
 #. Tag: para
-#: gettingstarted.xml:173
 #, fuzzy, no-c-format
 msgid "<literal>ant undeploy</literal> - remove the example from JBoss AS"
 msgstr "<literal>ant undeploy</literal> - 將範例由伺服器中移除"
 
 #. Tag: para
-#: gettingstarted.xml:178
 #, no-c-format
 msgid "<literal>ant clean</literal> - clean the example"
 msgstr "<literal>ant clean</literal> - 清除範例"
 
 #. Tag: para
-#: gettingstarted.xml:185
 #, no-c-format
 msgid ""
 "The second starter example, <literal>weld-translator</literal>, will "
@@ -344,27 +267,15 @@
 "translator example directory and execute the deploy target:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/translator\n"
-"$> ant deploy]]>"
-msgstr ""
-"$ cd examples/translator\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:194
 #, no-c-format
 msgid ""
 "The translator uses session beans, which are packaged in an EJB module "
-"within an EAR. Java EE 6 will allow session beans to be deployed in WAR "
+"within an ear. Java EE 6 will allow session beans to be deployed in war "
 "modules, but that's a topic for a later chapter."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:200
 #, fuzzy, no-c-format
 msgid ""
 "Again, wait a few seconds for the application to deploy (if you're really "
@@ -376,55 +287,32 @@
 "localhost:8080/webbeans-translator\">http://localhost:8080/webbeans-"
 "translator</ulink>)。"
 
-#. Tag: para
-#: gettingstarted.xml:206
-#, no-c-format
-msgid ""
-"TODO Insert note about upgrading the Weld deployer that directs reader to "
-"section on the JBoss AS environment"
-msgstr ""
-
 #. Tag: title
-#: gettingstarted.xml:213
 #, no-c-format
 msgid "Deploying to GlassFish"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:215
 #, no-c-format
 msgid ""
-"Deploying to GlassFish should be easy, right? After all, it's the Java EE 6 "
-"reference implementation. Since it's the Java EE 6 reference implementation, "
-"that means it also bundles the JSR-299 reference implementation, Weld! So "
-"yes, it's very easy."
+"Deploying to GlassFish should be easy and familiar, right? After all, it's "
+"the Java EE 6 reference implementation and Weld is the JSR-299 reference "
+"implementation, meaning Weld gets bundled with GlassFish. So yes, it's all "
+"quite easy and familiar."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:221
 #, no-c-format
 msgid ""
 "To deploy the examples to GlassFish, you'll need the final <ulink url="
-"\"https://glassfish.dev.java.net/\">GlassFish V3</ulink> release (the "
-"preview release won't do). If the final release isn't yet available, you can "
-"download a <ulink url=\"http://download.java.net/glassfish/v3/promoted/"
-"\">promoted build</ulink> in the meantime. Select the b69 preview release or "
-"above that ends in either <literal>-unix.sh</literal> or <literal>-windows."
-"exe</literal> depending on your platform. After the download is complete, "
-"execute the installer. On Linux/Unix, you'll need to first make the script "
-"executable."
+"\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</"
+"ulink> release. Select the release that ends in either <literal>-unix.sh</"
+"literal> or <literal>-windows.exe</literal> depending on your platform. "
+"After the download is complete, execute the installer. On Linux/Unix, you'll "
+"need to first make the script executable."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:231
-#, no-c-format
-msgid ""
-"<![CDATA[$> chmod 755 glassfish-v3-b69-unix.sh\n"
-"$> ./glassfish-v3-b69-unix.sh]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:233
 #, no-c-format
 msgid ""
 "On Windows you can just click on the executable. Follow the instructions in "
@@ -435,7 +323,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:240
 #, no-c-format
 msgid ""
 "If you've deployed either of the starter examples, <literal>weld-"
@@ -444,16 +331,7 @@
 "either of the two directories and build it."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:246
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess (or examples/jsf/translator)\n"
-"$> ant package]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:248
 #, no-c-format
 msgid ""
 "The deployable archive for the <literal>weld-numberguess</literal>, named "
@@ -465,24 +343,17 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:255
 #, no-c-format
 msgid ""
-"You deploy applications to GlassFish using the <ulink url=\"http://"
-"localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin Console "
-"running, you need to start a GlassFish domain, in our case <literal>domain1</"
-"literal>. Switch to the <literal>bin</literal> folder in the directory where "
-"you installed GlassFish and execute the following command:"
+"One way to deploy applications to GlassFish is by using the <ulink url="
+"\"http://localhost:4848\">GlassFish Admin Console</ulink>. To get the Admin "
+"Console running, you need to start a GlassFish domain, in our case "
+"<literal>domain1</literal>. Switch to the <literal>bin</literal> folder in "
+"the directory where you installed GlassFish and execute the following "
+"command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:262
-#, no-c-format
-msgid "<![CDATA[$> asadmin start-domain domain1]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:264
 #, no-c-format
 msgid ""
 "After a few seconds you can visit the Admin Console in the browser at the "
@@ -499,22 +370,26 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:276
 #, no-c-format
 msgid ""
+"Alternatively, you can deploy the application to GlassFish using the asadmin "
+"command:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The reason the same artifact can be deployed to both JBoss AS and GlassFish, "
 "without any modifications, is because all of the features being used are "
 "part of the standard platform. And what a capable platform it has become!"
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:285
 #, no-c-format
 msgid "Deploying to Apache Tomcat"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:287
 #, no-c-format
 msgid ""
 "Servlet containers are not required to support Java EE services like CDI. "
@@ -523,7 +398,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:291
 #, no-c-format
 msgid ""
 "Weld comes with a servlet listener which bootstraps the CDI environment, "
@@ -534,7 +408,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:297
 #, fuzzy, no-c-format
 msgid ""
 "Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll "
@@ -544,16 +417,7 @@
 "接下來,請由 <ulink url=\"http://seamframework.org/Download\">seamframework."
 "org</ulink> 下載 Web Beans RI 並將它解壓縮。例如"
 
-#. Tag: programlisting
-#: gettingstarted.xml:302
-#, fuzzy, no-c-format
-msgid "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
-msgstr ""
-"<![CDATA[$ cd /Applications\n"
-"$ unzip ~/jboss-5.0.0.GA.zip]]>"
-
 #. Tag: para
-#: gettingstarted.xml:304
 #, no-c-format
 msgid ""
 "You have two choices for how you can deploy the application to Tomcat. You "
@@ -564,13 +428,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:312
 #, no-c-format
 msgid "Deploying with Ant"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:314
 #, no-c-format
 msgid ""
 "In order for Ant to push the artifact to the Tomcat hot deploy directory, it "
@@ -581,38 +443,19 @@
 "property key <literal>tomcat.home</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:321
-#, fuzzy, no-c-format
-msgid "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
-msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
-
 #. Tag: para
-#: gettingstarted.xml:323
 #, fuzzy, no-c-format
 msgid "Now you're ready to deploy the numberguess example to Tomcat!"
 msgstr "若要建置 numberguess 範例:"
 
 #. Tag: para
-#: gettingstarted.xml:327
 #, no-c-format
 msgid ""
 "Change to the <literal>examples/jsf/numberguess</literal> directory again "
 "and run the Ant <literal>deploy</literal> target for Tomcat:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:332
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> ant tomcat.deploy]]>"
-msgstr ""
-"$ cd examples/numberguess\n"
-"ant deploy"
-
 #. Tag: para
-#: gettingstarted.xml:335
 #, no-c-format
 msgid ""
 "The Ant build script includes additional targets for Tomcat to deploy and "
@@ -621,7 +464,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:341
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.restart</literal> - deploy the example in exploded "
@@ -629,7 +471,6 @@
 msgstr "<literal>ant restart</literal> - 以分解的格式來建置範例"
 
 #. Tag: para
-#: gettingstarted.xml:346
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.explode</literal> - update an exploded example, without "
@@ -638,7 +479,6 @@
 "<literal>ant explode</literal> - 在不重新建置的情況下更新一個已分解的範例"
 
 #. Tag: para
-#: gettingstarted.xml:351
 #, fuzzy, no-c-format
 msgid ""
 "<literal>ant tomcat.deploy</literal> - deploy the example in compressed jar "
@@ -646,39 +486,18 @@
 msgstr "<literal>ant deploy</literal> - 以 jar 格式來建置範例"
 
 #. Tag: para
-#: gettingstarted.xml:356
 #, fuzzy, no-c-format
 msgid "<literal>ant tomcat.undeploy</literal> - remove the example from Tomcat"
 msgstr "<literal>ant undeploy</literal> - 將範例由伺服器中移除"
 
 #. Tag: para
-#: gettingstarted.xml:363
 #, no-c-format
 msgid ""
 "If you haven't already, start Tomcat. You can either start Tomcat from a "
 "Linux shell:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:367
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd /path/to/apache-tomcat-6\n"
-"$> ./bin/start.sh]]>"
-msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
-
-#. Tag: programlisting
-#: gettingstarted.xml:373
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
-"$> start]]>"
-msgstr ""
-"<![CDATA[$ cd /Applications\n"
-"$ unzip ~/jboss-5.0.0.GA.zip]]>"
-
 #. Tag: para
-#: gettingstarted.xml:379
 #, no-c-format
 msgid ""
 "Wait a few seconds for the application to deploy (or the application server "
@@ -689,13 +508,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:388
 #, no-c-format
 msgid "Deploying with Maven"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:390
 #, no-c-format
 msgid ""
 "You can also deploy the application to Tomcat using Maven. This section is a "
@@ -705,7 +522,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:396
 #, no-c-format
 msgid ""
 "The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
@@ -717,7 +533,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:403
 #, no-c-format
 msgid ""
 "To allow Maven to communicate with Tomcat over HTTP, edit the <literal>conf/"
@@ -725,41 +540,20 @@
 "following line:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:408
-#, no-c-format
-msgid "<![CDATA[<user username=\"admin\" password=\"\" roles=\"manager\"/>]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:410
 #, no-c-format
 msgid ""
 "Restart Tomcat. You can now deploy the application to Tomcat with Maven "
 "using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:414
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:exploded tomcat:exploded -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:416
 #, no-c-format
 msgid ""
 "Once the application is deployed, you can redeploy it using this command:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:420
-#, no-c-format
-msgid "<![CDATA[$> mvn tomcat:redeploy -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:422
 #, no-c-format
 msgid ""
 "The <literal>-Ptomcat</literal> argument activates the <literal>tomcat</"
@@ -768,21 +562,13 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:427
 #, no-c-format
 msgid ""
 "Rather than shipping the container off to a standalone Tomcat installation, "
 "you can also execute the application in an embedded Tomcat 6 container:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:432
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace tomcat:run -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:434
 #, no-c-format
 msgid ""
 "The advantage of using the embedded server is that changes to assets in "
@@ -792,14 +578,7 @@
 "classpath resource, you need to execute a build:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:441
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Ptomcat]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:443
 #, no-c-format
 msgid ""
 "There are several other Maven goals that you can use if you are hacking on "
@@ -808,13 +587,11 @@
 msgstr ""
 
 #. Tag: title
-#: gettingstarted.xml:453
 #, no-c-format
 msgid "Deploying to Jetty"
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:457
 #, no-c-format
 msgid ""
 "Support for Jetty in the examples is a more recent addition. Since Jetty is "
@@ -825,7 +602,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:464
 #, no-c-format
 msgid ""
 "If you've read through the entire Tomcat section, then you're all ready to "
@@ -835,7 +611,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:470
 #, no-c-format
 msgid ""
 "The Maven POM (<literal>pom.xml</literal>) includes a profile named "
@@ -847,25 +622,15 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:479
 #, no-c-format
 msgid ""
 "To run the <literal>weld-numberguess</literal> example on Jetty, switch to "
 "the example directory and execute the <literal>inplace</literal> goal of the "
-"Maven WAR plugin followed by the <literal>run</literal> goal of the Maven "
+"Maven war plugin followed by the <literal>run</literal> goal of the Maven "
 "Jetty plugin with the <literal>jetty</literal> profile enabled, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:485
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/jsf/numberguess\n"
-"$> mvn war:inplace jetty:run -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:487
 #, no-c-format
 msgid ""
 "The log output of Jetty will be shown in the console. Once Jetty reports "
@@ -876,7 +641,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:494
 #, no-c-format
 msgid ""
 "Any changes to assets in <literal>src/main/webapp</literal> take effect "
@@ -884,30 +648,22 @@
 "application may automatically redeploy. The redeploy behavior can be fined-"
 "tuned in the plugin configuration. If you make a change to a classpath "
 "resource, you need to execute a build and the <literal>inplace</literal> "
-"goal of the Maven WAR plugin, again with the <literal>jetty</literal> "
+"goal of the Maven war plugin, again with the <literal>jetty</literal> "
 "profile enabled."
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:501
-#, no-c-format
-msgid "<![CDATA[$> mvn compile war:inplace -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:503
 #, no-c-format
 msgid ""
-"The <literal>war:inplace</literal> goal copies the compiled classes and JARs "
+"The <literal>war:inplace</literal> goal copies the compiled classes and jars "
 "inside <literal>src/main/webapp</literal>, under <literal>WEB-INF/classes</"
 "literal> and <literal>WEB-INF/lib</literal>, respectively, mixing source and "
 "compiled files. However, the build does work around these temporary files by "
-"excluding them from the packaged WAR and cleaning them during the Maven "
+"excluding them from the packaged war and cleaning them during the Maven "
 "clean phase."
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:510
 #, no-c-format
 msgid ""
 "You have two options if you want to run the example on Jetty from the IDE. "
@@ -917,33 +673,18 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:516
 #, no-c-format
 msgid "First, initialize the Eclipse project:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:520
-#, no-c-format
-msgid "<![CDATA[$> mvn clean eclipse:clean eclipse:eclipse -Pjetty-ide]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:522
 #, no-c-format
 msgid ""
 "Next, assemble all the necessary resources under <literal>src/main/webapp</"
 "literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: gettingstarted.xml:526
-#, no-c-format
-msgid "<![CDATA[$> mvn war:inplace -Pjetty-ide]]>"
-msgstr ""
-
 #. Tag: para
-#: gettingstarted.xml:528
 #, no-c-format
 msgid ""
 "Now, you are ready to run the server in Eclipse. Import the project into "
@@ -956,7 +697,6 @@
 msgstr ""
 
 #. Tag: para
-#: gettingstarted.xml:536
 #, no-c-format
 msgid ""
 "Now that you have gotten the starter applications deployed on the server of "
@@ -965,7 +705,59 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.2]]>"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
+
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> ant deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/numberguess\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/translator\n"
+#~ "$> ant deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/translator\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid "<![CDATA[$> unzip apache-tomcat-6.0.18.zip]]>"
+#~ msgstr ""
+#~ "<![CDATA[$ cd /Applications\n"
+#~ "$ unzip ~/jboss-5.0.0.GA.zip]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[tomcat.home=/path/to/apache-tomcat-6]]>"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd examples/jsf/numberguess\n"
+#~ "$> ant tomcat.deploy]]>"
+#~ msgstr ""
+#~ "$ cd examples/numberguess\n"
+#~ "ant deploy"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd /path/to/apache-tomcat-6\n"
+#~ "$> ./bin/start.sh]]>"
+#~ msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[$> cd c:\\path\\to\\apache-tomcat-6\\bin\n"
+#~ "$> start]]>"
+#~ msgstr ""
+#~ "<![CDATA[$ cd /Applications\n"
+#~ "$ unzip ~/jboss-5.0.0.GA.zip]]>"
+
+#, fuzzy
+#~ msgid ""
 #~ "Getting started with Web Beans, the Reference Implementation of JSR-299"
 #~ msgstr "Web Bean 參照實做"
 
@@ -996,10 +788,6 @@
 #~ "<literal>webbeans-translator</literal>,這是個 ear 範例,並包含著企業級的 "
 #~ "bean。若要執行這些範例,您將需要滿足下列需求:"
 
-#, fuzzy
-#~ msgid "JBoss AS 5.0.1.GA, or"
-#~ msgstr "JBoss AS 5.0.0.GA,以及"
-
 #~ msgid "Ant 1.7.0."
 #~ msgstr "Ant 1.7.0。"
 

Modified: doc/trunk/reference/zh-TW/injection.po
===================================================================
--- doc/trunk/reference/zh-TW/injection.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/injection.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: injection\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-19 16:05+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,28 +17,24 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: injection.xml:4
 #, fuzzy, no-c-format
 msgid "Dependency injection and programmatic lookup"
 msgstr "依賴注入(Dependency injection)"
 
 #. Tag: para
-#: injection.xml:6
 #, no-c-format
 msgid ""
-"One of the most significant features of CDI&#8212;certainly the most "
-"recognized&#8212;is dependency injection; excuse me, <emphasis>typesafe</"
-"emphasis> dependency injection."
+"One of the most significant features of CDI—certainly the most recognized—is "
+"dependency injection; excuse me, <emphasis>typesafe</emphasis> dependency "
+"injection."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:12
 #, no-c-format
 msgid "Injection points"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:14
 #, no-c-format
 msgid ""
 "The <literal>@Inject</literal> annotation lets us define an injection point "
@@ -47,77 +43,21 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:19
 #, fuzzy, no-c-format
 msgid "<emphasis>Bean constructor</emphasis> parameter injection:"
 msgstr "<emphasis>Initializer</emphasis> method parameter injection:"
 
-#. Tag: programlisting
-#: injection.xml:23
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private final ShoppingCart cart;\n"
-"    \n"
-"   @Inject\n"
-"   public Checkout(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"    private final ShoppingCart cart;\n"
-"    \n"
-"    @Initializer\n"
-"    public Checkout(ShoppingCart cart) {\n"
-"        this.cart = cart;\n"
-"    }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:26
 #, no-c-format
 msgid "A bean can only have one injectable constructor."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:31
 #, fuzzy, no-c-format
 msgid "<emphasis>Initializer method</emphasis> parameter injection:"
 msgstr "<emphasis>Initializer</emphasis> method parameter injection:"
 
-#. Tag: programlisting
-#: injection.xml:35
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"   private ShoppingCart cart;\n"
-"\n"
-"   @Inject\n"
-"   void setShoppingCart(ShoppingCart cart) {\n"
-"      this.cart = cart;\n"
-"   }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"        \n"
-"    private ShoppingCart cart;\n"
-"\n"
-"    @Initializer \n"
-"    void setShoppingCart(ShoppingCart cart) {\n"
-"        this.cart = cart;\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:38
 #, no-c-format
 msgid ""
 "A bean can have multiple initializer methods. If the bean is a session bean, "
@@ -126,29 +66,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:44
 #, no-c-format
 msgid "And direct field injection:"
 msgstr "以及 direct field injection:"
 
-#. Tag: programlisting
-#: injection.xml:48
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"   private @Inject ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class Checkout {\n"
-"\n"
-"    private @Current ShoppingCart cart;\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:51
 #, no-c-format
 msgid ""
 "Getter and setter methods are not required for field injection to work "
@@ -156,7 +78,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:56
 #, fuzzy, no-c-format
 msgid ""
 "Dependency injection always occurs when the bean instance is first "
@@ -165,7 +86,6 @@
 msgstr "每當 Web Bean 的 instance 第一次被例示時,依賴注入就會發生。"
 
 #. Tag: para
-#: injection.xml:63
 #, fuzzy, no-c-format
 msgid ""
 "First, the container calls the bean constructor (the default constructor or "
@@ -176,7 +96,6 @@
 "instance。"
 
 #. Tag: para
-#: injection.xml:69
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container initializes the values of all injected fields of the "
@@ -184,7 +103,6 @@
 msgstr "接下來,Web Bean 管理員便會初始化 Web Bean 所有已注入欄位的值。"
 
 #. Tag: para
-#: injection.xml:74
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container calls all initializer methods of bean (the call order is "
@@ -192,7 +110,6 @@
 msgstr "然後,Web Bean 管理員將會調用 Web Bean 的所有 initializer method。"
 
 #. Tag: para
-#: injection.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "Finally, the <literal>@PostConstruct</literal> method, if any, is called."
@@ -201,7 +118,6 @@
 "被調用。"
 
 #. Tag: para
-#: injection.xml:86
 #, no-c-format
 msgid ""
 "(The only complication is that the container might call initializer methods "
@@ -210,7 +126,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:90
 #, no-c-format
 msgid ""
 "One major advantage of constructor injection is that it allows the bean to "
@@ -218,7 +133,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:95
 #, no-c-format
 msgid ""
 "CDI also supports parameter injection for some other methods that are "
@@ -226,36 +140,21 @@
 "producer methods:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:100
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
-"    return new Checkout(cart);\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:102
 #, no-c-format
 msgid ""
 "This is a case where the <literal>@Inject</literal> annotation <emphasis>is "
 "not</emphasis> required at the injection point. The same is true for "
-"observer methods (which we'll meet in <xref linkend=\"events\"/>) and "
+"observer methods (which we'll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:110
 #, no-c-format
 msgid "What gets injected"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:112
 #, fuzzy, no-c-format
 msgid ""
 "The CDI specification defines a procedure, called <emphasis>typesafe "
@@ -275,7 +174,6 @@
 "<literal>AmbiguousDependencyException</literal> 來通知用戶。"
 
 #. Tag: para
-#: injection.xml:120
 #, fuzzy, no-c-format
 msgid ""
 "The purpose of this algorithm is to allow multiple beans to implement the "
@@ -283,7 +181,6 @@
 msgstr "這個演算法就是為了要讓多重 Web Bean 實做相同的 API 類型以及:"
 
 #. Tag: para
-#: injection.xml:126
 #, fuzzy, no-c-format
 msgid ""
 "allow the client to select which implementation it requires using a "
@@ -292,7 +189,6 @@
 "讓客戶端藉由使用 <emphasis>binding annotations</emphasis> 來選擇需要的實做、"
 
 #. Tag: para
-#: injection.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "allow the application deployer to select which implementation is appropriate "
@@ -303,13 +199,11 @@
 "types</emphasis> 來選擇用於特定建置的適當實做,或是"
 
 #. Tag: para
-#: injection.xml:137
 #, no-c-format
 msgid "allow the beans to be isolated into separate modules."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:143
 #, no-c-format
 msgid ""
 "Obviously, if you have exactly one bean of a given type, and an injection "
@@ -319,7 +213,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:149
 #, no-c-format
 msgid ""
 "But then, things start to get complicated. Let's explore how the container "
@@ -328,13 +221,11 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:157
 #, fuzzy, no-c-format
 msgid "Qualifier annotations"
 msgstr "綁定標記"
 
 #. Tag: para
-#: injection.xml:159
 #, fuzzy, no-c-format
 msgid ""
 "If we have more than one bean that implements a particular bean type, the "
@@ -346,36 +237,7 @@
 "切地指定哪個 Web Bean 應該被注入。比方說,<literal>PaymentProcessor</"
 "literal> 的實做可能有兩個:"
 
-#. Tag: programlisting
-#: injection.xml:165
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Synchronous\n"
-"public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: injection.xml:167
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Asynchronous\n"
-"public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:169
 #, fuzzy, no-c-format
 msgid ""
 "Where <literal>@Synchronous</literal> and <literal>@Asynchronous</literal> "
@@ -384,36 +246,7 @@
 "<literal>@PayByCheque</literal> 和 <literal>@PayByCreditCard</literal> 為綁定"
 "標記:"
 
-#. Tag: programlisting
-#: injection.xml:173
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Synchronous {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayByCheque {}]]>"
-
-#. Tag: programlisting
-#: injection.xml:175
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface Asynchronous {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayByCheque {}]]>"
-
 #. Tag: para
-#: injection.xml:177
 #, fuzzy, no-c-format
 msgid ""
 "A client bean developer uses the qualifier annotation to specify exactly "
@@ -422,76 +255,21 @@
 "客戶端 Web Bean 開發人員會使用綁定標記來確切指定哪個 Web Bean 應被注入。"
 
 #. Tag: para
-#: injection.xml:181
 #, no-c-format
 msgid "Using field injection:"
 msgstr "使用 field injection:"
 
-#. Tag: programlisting
-#: injection.xml:183
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
-"@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@PayByCheque PaymentProcessor chequePaymentProcessor;\n"
-"@PayByCreditCard PaymentProcessor creditCardPaymentProcessor;]]>"
-
 #. Tag: para
-#: injection.xml:185
 #, no-c-format
 msgid "Using initializer method injection:"
 msgstr "使用 initializer method injection:"
 
-#. Tag: programlisting
-#: injection.xml:187
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public void setPaymentProcessors(@Synchronous PaymentProcessor "
-"syncPaymentProcessor, \n"
-"                                 @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public void setPaymentProcessors(@PayByCheque PaymentProcessor "
-"chequePaymentProcessor, \n"
-"                                 @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:189
 #, fuzzy, no-c-format
 msgid "Using constructor injection:"
 msgstr "或使用 constructor injection:"
 
-#. Tag: programlisting
-#: injection.xml:191
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject\n"
-"public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
-"                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
-"   this.syncPaymentProcessor = syncPaymentProcessor;\n"
-"   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public Checkout(@PayByCheque PaymentProcessor chequePaymentProcessor, \n"
-"                @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:193
 #, no-c-format
 msgid ""
 "Qualifier annotations can also qualify method arguments of producer, "
@@ -500,29 +278,7 @@
 "runtime based on the state of the system:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:199
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces\n"
-"PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
-"syncPaymentProcessor,\n"
-"                                     @Asynchronous PaymentProcessor "
-"asyncPaymentProcessor) {\n"
-"   return isSynchronous() ? syncPaymentProcessor : asyncPaymentProcessor;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public void setPaymentProcessors(@PayByCheque PaymentProcessor "
-"chequePaymentProcessor, \n"
-"                                 @PayByCreditCard PaymentProcessor "
-"creditCardPaymentProcessor) {\n"
-"   this.chequePaymentProcessor = chequePaymentProcessor;\n"
-"   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:201
 #, no-c-format
 msgid ""
 "If an injected field or a parameter of a bean constructor or initializer "
@@ -531,7 +287,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:206
 #, no-c-format
 msgid ""
 "Now, you may be thinking, <emphasis>\"What's the different between using a "
@@ -543,7 +298,6 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:216
 #, fuzzy, no-c-format
 msgid ""
 "The built-in qualifiers <literal>@Default</literal> and <literal>@Any</"
@@ -553,7 +307,6 @@
 "<literal>@PreDestroy</literal> callback。"
 
 #. Tag: para
-#: injection.xml:218
 #, no-c-format
 msgid ""
 "Whenever a bean or injection point does not explicitly declare a qualifier, "
@@ -566,33 +319,18 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:225
 #, no-c-format
 msgid ""
 "This is especially useful if you want to iterate over all beans with a "
 "certain bean type. For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:226
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject \n"
-"void initServices(@Any Instance<Service> services) { \n"
-"   for (Service service: services) {\n"
-"      service.init();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:232
 #, no-c-format
 msgid "Qualifiers with members"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:234
 #, no-c-format
 msgid ""
 "Java annotations can have members. We can use annotation members to further "
@@ -602,41 +340,13 @@
 "single annotation with a member:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:240
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"@BindingType\n"
-"public @interface PayBy {\n"
-"    PaymentType value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:242
 #, no-c-format
 msgid ""
 "Then we select one of the possible member values when appling the qualifier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:246
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:248
 #, fuzzy, no-c-format
 msgid ""
 "We can force the container to ignore a member of a qualifier type by "
@@ -645,48 +355,17 @@
 "您可藉由標記 <literal>@NonBinding</literal> 這個 member 來讓 Web Bean 管理員"
 "忽略某個綁定標記類型的成員。"
 
-#. Tag: programlisting
-#: injection.xml:253
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Qualifier\n"
-"@Retention(RUNTIME)\n"
-"@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
-"public @interface PayBy {\n"
-"   PaymentMethod value();\n"
-"   @Nonbinding String comment() default \"\";\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @NonBinding public String value();\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:258
 #, no-c-format
 msgid "Multiple qualifiers"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:260
 #, fuzzy, no-c-format
 msgid "An injection point may specify multiple qualifiers:"
 msgstr "一個注入點甚至有可能會指定多重綁定標記:"
 
-#. Tag: programlisting
-#: injection.xml:264
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
-"syncPaymentProcessor;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:266
 #, fuzzy, no-c-format
 msgid ""
 "Then only a bean which has <emphasis>both</emphasis> qualifier annotations "
@@ -695,29 +374,12 @@
 "在這種情況下,只有擁有這<emphasis>兩個</emphasis>綁定標記的 Web Bean 可被注"
 "入。"
 
-#. Tag: programlisting
-#: injection.xml:271
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Synchronous @Reliable\n"
-"public class SynchronousReliablePaymentProcessor implements PaymentProcessor "
-"{\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: injection.xml:276
 #, no-c-format
 msgid "Alternatives"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:278
 #, no-c-format
 msgid ""
 "Alternatives are beans whose implementation is specific to a particular "
@@ -726,22 +388,7 @@
 "<literal>@Asynchronous PaymentProcessor</literal>, all in one:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:282
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Synchronous @Asynchronous\n"
-"public class MockPaymentProcessor implements PaymentProcessor {\n"
-"   public void process(Payment payment) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@PayByCheque\n"
-"public class ChequePaymentProcessor implements PaymentProcessor {\n"
-"    public void process(Payment payment) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:284
 #, no-c-format
 msgid ""
 "By default, <literal>@Alternative</literal> beans are disabled. We need to "
@@ -750,24 +397,7 @@
 "and injection. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:290
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <class>org.mycompany.mock.MockPaymentProcessor</class>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: injection.xml:292
 #, no-c-format
 msgid ""
 "When an ambiguous dependency exists at an injection point, the container "
@@ -777,13 +407,11 @@
 msgstr ""
 
 #. Tag: title
-#: injection.xml:301
 #, fuzzy, no-c-format
 msgid "Fixing unsatisfied and ambiguous dependencies"
 msgstr "修正相依性不足(unsatisfied dependencies)的問題"
 
 #. Tag: para
-#: injection.xml:303
 #, fuzzy, no-c-format
 msgid ""
 "The typesafe resolution algorithm fails when, after considering the "
@@ -798,7 +426,6 @@
 "解析演算法便會失敗。"
 
 #. Tag: para
-#: injection.xml:310
 #, no-c-format
 msgid ""
 "During the course of your development, you're going to encounter this "
@@ -806,13 +433,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:314
 #, no-c-format
 msgid "To fix an <emphasis>unsatisfied dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:320
 #, no-c-format
 msgid ""
 "create a bean which implements the bean type and has all the qualifier types "
@@ -820,7 +445,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:325
 #, no-c-format
 msgid ""
 "make sure that the bean you already have is in the classpath of the module "
@@ -828,7 +452,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:330
 #, no-c-format
 msgid ""
 "explicitly enable an <literal>@Alternative</literal> bean that implements "
@@ -837,13 +460,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:337
 #, no-c-format
 msgid "To fix an <emphasis>ambiguous dependency</emphasis>, either:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:343
 #, no-c-format
 msgid ""
 "introduce a qualifier to distinguish between the two implementations of the "
@@ -851,14 +472,12 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:348
 #, no-c-format
 msgid ""
 "disable one of the beans by annotating it <literal>@Alternative</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:353
 #, no-c-format
 msgid ""
 "move one of the implementations to a module that is not in the classpath of "
@@ -866,7 +485,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:359
 #, no-c-format
 msgid ""
 "disable one of two <literal>@Alternative</literal> beans that are trying to "
@@ -874,7 +492,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:366
 #, no-c-format
 msgid ""
 "See <ulink url=\"http://sfwk.org/Documentation/"
@@ -885,22 +502,19 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:374
 #, no-c-format
 msgid "Just remember: \"There can be only one.\""
 msgstr ""
 
 #. Tag: para
-#: injection.xml:377
 #, no-c-format
 msgid ""
 "On the other hand, if you really do have an optional or multivalued "
 "injection point, you should change the type of your injection point to "
-"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\"/>."
+"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:382
 #, fuzzy, no-c-format
 msgid ""
 "Now there's one more issue you need to be aware of when using the dependency "
@@ -908,13 +522,11 @@
 msgstr "當您在 Web Bean 中使用依賴注入時,您還需要注意一個問題。"
 
 #. Tag: title
-#: injection.xml:389
 #, no-c-format
 msgid "Client proxies"
 msgstr "客戶端代理伺服器(Client proxies)"
 
 #. Tag: para
-#: injection.xml:391
 #, fuzzy, no-c-format
 msgid ""
 "Clients of an injected bean do not usually hold a direct reference to a bean "
@@ -924,20 +536,18 @@
 "一個已注入的 Web Bean 的客戶端通常不會持有一個 Web Bean instance 的直接參照。"
 
 #. Tag: para
-#: injection.xml:396
 #, fuzzy, no-c-format
 msgid ""
 "Imagine that a bean bound to the application scope held a direct reference "
 "to a bean bound to the request scope. The application-scoped bean is shared "
 "between many different requests. However, each request should see a "
-"different instance of the request scoped bean&#8212;the current one!"
+"different instance of the request scoped bean—the current one!"
 msgstr ""
 "想像一個綁定至應用程式 scope 的 Web Bean 持有一個綁定至請求 scope 的 Web "
 "Bean 的直接參照。這個應用程式 scope 的 Web Bean 會在許多不同的請求之間被共"
 "享。不過,各個請求都應要看見一個不同的請求 scope Web Bean 的 instance!"
 
 #. Tag: para
-#: injection.xml:402
 #, fuzzy, no-c-format
 msgid ""
 "Now imagine that a bean bound to the session scope holds a direct reference "
@@ -953,7 +563,6 @@
 "scope 的 Web Bean 一起被序列化!"
 
 #. Tag: para
-#: injection.xml:409
 #, fuzzy, no-c-format
 msgid ""
 "Therefore, unless a bean has the default scope <literal>@Dependent</"
@@ -973,7 +582,6 @@
 "context)的 Web Bean 被序列化至磁碟。"
 
 #. Tag: para
-#: injection.xml:417
 #, fuzzy, no-c-format
 msgid ""
 "Unfortunately, due to limitations of the Java language, some Java types "
@@ -987,20 +595,17 @@
 "傳一個 <literal>UnproxyableDependencyException</literal>。"
 
 #. Tag: para
-#: injection.xml:423
 #, fuzzy, no-c-format
 msgid "The following Java types cannot be proxied by the container:"
 msgstr "下列 Java 類型無法被 Web Bean 管理員代理:"
 
 #. Tag: para
-#: injection.xml:427
 #, fuzzy, no-c-format
 msgid ""
 "classes which don't have a non-private constructor with no parameters, and"
 msgstr "沒有非私密 constructor 的無參數 class,以及"
 
 #. Tag: para
-#: injection.xml:430
 #, no-c-format
 msgid ""
 "classes which are declared <literal>final</literal> or have a "
@@ -1010,13 +615,11 @@
 "method 的 class、"
 
 #. Tag: para
-#: injection.xml:435
 #, no-c-format
 msgid "arrays and primitive types."
 msgstr "陣列(array)與基本型別(primitive type)。"
 
 #. Tag: para
-#: injection.xml:439
 #, no-c-format
 msgid ""
 "It's usually very easy to fix an unproxyable dependency problem. If an "
@@ -1025,13 +628,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:446
 #, no-c-format
 msgid "add a constructor with no parameters to <literal>X</literal>,"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:451
 #, no-c-format
 msgid ""
 "change the type of the injection point to <literal>Instance&lt;X&gt;</"
@@ -1039,7 +640,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:456
 #, no-c-format
 msgid ""
 "introduce an interface <literal>Y</literal>, implemented by the injected "
@@ -1047,7 +647,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:462
 #, no-c-format
 msgid ""
 "if all else fails, change the scope of the injected bean to "
@@ -1055,7 +654,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:469
 #, no-c-format
 msgid ""
 "A future release of Weld will likely support a non-standard workaround for "
@@ -1063,7 +661,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:476
 #, no-c-format
 msgid ""
 "Sun, IcedTea, Mac: <literal>Unsafe.allocateInstance()</literal> (The most "
@@ -1071,7 +668,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:481
 #, no-c-format
 msgid ""
 "IBM, JRockit: <literal>ReflectionFactory.newConstructorForSerialization()</"
@@ -1079,19 +675,16 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:487
 #, no-c-format
 msgid "But we didn't get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
-#: injection.xml:496
 #, fuzzy, no-c-format
 msgid "Obtaining a contextual instance by programmatic lookup"
 msgstr "透過程式性的搜尋來取得一個 Web Bean"
 
 #. Tag: para
-#: injection.xml:498
 #, no-c-format
 msgid ""
 "In certain situations, injection is not the most convenient way to obtain a "
@@ -1099,13 +692,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:505
 #, no-c-format
 msgid "the bean type or qualifiers vary dynamically at runtime, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:510
 #, no-c-format
 msgid ""
 "depending upon the deployment, there may be no bean which satisfies the type "
@@ -1113,13 +704,11 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:515
 #, no-c-format
 msgid "we would like to iterate over all beans of a certain type."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:521
 #, fuzzy, no-c-format
 msgid ""
 "In these situations, the application may obtain an instance of the interface "
@@ -1127,14 +716,7 @@
 msgstr ""
 "應用程式可透過注入來取得 <literal>Manager</literal> 這個介面的一個 instance:"
 
-#. Tag: programlisting
-#: injection.xml:526
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:528
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>get()</literal> method of <literal>Instance</literal> produces "
@@ -1143,26 +725,17 @@
 "用來測試的 <literal>@Mock</literal> 和 <literal>@Staging</literal> "
 "deployment type"
 
-#. Tag: programlisting
-#: injection.xml:532
-#, fuzzy, no-c-format
-msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:534
 #, no-c-format
 msgid "Qualifiers can be specified in one of two ways:"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:540
 #, no-c-format
 msgid "by annotating the <literal>Instance</literal> injection point, or"
 msgstr ""
 
 #. Tag: para
-#: injection.xml:543
 #, fuzzy, no-c-format
 msgid ""
 "by passing qualifiers to the <literal>select()</literal> of <literal>Event</"
@@ -1172,22 +745,11 @@
 "<literal>@PreDestroy</literal> callback。"
 
 #. Tag: para
-#: injection.xml:547
 #, no-c-format
 msgid "Specifying the qualifiers at the injection point is much, much easier:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:551
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
-"paymentProcessorSource;]]>"
-msgstr ""
-"<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:553
 #, no-c-format
 msgid ""
 "Now, the <literal>PaymentProcessor</literal> returned by <literal>get()</"
@@ -1195,7 +757,6 @@
 msgstr ""
 
 #. Tag: para
-#: injection.xml:558
 #, no-c-format
 msgid ""
 "Alternatively, we can specify the qualifier dynamically. First, we add the "
@@ -1203,15 +764,7 @@
 "default qualifier. (All beans have the qualifier <literal>@Any</literal>.)"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:563
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]>"
-msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
-
 #. Tag: para
-#: injection.xml:565
 #, no-c-format
 msgid ""
 "Next, we need to obtain an instance of our qualifier type. Since annotatons "
@@ -1221,68 +774,30 @@
 "subclassing the helper class <literal>AnnotationLiteral</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:572
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[abstract class AsynchronousQualifier\n"
-"extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
-msgstr ""
-"<![CDATA[abstract class CreditCardBinding \n"
-"    extends AnnotationLiteral<CreditCard> \n"
-"    implements CreditCard {}]]>"
-
 #. Tag: para
-#: injection.xml:574
 #, no-c-format
 msgid "In some cases, we can use an anonymous class:"
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:578
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
-"   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
-msgstr ""
-"<![CDATA[PaymentProcessor p = manager.getInstanceByType(PaymentProcessor."
-"class, \n"
-"                                               new "
-"AnnotationLiteral<CreditCard>(){});]]>"
-
 #. Tag: para
-#: injection.xml:581
 #, no-c-format
 msgid ""
 "We can't use an anonymous class to implement a qualifier type with members."
 msgstr ""
 
 #. Tag: para
-#: injection.xml:586
 #, no-c-format
 msgid ""
 "Now, finally, we can pass the qualifier to the <literal>select()</literal> "
 "method of <literal>Instance</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: injection.xml:590
-#, no-c-format
-msgid ""
-"<![CDATA[Annotation qualifier = synchronously ?\n"
-"      new SynchronousQualifier() : new AsynchronousQualifier();\n"
-"PaymentProcessor p = anyPaymentProcessor.select(qualifier).get().process"
-"(payment);]]>"
-msgstr ""
-
 #. Tag: title
-#: injection.xml:595
 #, no-c-format
 msgid "The <literal>InjectionPoint</literal> object"
 msgstr "<literal>InjectionPoint</literal> 物件"
 
 #. Tag: para
-#: injection.xml:597
 #, fuzzy, no-c-format
 msgid ""
 "There are certain kinds of dependent objects (beans with scope "
@@ -1295,7 +810,6 @@
 "本應進行的工作。比方說:"
 
 #. Tag: para
-#: injection.xml:603
 #, no-c-format
 msgid ""
 "The log category for a <literal>Logger</literal> depends upon the class of "
@@ -1303,7 +817,6 @@
 msgstr "<literal>Logger</literal> 的 log category 取決於擁有它的物件的 class。"
 
 #. Tag: para
-#: injection.xml:607
 #, no-c-format
 msgid ""
 "Injection of a HTTP parameter or header value depends upon what parameter or "
@@ -1312,7 +825,6 @@
 "HTTP 參數或是 header value 的注入取決於在注入點所指定的參數或標頭名稱。"
 
 #. Tag: para
-#: injection.xml:611
 #, no-c-format
 msgid ""
 "Injection of the result of an EL expression evaluation depends upon the "
@@ -1322,7 +834,6 @@
 "式。"
 
 #. Tag: para
-#: injection.xml:616
 #, fuzzy, no-c-format
 msgid ""
 "A bean with scope <literal>@Dependent</literal> may inject an instance of "
@@ -1334,7 +845,6 @@
 "metadata。"
 
 #. Tag: para
-#: injection.xml:620
 #, no-c-format
 msgid ""
 "Let's look at an example. The following code is verbose, and vulnerable to "
@@ -1343,14 +853,7 @@
 "讓我們來探討下列範例。下列程式碼較為冗長,並且有重構(refactoring)問題上的弱"
 "點:"
 
-#. Tag: programlisting
-#: injection.xml:623
-#, no-c-format
-msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-msgstr "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
-
 #. Tag: para
-#: injection.xml:625
 #, no-c-format
 msgid ""
 "This clever little producer method lets you inject a JDK <literal>Logger</"
@@ -1359,42 +862,12 @@
 "這個 producer method 能讓您在不明確指定 log category 的情況下注入一個 JDK "
 "<literal>Logger</literal>:"
 
-#. Tag: programlisting
-#: injection.xml:628
-#, no-c-format
-msgid ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[class LogFactory {\n"
-"\n"
-"   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
-"      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()."
-"getName()); \n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:630
 #, no-c-format
 msgid "We can now write:"
 msgstr "現在我們可寫入:"
 
-#. Tag: programlisting
-#: injection.xml:632
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject Logger log;]]>"
-msgstr "<![CDATA[@Current Logger log;]]>"
-
 #. Tag: para
-#: injection.xml:634
 #, fuzzy, no-c-format
 msgid ""
 "Not convinced? Then here's a second example. To inject HTTP parameters, we "
@@ -1403,72 +876,17 @@
 "若您無法被說服的話,我們還有第二個範例。若要注入 HTTP 參數,我們需要定義一個"
 "綁定類型:"
 
-#. Tag: programlisting
-#: injection.xml:637
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @Nonbinding public String value();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@BindingType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
-"public @interface HttpParam {\n"
-"   @NonBinding public String value();\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:639
 #, fuzzy, no-c-format
 msgid "We would use this qualifier type at injection points as follows:"
 msgstr "我們可如下在注入點使用此綁定類型:"
 
-#. Tag: programlisting
-#: injection.xml:641
-#, no-c-format
-msgid ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-msgstr ""
-"<![CDATA[@HttpParam(\"username\") String username;\n"
-"@HttpParam(\"password\") String password;]]>"
-
 #. Tag: para
-#: injection.xml:643
 #, no-c-format
 msgid "The following producer method does the work:"
 msgstr "下列 producer method 可完成此工作:"
 
-#. Tag: programlisting
-#: injection.xml:645
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotated().getAnnotation(HttpParam."
-"class).value());\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-"<![CDATA[class HttpParams\n"
-"\n"
-"   @Produces @HttpParam(\"\")\n"
-"   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
-"      return request.getParameter(ip.getAnnotation(HttpParam.class).value"
-"());\n"
-"   }\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: injection.xml:647
 #, fuzzy, no-c-format
 msgid ""
 "(Note that the <literal>value()</literal> member of the <literal>HttpParam</"
@@ -1480,7 +898,6 @@
 "literal>)"
 
 #. Tag: para
-#: injection.xml:650
 #, fuzzy, no-c-format
 msgid ""
 "The container provides a built-in bean that implements the "
@@ -1489,30 +906,395 @@
 "Web Bean 管理員提供了實做 <literal>InjectionPoint</literal> 介面的內建 Web "
 "Bean:"
 
-#. Tag: programlisting
-#: injection.xml:653
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Type getType();\n"
-"   public Set<Annotation> getQualifiers();\n"
-"   public Bean<?> getBean();\n"
-"   public Member getMember();\n"
-"   public Annotated getAnnotated();\n"
-"   public boolean isDelegate();\n"
-"   public boolean isTransient();\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public interface InjectionPoint { \n"
-"   public Object getInstance(); \n"
-"   public Bean<?> getBean(); \n"
-"   public Member getMember(): \n"
-"   public <T extends Annotation> T getAnnotation(Class<T> annotation); \n"
-"   public Set<T extends Annotation> getAnnotations(); \n"
-"}]]>"
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   public Checkout(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "    private final ShoppingCart cart;\n"
+#~ "    \n"
+#~ "    @Initializer\n"
+#~ "    public Checkout(ShoppingCart cart) {\n"
+#~ "        this.cart = cart;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "}]]>"
 
 #, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "   private ShoppingCart cart;\n"
+#~ "\n"
+#~ "   @Inject\n"
+#~ "   void setShoppingCart(ShoppingCart cart) {\n"
+#~ "      this.cart = cart;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "        \n"
+#~ "    private ShoppingCart cart;\n"
+#~ "\n"
+#~ "    @Initializer \n"
+#~ "    void setShoppingCart(ShoppingCart cart) {\n"
+#~ "        this.cart = cart;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "   private @Inject ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class Checkout {\n"
+#~ "\n"
+#~ "    private @Current ShoppingCart cart;\n"
+#~ "    \n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces Checkout createCheckout(ShoppingCart cart) {\n"
+#~ "    return new Checkout(cart);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Synchronous\n"
+#~ "public class SynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Asynchronous\n"
+#~ "public class AsynchronousPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Synchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayByCheque {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface Asynchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayByCheque {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous PaymentProcessor syncPaymentProcessor;\n"
+#~ "@Inject @Asynchronous PaymentProcessor asyncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque PaymentProcessor chequePaymentProcessor;\n"
+#~ "@PayByCreditCard PaymentProcessor creditCardPaymentProcessor;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public void setPaymentProcessors(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor, \n"
+#~ "                                 @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public void setPaymentProcessors(@PayByCheque PaymentProcessor "
+#~ "chequePaymentProcessor, \n"
+#~ "                                 @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject\n"
+#~ "public Checkout(@Synchronous PaymentProcessor syncPaymentProcessor, \n"
+#~ "                @Asynchronous PaymentProcessor asyncPaymentProcessor) {\n"
+#~ "   this.syncPaymentProcessor = syncPaymentProcessor;\n"
+#~ "   this.asyncPaymentProcessor = asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public Checkout(@PayByCheque PaymentProcessor chequePaymentProcessor, \n"
+#~ "                @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces\n"
+#~ "PaymentProcessor getPaymentProcessor(@Synchronous PaymentProcessor "
+#~ "syncPaymentProcessor,\n"
+#~ "                                     @Asynchronous PaymentProcessor "
+#~ "asyncPaymentProcessor) {\n"
+#~ "   return isSynchronous() ? syncPaymentProcessor : "
+#~ "asyncPaymentProcessor;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public void setPaymentProcessors(@PayByCheque PaymentProcessor "
+#~ "chequePaymentProcessor, \n"
+#~ "                                 @PayByCreditCard PaymentProcessor "
+#~ "creditCardPaymentProcessor) {\n"
+#~ "   this.chequePaymentProcessor = chequePaymentProcessor;\n"
+#~ "   this.creditCardPaymentProcessor = creditCardPaymentProcessor;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "@BindingType\n"
+#~ "public @interface PayBy {\n"
+#~ "    PaymentType value();\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[private @Inject @PayBy(CHECK) PaymentProcessor checkPayment;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Qualifier\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({METHOD, FIELD, PARAMETER, TYPE})\n"
+#~ "public @interface PayBy {\n"
+#~ "   PaymentMethod value();\n"
+#~ "   @Nonbinding String comment() default \"\";\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @NonBinding public String value();\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Synchronous @Reliable PaymentProcessor "
+#~ "syncPaymentProcessor;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Synchronous @Reliable\n"
+#~ "public class SynchronousReliablePaymentProcessor implements "
+#~ "PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative @Synchronous @Asynchronous\n"
+#~ "public class MockPaymentProcessor implements PaymentProcessor {\n"
+#~ "   public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@PayByCheque\n"
+#~ "public class ChequePaymentProcessor implements PaymentProcessor {\n"
+#~ "    public void process(Payment payment) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Instance<PaymentProcessor> paymentProcessorSource;]]>"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[PaymentProcessor p = paymentProcessorSource.get();]]>"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Asynchronous Instance<PaymentProcessor> "
+#~ "paymentProcessorSource;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Asynchronous @PayByCheque PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject @Any Instance<PaymentProcessor> paymentProcessorSource;]]"
+#~ ">"
+#~ msgstr "<![CDATA[@Current PaymentProcessor paymentProcessor]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[abstract class AsynchronousQualifier\n"
+#~ "extends AnnotationLiteral<Asynchronous> implements Asynchronous {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[abstract class CreditCardBinding \n"
+#~ "    extends AnnotationLiteral<CreditCard> \n"
+#~ "    implements CreditCard {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[PaymentProcessor p = paymentProcessorSource\n"
+#~ "   .select(new AnnotationLiteral<Asynchronous>() {});]]>"
+#~ msgstr ""
+#~ "<![CDATA[PaymentProcessor p = manager.getInstanceByType(PaymentProcessor."
+#~ "class, \n"
+#~ "                                               new "
+#~ "AnnotationLiteral<CreditCard>(){});]]>"
+
+#~ msgid "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
+#~ msgstr "<![CDATA[Logger log = Logger.getLogger(MyClass.class.getName());]]>"
+
+#~ msgid ""
+#~ "<![CDATA[class LogFactory {\n"
+#~ "\n"
+#~ "   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
+#~ "      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass"
+#~ "().getName()); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[class LogFactory {\n"
+#~ "\n"
+#~ "   @Produces Logger createLogger(InjectionPoint injectionPoint) { \n"
+#~ "      return Logger.getLogger(injectionPoint.getMember().getDeclaringClass"
+#~ "().getName()); \n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject Logger log;]]>"
+#~ msgstr "<![CDATA[@Current Logger log;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @Nonbinding public String value();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@BindingType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD, FIELD, PARAMETER})\n"
+#~ "public @interface HttpParam {\n"
+#~ "   @NonBinding public String value();\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@HttpParam(\"username\") String username;\n"
+#~ "@HttpParam(\"password\") String password;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@HttpParam(\"username\") String username;\n"
+#~ "@HttpParam(\"password\") String password;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[class HttpParams\n"
+#~ "\n"
+#~ "   @Produces @HttpParam(\"\")\n"
+#~ "   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
+#~ "      return request.getParameter(ip.getAnnotated().getAnnotation"
+#~ "(HttpParam.class).value());\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[class HttpParams\n"
+#~ "\n"
+#~ "   @Produces @HttpParam(\"\")\n"
+#~ "   String getParamValue(ServletRequest request, InjectionPoint ip) {\n"
+#~ "      return request.getParameter(ip.getAnnotation(HttpParam.class).value"
+#~ "());\n"
+#~ "   }\n"
+#~ "\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public interface InjectionPoint { \n"
+#~ "   public Type getType();\n"
+#~ "   public Set<Annotation> getQualifiers();\n"
+#~ "   public Bean<?> getBean();\n"
+#~ "   public Member getMember();\n"
+#~ "   public Annotated getAnnotated();\n"
+#~ "   public boolean isDelegate();\n"
+#~ "   public boolean isTransient();\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public interface InjectionPoint { \n"
+#~ "   public Object getInstance(); \n"
+#~ "   public Bean<?> getBean(); \n"
+#~ "   public Member getMember(): \n"
+#~ "   public <T extends Annotation> T getAnnotation(Class<T> annotation); \n"
+#~ "   public Set<T extends Annotation> getAnnotations(); \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
 #~ "It's usually very easy to fix an unproxyable dependency problem. Simply "
 #~ "add a constructor with no parameters to the injected class, introduce an "
 #~ "interface, or, if all else fails, change the scope of the injected bean "

Modified: doc/trunk/reference/zh-TW/interceptors.po
===================================================================
--- doc/trunk/reference/zh-TW/interceptors.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/interceptors.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: interceptors\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:17\n"
 "PO-Revision-Date: 2009-01-15 12:13+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: interceptors.xml:5
 #, no-c-format
 msgid "Interceptors"
 msgstr "攔截器(Interceptor)"
 
 #. Tag: para
-#: interceptors.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Interceptor functionality is defined in the Java Interceptors specification. "
@@ -32,32 +30,27 @@
 msgstr "針對於將攔截器綁定至 Web Bean,Web Bean 含有較為復雜的標記導向方式。"
 
 #. Tag: para
-#: interceptors.xml:12
 #, fuzzy, no-c-format
 msgid ""
 "The Interceptors specification defines two kinds of interception points:"
 msgstr "EJB 格式定義了兩種類型的攔截點:"
 
 #. Tag: para
-#: interceptors.xml:18
 #, no-c-format
 msgid "business method interception, and"
 msgstr "business method 的攔截,以及"
 
 #. Tag: para
-#: interceptors.xml:21
 #, no-c-format
 msgid "lifecycle callback interception."
 msgstr "lifecycle callback 的攔截。"
 
 #. Tag: para
-#: interceptors.xml:25
 #, fuzzy, no-c-format
 msgid "In addition, the EJB specification defines timeout method interception."
 msgstr "EJB 格式定義了兩種類型的攔截點:"
 
 #. Tag: para
-#: interceptors.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>business method interceptor</emphasis> applies to invocations of "
@@ -66,23 +59,7 @@
 "<emphasis>business method 攔截器</emphasis>可適用於來自 Web Bean 客戶端的 "
 "Web Bean 的 method 調用:"
 
-#. Tag: programlisting
-#: interceptors.xml:34
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:36
 #, no-c-format
 msgid ""
 "A <emphasis>lifecycle callback interceptor</emphasis> applies to invocations "
@@ -91,22 +68,7 @@
 "<emphasis>lifecycle callback 攔截器</emphasis>可適用於來自 container 的 "
 "lifecycle callback 的調用:"
 
-#. Tag: programlisting
-#: interceptors.xml:41
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"   @PostConstruct \n"
-"   public void injectDependencies(InvocationContext ctx) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class DependencyInjectionInterceptor {\n"
-"    @PostConstruct public void injectDependencies(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:43
 #, no-c-format
 msgid ""
 "An interceptor class may intercept both lifecycle callbacks and business "
@@ -114,7 +76,6 @@
 msgstr "攔截器 class 可攔截 lifecycle callback 以及 business method。"
 
 #. Tag: para
-#: interceptors.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>timeout method interceptor</emphasis> applies to invocations of "
@@ -123,29 +84,12 @@
 "<emphasis>lifecycle callback 攔截器</emphasis>可適用於來自 container 的 "
 "lifecycle callback 的調用:"
 
-#. Tag: programlisting
-#: interceptors.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TimeoutInterceptor {\n"
-"   @AroundTimeout \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:55
 #, no-c-format
 msgid "Interceptor bindings"
 msgstr "攔截器綁定"
 
 #. Tag: para
-#: interceptors.xml:57
 #, fuzzy, no-c-format
 msgid ""
 "Suppose we want to declare that some of our beans are transactional. The "
@@ -156,22 +100,7 @@
 "個 <emphasis>攔截器綁定標記(interceptor binding annotation)</emphasis>來明"
 "確指定我們要專注的 Web Bean 是哪個:"
 
-#. Tag: programlisting
-#: interceptors.xml:62
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {}]]>"
-
 #. Tag: para
-#: interceptors.xml:64
 #, no-c-format
 msgid ""
 "Now we can easily specify that our <literal>ShoppingCart</literal> is a "
@@ -180,42 +109,17 @@
 "現在我們能輕易地指定我們的 <literal>ShoppingCart</literal> 屬於一個交易性的物"
 "件:"
 
-#. Tag: programlisting
-#: interceptors.xml:68
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:70
 #, no-c-format
 msgid "Or, if we prefer, we can specify that just one method is transactional:"
 msgstr "或是,若我們想要的話,我們能夠指定只有一個 method 屬於交易性:"
 
-#. Tag: programlisting
-#: interceptors.xml:74
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class ShoppingCart {\n"
-"    @Transactional public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:79
 #, no-c-format
 msgid "Implementing interceptors"
 msgstr "實做攔截器"
 
 #. Tag: para
-#: interceptors.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "That's great, but somewhere along the line we're going to have to actually "
@@ -227,68 +131,22 @@
 "準的 EJB 攔截器並將它標記為 <literal>@Interceptor</literal> 和 "
 "<literal>@Transactional</literal>。"
 
-#. Tag: programlisting
-#: interceptors.xml:87
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:89
 #, no-c-format
 msgid "Interceptors can take advantage of dependency injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:93
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource UserTransaction transaction;\n"
-"\n"
-"    @AroundInvoke \n"
-"    public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"    \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@ApplicationScoped @Transactional @Interceptor\n"
-"public class TransactionInterceptor {\n"
-"\n"
-"    @Resource Transaction transaction;\n"
-"\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:95
 #, no-c-format
 msgid "Multiple interceptors may use the same interceptor binding type."
 msgstr "多個攔截器可能會使用相同的攔截器綁定類型。"
 
 #. Tag: title
-#: interceptors.xml:102
 #, no-c-format
 msgid "Enabling interceptors"
 msgstr "啟用攔截器"
 
 #. Tag: para
-#: interceptors.xml:104
 #, no-c-format
 msgid ""
 "By default, all interceptors are disabled. We need to <emphasis>enable</"
@@ -296,30 +154,12 @@
 "a bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
-#. Tag: programlisting
-#: interceptors.xml:110
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:112
 #, no-c-format
 msgid "Whoah! Why the angle bracket stew?"
 msgstr "為何會有尖括弧?"
 
 #. Tag: para
-#: interceptors.xml:114
 #, fuzzy, no-c-format
 msgid ""
 "Well, having the XML declaration is actually a <emphasis>good thing</"
@@ -327,7 +167,6 @@
 msgstr "XML 宣告可解決兩項問題:"
 
 #. Tag: para
-#: interceptors.xml:120
 #, no-c-format
 msgid ""
 "it enables us to specify a total ordering for all the interceptors in our "
@@ -337,13 +176,11 @@
 "的特性,並且"
 
 #. Tag: para
-#: interceptors.xml:126
 #, no-c-format
 msgid "it lets us enable or disable interceptor classes at deployment time."
 msgstr "它讓我們能夠在進行建置時啟用或停用攔截器 class。"
 
 #. Tag: para
-#: interceptors.xml:130
 #, fuzzy, no-c-format
 msgid ""
 "For example, we could specify that our security interceptor runs before our "
@@ -352,25 +189,7 @@
 "比方說,我們能夠指定我們的安全性攔截器能比我們的 "
 "<literal>TransactionInterceptor</literal> 還要早執行。"
 
-#. Tag: programlisting
-#: interceptors.xml:134
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <interceptors>\n"
-"      <class>org.mycompany.myapp.SecurityInterceptor</class>\n"
-"      <class>org.mycompany.myapp.TransactionInterceptor</class>\n"
-"   </interceptors>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: interceptors.xml:136
 #, no-c-format
 msgid ""
 "Or we could turn them both off in our test environment by simply not "
@@ -378,13 +197,11 @@
 msgstr ""
 
 #. Tag: title
-#: interceptors.xml:142
 #, no-c-format
 msgid "Interceptor bindings with members"
 msgstr "與成員綁定的攔截器"
 
 #. Tag: para
-#: interceptors.xml:144
 #, no-c-format
 msgid ""
 "Suppose we want to add some extra information to our "
@@ -393,26 +210,7 @@
 "假設我們希望新增一些額外的資訊至我們的 <literal>@Transactional</literal> 標記"
 "中:"
 
-#. Tag: programlisting
-#: interceptors.xml:148
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"   boolean requiresNew() default false;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Transactional {\n"
-"    boolean requiresNew() default false;\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:150
 #, fuzzy, no-c-format
 msgid ""
 "CDI will use the value of <literal>requiresNew</literal> to choose between "
@@ -423,25 +221,7 @@
 "(<literal>TransactionInterceptor</literal> 與 "
 "<literal>RequiresNewTransactionInterceptor</literal>)之間作選擇。"
 
-#. Tag: programlisting
-#: interceptors.xml:155
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"   @AroundInvoke \n"
-"   public Object manageTransaction(InvocationContext ctx) throws Exception "
-"{ ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional(requiresNew=true) @Interceptor\n"
-"public class RequiresNewTransactionInterceptor {\n"
-"    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
-"{ ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:157
 #, no-c-format
 msgid ""
 "Now we can use <literal>RequiresNewTransactionInterceptor</literal> like "
@@ -449,18 +229,7 @@
 msgstr ""
 "現在我們可如下使用 <literal>RequiresNewTransactionInterceptor</literal>:"
 
-#. Tag: programlisting
-#: interceptors.xml:161
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional(requiresNew = true)\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional(requiresNew=true)\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:163
 #, fuzzy, no-c-format
 msgid ""
 "But what if we only have one interceptor and we want the container to ignore "
@@ -472,32 +241,12 @@
 "<literal>requiresNew</literal> 的值時該怎麼辦呢?這時我們可使用 "
 "<literal>@NonBinding</literal> 標記:"
 
-#. Tag: programlisting
-#: interceptors.xml:169
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@InterceptorBinding\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"   @Nonbinding String[] rolesAllowed() default {};\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@InterceptorBindingType\n"
-"@Target({METHOD, TYPE})\n"
-"@Retention(RUNTIME)\n"
-"public @interface Secure {\n"
-"    @NonBinding String[] rolesAllowed() default {};\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:174
 #, no-c-format
 msgid "Multiple interceptor binding annotations"
 msgstr "多重攔截器綁定標記"
 
 #. Tag: para
-#: interceptors.xml:176
 #, fuzzy, no-c-format
 msgid ""
 "Usually we use combinations of interceptor bindings types to bind multiple "
@@ -509,36 +258,14 @@
 "說,下列宣告會被用來將 <literal>TransactionInterceptor</literal> 和 "
 "<literal>SecurityInterceptor</literal> 綁定至相同的 Web Bean:"
 
-#. Tag: programlisting
-#: interceptors.xml:182
-#, no-c-format
-msgid ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-msgstr ""
-"<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
-"public class ShoppingCart { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:184
 #, no-c-format
 msgid ""
 "However, in very complex cases, an interceptor itself may specify some "
 "combination of interceptor binding types:"
 msgstr "不過,在非常複雜的情況下,攔截器本身會指定一些攔截器綁定類型的組合:"
 
-#. Tag: programlisting
-#: interceptors.xml:189
-#, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure @Interceptor\n"
-"public class TransactionalSecureInterceptor { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:191
 #, no-c-format
 msgid ""
 "Then this interceptor could be bound to the <literal>checkout()</literal> "
@@ -547,68 +274,12 @@
 "然後這個攔截器便可透過使用下列任何一個組合來綁定至 <literal>checkout()</"
 "literal> 這個 method:"
 
-#. Tag: programlisting
-#: interceptors.xml:196
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class ShoppingCart {\n"
-"   @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class ShoppingCart {\n"
-"    @Transactional @Secure public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:198
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"   @Transactional public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Secure\n"
-"public class ShoppingCart {\n"
-"    @Transactional public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:200
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional\n"
-"public class ShoppingCart {\n"
-"   @Secure public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactionl\n"
-"public class ShoppingCart {\n"
-"    @Secure public void checkout() { ... }\n"
-"}]]>"
-
-#. Tag: programlisting
-#: interceptors.xml:202
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure\n"
-"public class ShoppingCart {\n"
-"    public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: title
-#: interceptors.xml:207
 #, no-c-format
 msgid "Interceptor binding type inheritance"
 msgstr "攔截器綁定類型的 inheritance"
 
 #. Tag: para
-#: interceptors.xml:209
 #, no-c-format
 msgid ""
 "One limitation of the Java language support for annotations is the lack of "
@@ -618,46 +289,20 @@
 "Java 語言對於標記上的支援有個限制,那就是缺少了標記的 inheritance。實際上,標"
 "記應該要內建 reuse,以便允許這類型的功能有效:"
 
-#. Tag: programlisting
-#: interceptors.xml:214
-#, no-c-format
-msgid ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-msgstr ""
-"<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:216
 #, fuzzy, no-c-format
 msgid ""
 "Well, fortunately, CDI works around this missing feature of Java. We may "
 "annotate one interceptor binding type with other interceptor binding types "
 "(termed a <emphasis>meta-annotation</emphasis>). The interceptor bindings "
-"are transitive &#8212; any bean with the first interceptor binding inherits "
-"the interceptor bindings declared as meta-annotations."
+"are transitive — any bean with the first interceptor binding inherits the "
+"interceptor bindings declared as meta-annotations."
 msgstr ""
 "幸運的是,Web Bean 有方法來解決 Java 所缺少的這項功能上的問題。我們可利用其它"
 "攔截器綁定類型來標記某個攔截器綁定類型。攔截器綁定為可轉變的 &#151; 任何含有"
 "第一個攔截器綁定的 Web Bean 都會繼承宣告為 meta-annotation 的攔截器綁定。"
 
-#. Tag: programlisting
-#: interceptors.xml:223
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBinding\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-msgstr ""
-"<![CDATA[@Transactional @Secure\n"
-"@InterceptorBindingType\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface Action { ... }]]>"
-
 #. Tag: para
-#: interceptors.xml:225
 #, fuzzy, no-c-format
 msgid ""
 "Now, any bean annotated <literal>@Action</literal> will be bound to both "
@@ -671,13 +316,11 @@
 "在的話。)"
 
 #. Tag: title
-#: interceptors.xml:234
 #, no-c-format
 msgid "Use of <literal>@Interceptors</literal>"
 msgstr "使用 <literal>@Interceptors</literal>"
 
 #. Tag: para
-#: interceptors.xml:236
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>@Interceptors</literal> annotation defined by the interceptor "
@@ -687,56 +330,288 @@
 "企業級與基本的 Web Bean 皆支援 EJB 規格所定義的 <literal>@Interceptors</"
 "literal> 標記,例如:"
 
-#. Tag: programlisting
-#: interceptors.xml:239
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"   public void checkout() { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
-"class})\n"
-"public class ShoppingCart {\n"
-"    public void checkout() { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: interceptors.xml:241
 #, no-c-format
 msgid "However, this approach suffers the following drawbacks:"
 msgstr "不過,這個方式有下列缺點:"
 
 #. Tag: para
-#: interceptors.xml:245
 #, no-c-format
 msgid "the interceptor implementation is hardcoded in business code,"
 msgstr "攔截器的實做會被 hardcode 在 business code 之中、"
 
 #. Tag: para
-#: interceptors.xml:250
 #, no-c-format
 msgid "interceptors may not be easily disabled at deployment time, and"
 msgstr "攔截器無法在進行建置時輕易地被停用,以及"
 
 #. Tag: para
-#: interceptors.xml:255
 #, fuzzy, no-c-format
 msgid ""
-"the interceptor ordering is non-global &#8212; it is determined by the order "
-"in which interceptors are listed at the class level."
+"the interceptor ordering is non-global — it is determined by the order in "
+"which interceptors are listed at the class level."
 msgstr ""
 "攔截器的順序會是非全域性的 &#151; 會由攔截器被列於 class 層級的順序來取決。"
 
 #. Tag: para
-#: interceptors.xml:262
 #, fuzzy, no-c-format
 msgid "Therefore, we recommend the use of CDI-style interceptor bindings."
 msgstr "因此,我們建議使用 Web Bean 形式的攔截器綁定。"
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DependencyInjectionInterceptor {\n"
+#~ "   @PostConstruct \n"
+#~ "   public void injectDependencies(InvocationContext ctx) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class DependencyInjectionInterceptor {\n"
+#~ "    @PostConstruct public void injectDependencies(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class TimeoutInterceptor {\n"
+#~ "   @AroundTimeout \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "    @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource UserTransaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke \n"
+#~ "    public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "    \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ApplicationScoped @Transactional @Interceptor\n"
+#~ "public class TransactionInterceptor {\n"
+#~ "\n"
+#~ "    @Resource Transaction transaction;\n"
+#~ "\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {\n"
+#~ "   boolean requiresNew() default false;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Transactional {\n"
+#~ "    boolean requiresNew() default false;\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional(requiresNew = true) @Interceptor\n"
+#~ "public class RequiresNewTransactionInterceptor {\n"
+#~ "   @AroundInvoke \n"
+#~ "   public Object manageTransaction(InvocationContext ctx) throws "
+#~ "Exception { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional(requiresNew=true) @Interceptor\n"
+#~ "public class RequiresNewTransactionInterceptor {\n"
+#~ "    @AroundInvoke public Object manageTransaction(InvocationContext ctx) "
+#~ "{ ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional(requiresNew = true)\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional(requiresNew=true)\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@InterceptorBinding\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Secure {\n"
+#~ "   @Nonbinding String[] rolesAllowed() default {};\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@InterceptorBindingType\n"
+#~ "@Target({METHOD, TYPE})\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Secure {\n"
+#~ "    @NonBinding String[] rolesAllowed() default {};\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Secure(rolesAllowed=\"admin\") @Transactional\n"
+#~ "public class ShoppingCart { ... }]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure @Interceptor\n"
+#~ "public class TransactionalSecureInterceptor { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure @Interceptor\n"
+#~ "public class TransactionalSecureInterceptor { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "   @Transactional @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class ShoppingCart {\n"
+#~ "    @Transactional @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "    @Transactional public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional\n"
+#~ "public class ShoppingCart {\n"
+#~ "   @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactionl\n"
+#~ "public class ShoppingCart {\n"
+#~ "    @Secure public void checkout() { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "public class ShoppingCart {\n"
+#~ "    public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[public @interface Action extends Transactional, Secure { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "@InterceptorBinding\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Action { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Transactional @Secure\n"
+#~ "@InterceptorBindingType\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface Action { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
+#~ "class})\n"
+#~ "public class ShoppingCart {\n"
+#~ "   public void checkout() { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Interceptors({TransactionInterceptor.class, SecurityInterceptor."
+#~ "class})\n"
+#~ "public class ShoppingCart {\n"
+#~ "    public void checkout() { ... }\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "Web Beans re-uses the basic interceptor architecture of EJB 3.0, "
 #~ "extending the functionality in two directions:"
 #~ msgstr ""

Modified: doc/trunk/reference/zh-TW/intro.po
===================================================================
--- doc/trunk/reference/zh-TW/intro.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/intro.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: intro\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-21 12:44+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: intro.xml:4
 #, no-c-format
 msgid "Introduction"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:6
 #, fuzzy, no-c-format
 msgid ""
 "So you're keen to get started writing your first bean? Or perhaps you're "
@@ -38,13 +36,11 @@
 "Bean 為何了。"
 
 #. Tag: title
-#: intro.xml:13
 #, fuzzy, no-c-format
 msgid "What is a bean?"
 msgstr "Web Bean 是什麼?"
 
 #. Tag: para
-#: intro.xml:15
 #, no-c-format
 msgid ""
 "A bean is exactly what you think it is. Only now, it has a true identity in "
@@ -52,7 +48,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:19
 #, no-c-format
 msgid ""
 "Prior to Java EE 6, there was no clear definition of the term \"bean\" in "
@@ -65,7 +60,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:27
 #, no-c-format
 msgid ""
 "Java EE 6 finally lays down that common definition in the Managed Beans "
@@ -79,14 +73,13 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:36
 #, no-c-format
 msgid ""
 "With very few exceptions, almost every concrete Java class that has a "
 "constructor with no parameters (or a constructor designated with the "
 "annotation <literal>@Inject</literal>) is a bean. This includes every "
 "JavaBean and every EJB session bean. If you've already got some JavaBeans or "
-"session beans lying around, they're already beans&#8212;you won't need any "
+"session beans lying around, they're already beans—you won't need any "
 "additional special metadata. There's just little one thing you need to do "
 "before you can start injecting them into stuff: you need to put them in an "
 "archive (a jar, or a Java EE module such as a war or EJB jar) that contains "
@@ -94,33 +87,29 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:45
 #, no-c-format
 msgid ""
 "The JavaBeans and EJBs you've been writing every day, up until now, have not "
 "been able to take advantage of the new services defined by the CDI "
-"specification. But you'll be able to use every one of them with CDI&#8212;"
-"allowing the container to create and destroy instances of your beans and "
-"associate them with a designated context, injecting them into other beans, "
-"using them in EL expressions, specializing them with qualifier annotations, "
-"even adding interceptors and decorators to them&#8212;without modifying your "
-"existing code. At most, you'll need to add some annotations."
+"specification. But you'll be able to use every one of them with CDI—allowing "
+"the container to create and destroy instances of your beans and associate "
+"them with a designated context, injecting them into other beans, using them "
+"in EL expressions, specializing them with qualifier annotations, even adding "
+"interceptors and decorators to them—without modifying your existing code. At "
+"most, you'll need to add some annotations."
 msgstr ""
 
 #. Tag: para
-#: intro.xml:54
 #, no-c-format
 msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
-#: intro.xml:61
 #, no-c-format
 msgid "Getting our feet wet"
 msgstr ""
 
 #. Tag: para
-#: intro.xml:63
 #, fuzzy, no-c-format
 msgid ""
 "Suppose that we have two existing Java classes that we've been using for "
@@ -130,20 +119,7 @@
 "假設我們目前有兩個使用於各種應用程式中多年的 Java class。第一個 class 會將一"
 "個字串剖析入一列句子中:"
 
-#. Tag: programlisting
-#: intro.xml:68
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class SentenceParser {\n"
-"   public List<String> parse(String text) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class SentenceParser {\n"
-"    public List<String> parse(String text) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:70
 #, no-c-format
 msgid ""
 "The second existing class is a stateless session bean front-end for an "
@@ -153,42 +129,12 @@
 "第二個 class 則是個外部系統的無狀態 session bean 前端,並且它可將句子由一種語"
 "言翻譯成另一種語言:"
 
-#. Tag: programlisting
-#: intro.xml:75
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"   public String translate(String sentence) { ... }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator {\n"
-"    public String translate(String sentence) { ... }\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:77
 #, fuzzy, no-c-format
 msgid "Where <literal>Translator</literal> is the EJB local interface:"
 msgstr "<literal>Translator</literal> 為本地介面:"
 
-#. Tag: programlisting
-#: intro.xml:79
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"   public String translate(String sentence);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Local\n"
-"public interface Translator {\n"
-"    public String translate(String sentence);\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "Unfortunately, we don't have a class that translates whole text documents. "
@@ -197,54 +143,7 @@
 "不巧的是,我們沒有一個可翻譯整個文字文件的現有 class。所以讓我們來編寫一個能"
 "夠完成這項工作的 Web Bean 吧:"
 
-#. Tag: programlisting
-#: intro.xml:85
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator {\n"
-"   private SentenceParser sentenceParser;\n"
-"   private Translator sentenceTranslator;\n"
-"    \n"
-"   @Inject\n"
-"   TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"      this.sentenceParser = sentenceParser;\n"
-"      this.sentenceTranslator = sentenceTranslator;\n"
-"   }\n"
-"    \n"
-"   public String translate(String text) {\n"
-"      StringBuilder sb = new StringBuilder();\n"
-"      for (String sentence: sentenceParser.parse(text)) {\n"
-"          sb.append(sentenceTranslator.translate(sentence));\n"
-"      }\n"
-"      return sb.toString();\n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class TextTranslator {\n"
-"    \n"
-"    private SentenceParser sentenceParser;\n"
-"    private Translator sentenceTranslator;\n"
-"    \n"
-"    @Initializer\n"
-"    TextTranslator(SentenceParser sentenceParser, Translator "
-"sentenceTranslator) {\n"
-"        this.sentenceParser = sentenceParser;\n"
-"        this.sentenceTranslator = sentenceTranslator;\n"
-"    }\n"
-"    \n"
-"    public String translate(String text) {\n"
-"        StringBuilder sb = new StringBuilder();\n"
-"        for (String sentence: sentenceParser.parse(text)) {\n"
-"            sb.append(sentenceTranslator.translate(sentence));\n"
-"        }\n"
-"        return sb.toString();\n"
-"    }\n"
-"    \n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:87
 #, fuzzy, no-c-format
 msgid ""
 "But wait! <literal>TextTranslator</literal> does not have a constructor with "
@@ -258,7 +157,6 @@
 "是個 Web Bean。"
 
 #. Tag: para
-#: intro.xml:93
 #, fuzzy, no-c-format
 msgid ""
 "As you've guessed, the <literal>@Inject</literal> annotation has something "
@@ -274,7 +172,6 @@
 "數中。"
 
 #. Tag: para
-#: intro.xml:100
 #, no-c-format
 msgid ""
 "We may obtain an instance of <literal>TextTranslator</literal> by injecting "
@@ -285,7 +182,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:107
 #, no-c-format
 msgid ""
 "Let's create a UI controller bean that uses field injection to obtain an "
@@ -293,44 +189,12 @@
 "entered by a user:"
 msgstr ""
 
-#. Tag: programlisting
-#: intro.xml:116
-#, no-c-format
-msgid ""
-"<![CDATA[@Named @RequestScoped\n"
-"public class TranslateController {\n"
-"   @Inject TextTranslator textTranslator;\n"
-"\n"
-"   private String inputText;\n"
-"   private String translation;\n"
-"\n"
-"   // JSF action method, perhaps\n"
-"   public void translate() {\n"
-"      translation = textTranslator.translate(inputText); \n"
-"   }\n"
-"\n"
-"   public String getInputText() {\n"
-"      return inputText;\n"
-"   }\n"
-"\n"
-"   public void setInputText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"\n"
-"   public String getTranslation() {\n"
-"      return translation;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: intro.xml:119
 #, fuzzy, no-c-format
 msgid "Field injection of <literal>TextTranslator</literal> instance"
 msgstr "<literal>Translator</literal> 為本地介面:"
 
 #. Tag: para
-#: intro.xml:127
 #, no-c-format
 msgid ""
 "Notice the controller bean is request-scoped and named. Since this "
@@ -341,7 +205,6 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:135
 #, fuzzy, no-c-format
 msgid ""
 "Alternatively, we may obtain an instance of <literal>TextTranslator</"
@@ -351,23 +214,7 @@
 "我們能夠藉由將注入一個 <literal>TextTranslator</literal> 的 instance 注入 "
 "Web Bean、Servlet 或是 EJB 中來取得這個 instance:"
 
-#. Tag: programlisting
-#: intro.xml:140
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
-"...\n"
-"public void translate() {\n"
-"   textTranslatorInstance.get().translate(inputText);\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Initializer\n"
-"public setTextTranslator(TextTranslator textTranslator) {\n"
-"    this.textTranslator = textTranslator;\n"
-"}]]>"
-
 #. Tag: para
-#: intro.xml:142
 #, no-c-format
 msgid ""
 "Notice that it isn't necessary to create a getter or setter method to inject "
@@ -378,17 +225,15 @@
 msgstr ""
 
 #. Tag: para
-#: intro.xml:148
 #, fuzzy, no-c-format
 msgid ""
 "At system initialization time, the container must validate that exactly one "
 "bean exists which satisfies each injection point. In our example, if no "
-"implementation of <literal>Translator</literal> is available&#8212;if the "
-"<literal>SentenceTranslator</literal> EJB was not deployed&#8212;the "
-"container would inform us of an <emphasis>unsatisfied dependency</emphasis>. "
-"If more than one implementation of <literal>Translator</literal> were "
-"available, the container would inform us of the <emphasis>ambiguous "
-"dependency</emphasis>."
+"implementation of <literal>Translator</literal> is available—if the "
+"<literal>SentenceTranslator</literal> EJB was not deployed—the container "
+"would inform us of an <emphasis>unsatisfied dependency</emphasis>. If more "
+"than one implementation of <literal>Translator</literal> were available, the "
+"container would inform us of the <emphasis>ambiguous dependency</emphasis>."
 msgstr ""
 "當系統初始化時,Web Bean 管理員必須驗證是否有正好一個滿足所有注入點的 Web "
 "Bean 存在。在我們的範例中,若沒有可用的 <literal>Translator</literal> 實做 "
@@ -398,7 +243,6 @@
 "會回傳一個 <literal>AmbiguousDependencyException</literal>。"
 
 #. Tag: para
-#: intro.xml:156
 #, no-c-format
 msgid ""
 "Before we get too deep in the details, let's pause and examine a bean's "
@@ -407,6 +251,97 @@
 "what <emphasis>makes</emphasis> something a bean."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class SentenceParser {\n"
+#~ "   public List<String> parse(String text) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class SentenceParser {\n"
+#~ "    public List<String> parse(String text) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator {\n"
+#~ "   public String translate(String sentence) { ... }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Stateless\n"
+#~ "public class SentenceTranslator implements Translator {\n"
+#~ "    public String translate(String sentence) { ... }\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Local\n"
+#~ "public interface Translator {\n"
+#~ "   public String translate(String sentence);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Local\n"
+#~ "public interface Translator {\n"
+#~ "    public String translate(String sentence);\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class TextTranslator {\n"
+#~ "   private SentenceParser sentenceParser;\n"
+#~ "   private Translator sentenceTranslator;\n"
+#~ "    \n"
+#~ "   @Inject\n"
+#~ "   TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) {\n"
+#~ "      this.sentenceParser = sentenceParser;\n"
+#~ "      this.sentenceTranslator = sentenceTranslator;\n"
+#~ "   }\n"
+#~ "    \n"
+#~ "   public String translate(String text) {\n"
+#~ "      StringBuilder sb = new StringBuilder();\n"
+#~ "      for (String sentence: sentenceParser.parse(text)) {\n"
+#~ "          sb.append(sentenceTranslator.translate(sentence));\n"
+#~ "      }\n"
+#~ "      return sb.toString();\n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class TextTranslator {\n"
+#~ "    \n"
+#~ "    private SentenceParser sentenceParser;\n"
+#~ "    private Translator sentenceTranslator;\n"
+#~ "    \n"
+#~ "    @Initializer\n"
+#~ "    TextTranslator(SentenceParser sentenceParser, Translator "
+#~ "sentenceTranslator) {\n"
+#~ "        this.sentenceParser = sentenceParser;\n"
+#~ "        this.sentenceTranslator = sentenceTranslator;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public String translate(String text) {\n"
+#~ "        StringBuilder sb = new StringBuilder();\n"
+#~ "        for (String sentence: sentenceParser.parse(text)) {\n"
+#~ "            sb.append(sentenceTranslator.translate(sentence));\n"
+#~ "        }\n"
+#~ "        return sb.toString();\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;\n"
+#~ "...\n"
+#~ "public void translate() {\n"
+#~ "   textTranslatorInstance.get().translate(inputText);\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Initializer\n"
+#~ "public setTextTranslator(TextTranslator textTranslator) {\n"
+#~ "    this.textTranslator = textTranslator;\n"
+#~ "}]]>"
+
 #~ msgid "Getting started with Web Beans"
 #~ msgstr "開始使用 Web Bean"
 

Modified: doc/trunk/reference/zh-TW/master.po
===================================================================
--- doc/trunk/reference/zh-TW/master.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/master.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-08 10:09+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: master.xml:9
 #, no-c-format
 msgid "A note about naming and nomenclature"
 msgstr ""
 
 #. Tag: para
-#: master.xml:10
 #, no-c-format
 msgid ""
 "Shortly before the final draft of JSR-299 was submitted, the specification "
@@ -38,7 +36,6 @@
 msgstr ""
 
 #. Tag: para
-#: master.xml:19
 #, no-c-format
 msgid ""
 "You'll also find that some of the functionality that once existed in the "
@@ -48,43 +45,37 @@
 msgstr ""
 
 #. Tag: para
-#: master.xml:25
 #, no-c-format
 msgid ""
 "Note that this reference guide was started while changes were still being "
 "made to the specification. We've done our best to update it for accuracy. If "
 "you discover a conflict between what is written in this guide and the "
-"specification, the specification is the authority&#8212;assume it is "
-"correct. If you believe you have found an error in the specification, please "
-"report it to the JSR-299 EG."
+"specification, the specification is the authority—assume it is correct. If "
+"you believe you have found an error in the specification, please report it "
+"to the JSR-299 EG."
 msgstr ""
 
 #. Tag: title
-#: master.xml:36
 #, no-c-format
 msgid "Beans"
 msgstr ""
 
 #. Tag: title
-#: master.xml:49
 #, no-c-format
 msgid "Weld, the CDI Reference Implementation"
 msgstr ""
 
 #. Tag: title
-#: master.xml:59
 #, fuzzy, no-c-format
 msgid "Loose coupling with strong typing"
 msgstr "最大程度地使用強類型(strong typing)"
 
 #. Tag: title
-#: master.xml:75
 #, fuzzy, no-c-format
 msgid "CDI and the Java EE ecosystem"
 msgstr "Web Beans 與 Java EE 應用系統"
 
 #. Tag: title
-#: master.xml:87
 #, no-c-format
 msgid "Weld reference"
 msgstr ""

Modified: doc/trunk/reference/zh-TW/next.po
===================================================================
--- doc/trunk/reference/zh-TW/next.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/next.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: next\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-08 10:54+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: next.xml:4
 #, no-c-format
 msgid "Next steps"
 msgstr "接下來的步驟"
 
 #. Tag: para
-#: next.xml:6
 #, no-c-format
 msgid ""
 "Because CDI is so new, there's not yet a lot of information available "
@@ -36,7 +34,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:14
 #, fuzzy, no-c-format
 msgid ""
 "The CDI reference implementation, Weld, is being developed at the <ulink url="
@@ -52,7 +49,6 @@
 "in.relation.to</literal>。本文件大體上基於發佈於該網頁上的一系列 blog 項目。"
 
 #. Tag: para
-#: next.xml:22
 #, no-c-format
 msgid ""
 "We encourage you to follow the <ulink url=\"https://lists.jboss.org/mailman/"
@@ -62,7 +58,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:28
 #, no-c-format
 msgid ""
 "We are eager to find volunteers to help revise, proofread or translate this "
@@ -71,7 +66,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:35
 #, no-c-format
 msgid ""
 "Checkout source from <ulink url=\"http://anonsvn.jboss.org/repos/weld/doc/"
@@ -79,16 +73,7 @@
 "ulink> using SVN"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:40
-#, no-c-format
-msgid ""
-"<![CDATA[$> svn co http://anonsvn.jboss.org/repos/weld/doc/trunk/reference "
-"weld-reference]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:43
 #, no-c-format
 msgid ""
 "Edit the <literal>pom.xml</literal> file in the root of the checkout and "
@@ -97,19 +82,11 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:49
 #, no-c-format
 msgid "Build using Maven 2"
 msgstr ""
 
-#. Tag: programlisting
-#: next.xml:52
-#, no-c-format
-msgid "<![CDATA[$> mvn]]>"
-msgstr ""
-
 #. Tag: para
-#: next.xml:54
 #, no-c-format
 msgid ""
 "If you experience an out of memory error, try setting this environment "
@@ -117,7 +94,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:61
 #, no-c-format
 msgid ""
 "The PDF version of the reference guide will appear the current directory. "
@@ -126,7 +102,6 @@
 msgstr ""
 
 #. Tag: para
-#: next.xml:66
 #, no-c-format
 msgid "We look forward to your participation!"
 msgstr ""

Modified: doc/trunk/reference/zh-TW/part1.po
===================================================================
--- doc/trunk/reference/zh-TW/part1.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/part1.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part1\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-15 12:16+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,7 +17,6 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: para
-#: part1.xml:14
 #, fuzzy, no-c-format
 msgid ""
 "The <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-299</ulink> "
@@ -32,7 +31,6 @@
 "程式撰寫模型(Programming Model),Web Bean 服務提供了:"
 
 #. Tag: para
-#: part1.xml:23
 #, fuzzy, no-c-format
 msgid ""
 "an improved lifecycle for stateful objects, bound to well-defined "
@@ -41,7 +39,6 @@
 "狀態元件上的生命週期改善,並綁定至明確定義的 <emphasis>contexts</emphasis>、"
 
 #. Tag: para
-#: part1.xml:28
 #, no-c-format
 msgid "a typesafe approach to <emphasis>dependency injection</emphasis>,"
 msgstr ""
@@ -49,7 +46,6 @@
 "(類型安全列舉)方式、"
 
 #. Tag: para
-#: part1.xml:33
 #, fuzzy, no-c-format
 msgid ""
 "object interaction via an <emphasis>event notification facility</emphasis>,"
@@ -58,7 +54,6 @@
 "及"
 
 #. Tag: para
-#: part1.xml:38
 #, fuzzy, no-c-format
 msgid ""
 "a better approach to binding <emphasis>interceptors</emphasis> to objects, "
@@ -70,7 +65,6 @@
 "業上的相關問題。"
 
 #. Tag: para
-#: part1.xml:45
 #, no-c-format
 msgid ""
 "an <emphasis>SPI</emphasis> for developing portable extensions to the "
@@ -78,22 +72,21 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:51
 #, no-c-format
 msgid ""
 "The CDI services are a core aspect of the Java EE platform and include full "
 "support for Java EE modularity and the Java EE component architecture. But "
 "the specification does not limit the use of CDI to the Java EE environment. "
 "In the Java SE environment, the services might be provided by a standalone "
-"CDI implementation like Weld (see <xref linkend=\"weld-se\"/>), or even by a "
-"container that also implements the subset of EJB defined for embedded usage "
-"by the EJB 3.1 specification. CDI is especially useful in the context of web "
-"application development, but the problems it solves are general development "
-"concerns and it is therefore applicable to a wide variety of application."
+"CDI implementation like Weld (see <xref linkend=\"weld-se\" />), or even by "
+"a container that also implements the subset of EJB defined for embedded "
+"usage by the EJB 3.1 specification. CDI is especially useful in the context "
+"of web application development, but the problems it solves are general "
+"development concerns and it is therefore applicable to a wide variety of "
+"application."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:61
 #, no-c-format
 msgid ""
 "An object bound to a lifecycle context is called a bean. CDI includes built-"
@@ -102,19 +95,16 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:68
 #, no-c-format
 msgid "managed beans, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:71
 #, no-c-format
 msgid "EJB session beans."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:75
 #, no-c-format
 msgid ""
 "Both managed beans and EJB session beans may inject other beans. But some "
@@ -124,37 +114,31 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:83
 #, no-c-format
 msgid "message-driven beans,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:86
 #, no-c-format
 msgid "interceptors,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:89
 #, no-c-format
 msgid "servlets, servlet filters and servlet event listeners,"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:92
 #, no-c-format
 msgid "JAX-WS service endpoints and handlers, and"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:95
 #, no-c-format
 msgid "JSP tag handlers and tag library event listeners."
 msgstr ""
 
 #. Tag: para
-#: part1.xml:99
 #, fuzzy, no-c-format
 msgid ""
 "CDI relieves the user of an unfamiliar API of the need to answer the "
@@ -164,44 +148,37 @@
 "須過問下列問題:"
 
 #. Tag: para
-#: part1.xml:105
 #, fuzzy, no-c-format
 msgid "What is the lifecycle of this object?"
 msgstr "這個物件的生命週期為何?"
 
 #. Tag: para
-#: part1.xml:108
 #, fuzzy, no-c-format
 msgid "How many simultaneous clients can it have?"
 msgstr "它一次能同時有幾個客戶端?"
 
 #. Tag: para
-#: part1.xml:111
 #, fuzzy, no-c-format
 msgid "Is it multithreaded?"
 msgstr "它是否為多執行緒(multithread)?"
 
 #. Tag: para
-#: part1.xml:114
 #, no-c-format
 msgid "How do I get access to it from a client?"
 msgstr ""
 
 #. Tag: para
-#: part1.xml:117
 #, fuzzy, no-c-format
 msgid "Do I need to explicitly destroy it?"
 msgstr "我是否需要明確地將它毀掉呢?"
 
 #. Tag: para
-#: part1.xml:120
 #, fuzzy, no-c-format
 msgid ""
 "Where should I keep the reference to it when I'm not currently using it?"
 msgstr "當我沒有在直接使用它時,我應該將它的參照保留在哪裡呢?"
 
 #. Tag: para
-#: part1.xml:125
 #, fuzzy, no-c-format
 msgid ""
 "How can I define an alternative implementation, so that the implementation "
@@ -210,13 +187,11 @@
 "我該如何新增一個 indirection layer 來使這個物件在建置時的實做可呈多樣化?"
 
 #. Tag: para
-#: part1.xml:131
 #, fuzzy, no-c-format
 msgid "How should I go about sharing this object between other objects?"
 msgstr "我該如何在其它物件之間共享這個物件?"
 
 #. Tag: para
-#: part1.xml:137
 #, no-c-format
 msgid ""
 "CDI is more than a framework. It's a whole, rich programming model. The "
@@ -225,7 +200,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:142
 #, fuzzy, no-c-format
 msgid ""
 "A bean specifies only the type and semantics of other beans it depends upon. "
@@ -241,7 +215,6 @@
 "並且不影響到任何的客戶端。"
 
 #. Tag: para
-#: part1.xml:149
 #, fuzzy, no-c-format
 msgid ""
 "Events, interceptors and decorators enhance the loose-coupling inherent in "
@@ -251,7 +224,6 @@
 "emphasis>(鬆散結合性):"
 
 #. Tag: para
-#: part1.xml:155
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -261,7 +233,6 @@
 "event consumer(事件用戶),"
 
 #. Tag: para
-#: part1.xml:159
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -271,7 +242,6 @@
 "並且"
 
 #. Tag: para
-#: part1.xml:163
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> allow business concerns to be "
@@ -279,7 +249,6 @@
 msgstr "<emphasis>decorators</emphasis>(裝飾器)可將商業問題分為若干部分。"
 
 #. Tag: para
-#: part1.xml:168
 #, fuzzy, no-c-format
 msgid ""
 "What's even more powerful (and comforting) is that CDI provides all these "
@@ -300,7 +269,6 @@
 "Bean、它們的相依性、它們的攔截器和裝飾器以及它們的事件用戶聯繫在一起。"
 
 #. Tag: para
-#: part1.xml:177
 #, no-c-format
 msgid ""
 "But CDI isn't a restrictive programming model. It doesn't tell you how you "
@@ -310,7 +278,6 @@
 msgstr ""
 
 #. Tag: para
-#: part1.xml:183
 #, fuzzy, no-c-format
 msgid ""
 "CDI even provides a comprehensive SPI, allowing other kinds of object "
@@ -323,7 +290,6 @@
 "型的 Web Bean 進行互動。"
 
 #. Tag: para
-#: part1.xml:189
 #, fuzzy, no-c-format
 msgid ""
 "CDI was influenced by a number of existing Java frameworks, including Seam, "
@@ -340,7 +306,6 @@
 "式上的處理能力比 Guice 完善。"
 
 #. Tag: para
-#: part1.xml:197
 #, no-c-format
 msgid ""
 "Finally, CDI is a <ulink url=\"http://jcp.org\">Java Community Process</"

Modified: doc/trunk/reference/zh-TW/part2.po
===================================================================
--- doc/trunk/reference/zh-TW/part2.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/part2.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part2\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-14 12:31+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,7 +17,6 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: para
-#: part2.xml:5
 #, no-c-format
 msgid ""
 "Weld, the JSR-299 Reference Implementation (RI), is being developed as part "
@@ -29,7 +28,6 @@
 msgstr ""
 
 #. Tag: para
-#: part2.xml:12
 #, no-c-format
 msgid ""
 "Weld provides a complete SPI allowing Java EE containers such as JBoss AS "
@@ -39,7 +37,6 @@
 msgstr ""
 
 #. Tag: para
-#: part2.xml:18
 #, no-c-format
 msgid ""
 "Weld comes with an extensive library of examples, which are a great starting "

Modified: doc/trunk/reference/zh-TW/part3.po
===================================================================
--- doc/trunk/reference/zh-TW/part3.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/part3.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part3\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-14 16:07+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,7 +17,6 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: para
-#: part3.xml:5
 #, no-c-format
 msgid ""
 "The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've "
@@ -25,19 +24,16 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:12
 #, no-c-format
 msgid "<emphasis>alternatives</emphasis> enable deployment time polymorphism,"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:17
 #, no-c-format
 msgid "<emphasis>producer methods</emphasis> enable runtime polymorphism, and"
 msgstr ""
 
 #. Tag: para
-#: part3.xml:21
 #, no-c-format
 msgid ""
 "<emphasis>contextual lifecycle management</emphasis> decouples bean "
@@ -45,7 +41,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:27
 #, no-c-format
 msgid ""
 "These techniques serve to enable loose coupling of client and server. The "
@@ -55,7 +50,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:33
 #, no-c-format
 msgid ""
 "Loose coupling makes a system more <emphasis>dynamic</emphasis>. The system "
@@ -67,7 +61,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:40
 #, no-c-format
 msgid ""
 "CDI provides three extra important facilities that further the goal of loose "
@@ -75,7 +68,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:46
 #, no-c-format
 msgid ""
 "<emphasis>interceptors</emphasis> decouple technical concerns from business "
@@ -83,7 +75,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:51
 #, no-c-format
 msgid ""
 "<emphasis>decorators</emphasis> may be used to decouple some business "
@@ -91,7 +82,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:56
 #, no-c-format
 msgid ""
 "<emphasis>event notifications</emphasis> decouple event producers from event "
@@ -99,7 +89,6 @@
 msgstr ""
 
 #. Tag: para
-#: part3.xml:62
 #, fuzzy, no-c-format
 msgid ""
 "The second major theme of CDI is <emphasis>strong typing</emphasis>. The "
@@ -112,20 +101,18 @@
 "件用戶的相關資訊都包含在編譯器可驗證的 typesafe Java 架構中。"
 
 #. Tag: para
-#: part3.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "You don't see string-based identifiers in CDI code, not because the "
-"framework is hiding them from you using clever defaulting rules&#8212;so-"
-"called \"configuration by convention\"&#8212;but because there are simply no "
-"strings there to begin with!"
+"framework is hiding them from you using clever defaulting rules—so-called "
+"\"configuration by convention\"—but because there are simply no strings "
+"there to begin with!"
 msgstr ""
 "您在 Web Bean 的程式碼中不會看見基於字串的識別符號,這不是因為 framework 透過"
 "使用預設的規則來將它隱藏起來 &#151; 又稱為「configuration by convention」 "
 "&#151; 而是因為一開始根本就沒有任何字串!"
 
 #. Tag: para
-#: part3.xml:74
 #, no-c-format
 msgid ""
 "The obvious benefit of this approach is that <emphasis>any</emphasis> IDE "
@@ -141,68 +128,57 @@
 "而不是透過名稱時,您可提昇您程式碼的語意層級(semantic level)。"
 
 #. Tag: para
-#: part3.xml:81
 #, fuzzy, no-c-format
 msgid ""
 "CDI encourages you develop annotations that model concepts, for example,"
 msgstr "Web Bean 鼓勵您使用塑造概念的標記,例如"
 
 #. Tag: para
-#: part3.xml:87
 #, no-c-format
 msgid "<literal>@Asynchronous</literal>,"
 msgstr "<literal>@Asynchronous</literal>、"
 
 #. Tag: para
-#: part3.xml:90
 #, no-c-format
 msgid "<literal>@Mock</literal>,"
 msgstr "<literal>@Mock</literal>、"
 
 #. Tag: para
-#: part3.xml:93
 #, no-c-format
 msgid "<literal>@Secure</literal> or"
 msgstr "<literal>@Secure</literal> 或"
 
 #. Tag: para
-#: part3.xml:96
 #, no-c-format
 msgid "<literal>@Updated</literal>,"
 msgstr "<literal>@Updated</literal>、"
 
 #. Tag: para
-#: part3.xml:100
 #, no-c-format
 msgid "instead of using compound names like"
 msgstr "而不是使用像是"
 
 #. Tag: para
-#: part3.xml:104
 #, no-c-format
 msgid "<literal>asyncPaymentProcessor</literal>,"
 msgstr "<literal>asyncPaymentProcessor</literal>、"
 
 #. Tag: para
-#: part3.xml:107
 #, no-c-format
 msgid "<literal>mockPaymentProcessor</literal>,"
 msgstr "<literal>mockPaymentProcessor</literal>、"
 
 #. Tag: para
-#: part3.xml:110
 #, no-c-format
 msgid "<literal>SecurityInterceptor</literal> or"
 msgstr "<literal>SecurityInterceptor</literal> 或是"
 
 #. Tag: para
-#: part3.xml:113
 #, no-c-format
 msgid "<literal>DocumentUpdatedEvent</literal>."
 msgstr "<literal>DocumentUpdatedEvent</literal> 的複合式名稱。"
 
 #. Tag: para
-#: part3.xml:117
 #, no-c-format
 msgid ""
 "The annotations are reusable. They help describe common qualities of "
@@ -215,7 +191,6 @@
 "題。它們讓我們的程式碼變得更文字化且更容易理解。"
 
 #. Tag: para
-#: part3.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "CDI <emphasis>stereotypes</emphasis> take this idea a step further. A "
@@ -232,7 +207,6 @@
 "可重複使用的套件中。"
 
 #. Tag: para
-#: part3.xml:138
 #, fuzzy, no-c-format
 msgid ""
 "We're now ready to meet some more advanced features of CDI. Bear in mind "

Modified: doc/trunk/reference/zh-TW/part4.po
===================================================================
--- doc/trunk/reference/zh-TW/part4.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/part4.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-14 16:59+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,7 +17,6 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: para
-#: part4.xml:5
 #, no-c-format
 msgid ""
 "The third theme of CDI is <emphasis>integration</emphasis>. We've already "
@@ -29,7 +28,6 @@
 msgstr ""
 
 #. Tag: para
-#: part4.xml:12
 #, fuzzy, no-c-format
 msgid ""
 "CDI is also designed to work in concert with technologies outside of the "
@@ -52,7 +50,6 @@
 "Java EE 環境下使用還未屬於該平台的技術變得更為容易。"
 
 #. Tag: para
-#: part4.xml:23
 #, fuzzy, no-c-format
 msgid ""
 "We're about to see how to take full advantage of the Java EE platform in an "

Modified: doc/trunk/reference/zh-TW/part5.po
===================================================================
--- doc/trunk/reference/zh-TW/part5.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/part5.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,7 +15,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: para
-#: part5.xml:5
 #, no-c-format
 msgid ""
 "Weld is the reference implementation of JSR-299, and is used by JBoss AS and "
@@ -27,7 +26,6 @@
 msgstr ""
 
 #. Tag: para
-#: part5.xml:12
 #, no-c-format
 msgid ""
 "Some of the extensions in Weld are portable across JSR-299 implementations "
@@ -37,12 +35,11 @@
 msgstr ""
 
 #. Tag: para
-#: part5.xml:18
 #, no-c-format
 msgid ""
 "If you want to get started quickly using Weld (and, in turn, CDI) with JBoss "
 "AS, GlassFish or Tomcat and experiment with one of the examples, take a look "
-"at <xref linkend=\"gettingstarted\"/>. Otherwise read on for a exhaustive "
+"at <xref linkend=\"gettingstarted\" />. Otherwise read on for a exhaustive "
 "discussion of using Weld in all the environments and application servers it "
 "supports and the Weld extensions."
 msgstr ""

Modified: doc/trunk/reference/zh-TW/producermethods.po
===================================================================
--- doc/trunk/reference/zh-TW/producermethods.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/producermethods.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: producermethods\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-16 12:31+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: producermethods.xml:5
 #, no-c-format
 msgid "Producer methods"
 msgstr "Producer method"
 
 #. Tag: para
-#: producermethods.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "Producer methods let us overcome certain limitations that arise when a "
@@ -37,31 +35,26 @@
 "提及第二個方式。)"
 
 #. Tag: para
-#: producermethods.xml:14
 #, no-c-format
 msgid "According to the spec:"
 msgstr "根據規格:"
 
 #. Tag: para
-#: producermethods.xml:18
 #, no-c-format
 msgid "A producer method acts as a source of objects to be injected, where:"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:22
 #, no-c-format
 msgid "the objects to be injected are not required to be instances of beans,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:25
 #, no-c-format
 msgid "the concrete type of the objects to be injected may vary at runtime or"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:28
 #, no-c-format
 msgid ""
 "the objects require some custom initialization that is not performed by the "
@@ -69,25 +62,21 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:36
 #, fuzzy, no-c-format
 msgid "For example, producer methods let us:"
 msgstr "producer method 的 scope"
 
 #. Tag: para
-#: producermethods.xml:40
 #, no-c-format
 msgid "expose a JPA entity as a bean,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:43
 #, no-c-format
 msgid "expose any JDK class as a bean,"
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:46
 #, no-c-format
 msgid ""
 "define multiple beans, with different scopes or initialization, for the same "
@@ -95,13 +84,11 @@
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:51
 #, no-c-format
 msgid "vary the implementation of a bean type at runtime."
 msgstr ""
 
 #. Tag: para
-#: producermethods.xml:55
 #, no-c-format
 msgid ""
 "In particular, producer methods let us use runtime polymorphism with CDI. As "
@@ -110,55 +97,12 @@
 "is fixed. A producer method has no such limitation:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:61
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@SessionScoped\n"
-"public class Preferences implements Serializable {\n"
-"   private PaymentStrategyType paymentStrategy;\n"
-"   ...\n"
-"   @Produces @Preferred \n"
-"   public PaymentStrategy getPaymentStrategy() {\n"
-"       switch (paymentStrategy) {\n"
-"           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
-"           case CHECK: return new CheckPaymentStrategy();\n"
-"           case PAYPAL: return new PayPalPaymentStrategy();\n"
-"           default: return null;\n"
-"       } \n"
-"   }\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          ChequePaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:63
 #, no-c-format
 msgid "Consider an injection point:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:65
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"    ...\n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:67
 #, no-c-format
 msgid ""
 "This injection point has the same type and qualifier annotations as the "
@@ -168,13 +112,11 @@
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:74
 #, no-c-format
 msgid "Scope of a producer method"
 msgstr "producer method 的 scope"
 
 #. Tag: para
-#: producermethods.xml:76
 #, fuzzy, no-c-format
 msgid ""
 "The scope of the producer method defaults to <literal>@Dependent</literal>, "
@@ -190,7 +132,6 @@
 "現。"
 
 #. Tag: para
-#: producermethods.xml:83
 #, no-c-format
 msgid ""
 "To change this behavior, we can add a <literal>@SessionScoped</literal> "
@@ -199,22 +140,7 @@
 "若要更改此特性,我們可將 <literal>@SessionScoped</literal> 這個標記附加至 "
 "method。"
 
-#. Tag: programlisting
-#: producermethods.xml:87
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy() {\n"
-"    ...\n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:89
 #, no-c-format
 msgid ""
 "Now, when the producer method is called, the returned "
@@ -226,7 +152,6 @@
 "調用。"
 
 #. Tag: para
-#: producermethods.xml:95
 #, no-c-format
 msgid ""
 "A producer method does <emphasis>not</emphasis> inherit the scope of the "
@@ -239,13 +164,11 @@
 msgstr ""
 
 #. Tag: title
-#: producermethods.xml:107
 #, no-c-format
 msgid "Injection into producer methods"
 msgstr "注入 producer method"
 
 #. Tag: para
-#: producermethods.xml:109
 #, no-c-format
 msgid ""
 "There's one potential problem with the code above. The implementations of "
@@ -260,7 +183,6 @@
 "攔截器。"
 
 #. Tag: para
-#: producermethods.xml:116
 #, fuzzy, no-c-format
 msgid ""
 "If this isn't what we want, we can use dependency injection into the "
@@ -269,36 +191,7 @@
 "若這不是我們所想要的,我們可使用依賴注入至 producer method 之中來取得 Web "
 "Bean 的 instance:"
 
-#. Tag: programlisting
-#: producermethods.xml:121
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          CheckPaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
-"                                          ChequePaymentStrategy cps,\n"
-"                                          PayPalPaymentStrategy ppps) {\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-"
@@ -319,7 +212,6 @@
 "外小心!"
 
 #. Tag: para
-#: producermethods.xml:132
 #, fuzzy, no-c-format
 msgid ""
 "There's at least three ways we could go about fixing this bug. We could "
@@ -334,7 +226,6 @@
 "<literal>@Dependent</literal> 或 <literal>@RequestScoped</literal>。"
 
 #. Tag: para
-#: producermethods.xml:139
 #, fuzzy, no-c-format
 msgid ""
 "But a more common solution is to use the special <literal>@New</literal> "
@@ -342,51 +233,16 @@
 msgstr "不過較普遍的解決方式就是使用特殊的 <literal>@New</literal> 綁定標記。"
 
 #. Tag: title
-#: producermethods.xml:144
 #, no-c-format
 msgid "Use of <literal>@New</literal> with producer methods"
 msgstr "使用 <literal>@New</literal> 和 producer method"
 
 #. Tag: para
-#: producermethods.xml:146
 #, no-c-format
 msgid "Consider the following producer method:"
 msgstr "考慮下列 producer method:"
 
-#. Tag: programlisting
-#: producermethods.xml:148
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New CheckPaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"   switch (paymentStrategy) {\n"
-"      case CREDIT_CARD: return ccps;\n"
-"      case CHEQUE: return cps;\n"
-"      case PAYPAL: return ppps;\n"
-"      default: return null;\n"
-"   } \n"
-"}]]>"
-msgstr ""
-"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
-"                                          @New ChequePaymentStrategy cps,\n"
-"                                          @New PayPalPaymentStrategy ppps) "
-"{\n"
-"    switch (paymentStrategy) {\n"
-"        case CREDIT_CARD: return ccps;\n"
-"        case CHEQUE: return cps;\n"
-"        case PAYPAL: return ppps;\n"
-"        default: return null;\n"
-"    } \n"
-"}]]>"
-
 #. Tag: para
-#: producermethods.xml:150
 #, no-c-format
 msgid ""
 "Then a new <emphasis>dependent</emphasis> instance of "
@@ -403,47 +259,25 @@
 "件不會被毀掉。"
 
 #. Tag: title
-#: producermethods.xml:160
 #, fuzzy, no-c-format
 msgid "Disposer methods"
 msgstr "Producer method"
 
 #. Tag: para
-#: producermethods.xml:162
 #, no-c-format
 msgid ""
 "Some producer methods return objects that require explicit destruction. For "
 "example, somebody needs to close this JDBC connection:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:167
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @RequestScoped Connection connect(User user) {\n"
-"   return createConnection(user.getId(), user.getPassword());\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:169
 #, no-c-format
 msgid ""
 "Destruction can be performed by a matching <emphasis>disposer method</"
 "emphasis>, defined by the same class as the producer method:"
 msgstr ""
 
-#. Tag: programlisting
-#: producermethods.xml:172
-#, no-c-format
-msgid ""
-"<![CDATA[void close(@Disposes Connection connection) {\n"
-"   connection.close();\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: producermethods.xml:174
 #, no-c-format
 msgid ""
 "The disposer method must have at least one parameter, annotated "
@@ -456,7 +290,116 @@
 "method automatically."
 msgstr ""
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@SessionScoped\n"
+#~ "public class Preferences implements Serializable {\n"
+#~ "   private PaymentStrategyType paymentStrategy;\n"
+#~ "   ...\n"
+#~ "   @Produces @Preferred \n"
+#~ "   public PaymentStrategy getPaymentStrategy() {\n"
+#~ "       switch (paymentStrategy) {\n"
+#~ "           case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
+#~ "           case CHECK: return new CheckPaymentStrategy();\n"
+#~ "           case PAYPAL: return new PayPalPaymentStrategy();\n"
+#~ "           default: return null;\n"
+#~ "       } \n"
+#~ "   }\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          ChequePaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @Preferred PaymentStrategy paymentStrategy;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "    ...\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy() {\n"
+#~ "    ...\n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          CheckPaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          ChequePaymentStrategy cps,\n"
+#~ "                                          PayPalPaymentStrategy ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          @New CheckPaymentStrategy cps,\n"
+#~ "                                          @New PayPalPaymentStrategy "
+#~ "ppps) {\n"
+#~ "   switch (paymentStrategy) {\n"
+#~ "      case CREDIT_CARD: return ccps;\n"
+#~ "      case CHEQUE: return cps;\n"
+#~ "      case PAYPAL: return ppps;\n"
+#~ "      default: return null;\n"
+#~ "   } \n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Produces @Preferred @SessionScoped\n"
+#~ "public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
+#~ "ccps,\n"
+#~ "                                          @New ChequePaymentStrategy "
+#~ "cps,\n"
+#~ "                                          @New PayPalPaymentStrategy "
+#~ "ppps) {\n"
+#~ "    switch (paymentStrategy) {\n"
+#~ "        case CREDIT_CARD: return ccps;\n"
+#~ "        case CHEQUE: return cps;\n"
+#~ "        case PAYPAL: return ppps;\n"
+#~ "        default: return null;\n"
+#~ "    } \n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "<blockquote> <para>A Web Beans producer method acts as a source of "
 #~ "objects to be injected, where:</para> <itemizedlist> <listitem> <para>the "
 #~ "objects to be injected are not required to be instances of Web Beans,</"

Modified: doc/trunk/reference/zh-TW/resources.po
===================================================================
--- doc/trunk/reference/zh-TW/resources.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/resources.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: resources.xml:5
 #, no-c-format
 msgid "Java EE component environment resources"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:7
 #, no-c-format
 msgid ""
 "Java EE 5 already introduced some limited support for dependency injection, "
@@ -30,7 +28,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:13
 #, no-c-format
 msgid ""
 "Naturally, there is now a slight mismatch with the new style of dependency "
@@ -44,7 +41,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:22
 #, no-c-format
 msgid ""
 "Fields have a duality in that they can both be the target of Java EE "
@@ -57,13 +53,11 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:31
 #, no-c-format
 msgid "Defining a resource"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:33
 #, no-c-format
 msgid ""
 "The CDI specification uses the term <emphasis>resource</emphasis> to refer, "
@@ -72,7 +66,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:38
 #, no-c-format
 msgid ""
 "JDBC <literal>Datasource</literal>s, JMS <literal>Queue</literal>s, "
@@ -82,7 +75,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:43
 #, no-c-format
 msgid ""
 "JPA <literal>EntityManager</literal>s and <literal>EntityManagerFactory</"
@@ -90,19 +82,16 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:46
 #, no-c-format
 msgid "remote EJBs, and"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:49
 #, no-c-format
 msgid "web services"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:53
 #, no-c-format
 msgid ""
 "We declare a resource by annotating a producer field with a component "
@@ -111,61 +100,17 @@
 "<literal>@PersistenceUnit</literal> or <literal>@WebServiceRef</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:57
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @WebServiceRef(lookup=\"java:app/service/Catalog\")\n"
-"Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @Resource(lookup=\"java:global/env/jdbc/CustomerDatasource"
-"\") \n"
-"@CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:61
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceContext(unitName=\"CustomerDatabase\")\n"
-"@CustomerDatabase EntityManager customerDatabasePersistenceContext;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:63
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @PersistenceUnit(unitName=\"CustomerDatabase\") \n"
-"@CustomerDatabase EntityManagerFactory customerDatabasePersistenceUnit;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@Produces @EJB(ejbLink=\"../their.jar#PaymentService\") \n"
-"PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:67
 #, no-c-format
 msgid "The field may be static (but not final)."
 msgstr ""
 
 #. Tag: para
-#: resources.xml:69
 #, no-c-format
 msgid "A resource declaration really contains two pieces of information:"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:73
 #, no-c-format
 msgid ""
 "the JNDI name, EJB link, persistence unit name, or other metadata needed to "
@@ -173,7 +118,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:77
 #, no-c-format
 msgid ""
 "the type and qualifiers that we will use to inject the reference into our "
@@ -181,7 +125,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:82
 #, no-c-format
 msgid ""
 "It might feel strange to be declaring resources in Java code. Isn't this "
@@ -191,53 +134,16 @@
 msgstr ""
 
 #. Tag: title
-#: resources.xml:90
 #, no-c-format
 msgid "Typesafe resource injection"
 msgstr ""
 
 #. Tag: para
-#: resources.xml:92
 #, no-c-format
 msgid "These resources can now be injected in the usual way."
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:96
-#, no-c-format
-msgid "<![CDATA[@Inject Catalog catalog;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:97
-#, no-c-format
-msgid "<![CDATA[@Inject @CustomerDatabase Datasource customerDatabase;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:98
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManager "
-"customerDatabaseEntityManager;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:99
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @CustomerDatabase EntityManagerFactory "
-"customerDatabaseEntityManagerFactory;]]>"
-msgstr ""
-
-#. Tag: programlisting
-#: resources.xml:100
-#, no-c-format
-msgid "<![CDATA[@Inject PaymentService paymentService;]]>"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:102
 #, no-c-format
 msgid ""
 "The bean type and qualifiers of the resource are determined by the producer "
@@ -245,7 +151,6 @@
 msgstr ""
 
 #. Tag: para
-#: resources.xml:106
 #, no-c-format
 msgid ""
 "It might seem like a pain to have to write these extra producer field "
@@ -256,26 +161,12 @@
 "and more typesafe to write"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:113
-#, no-c-format
-msgid "@Inject @CustomerDatabase EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:115
 #, no-c-format
 msgid "instead of"
 msgstr ""
 
-#. Tag: programlisting
-#: resources.xml:117
-#, no-c-format
-msgid "@PersistenceContext(unitName=\"CustomerDatabase\") EntityManager"
-msgstr ""
-
 #. Tag: para
-#: resources.xml:119
 #, no-c-format
 msgid "all over the place?"
 msgstr ""

Modified: doc/trunk/reference/zh-TW/ri-spi.po
===================================================================
--- doc/trunk/reference/zh-TW/ri-spi.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/ri-spi.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ri-spi\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-20 11:43+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: ri-spi.xml:4
 #, fuzzy, no-c-format
 msgid "Integrating Weld into other environments"
 msgstr "將 Web Bean RI 整合入其它環境中"
 
 #. Tag: para
-#: ri-spi.xml:6
 #, no-c-format
 msgid ""
 "If you want to use Weld in another environment, you will need to provide "
@@ -32,13 +30,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:12
 #, fuzzy, no-c-format
 msgid "Enterprise Services"
 msgstr "資源載入"
 
 #. Tag: para
-#: ri-spi.xml:13
 #, no-c-format
 msgid ""
 "If you just want to use managed beans, and not take advantage of enterprise "
@@ -50,7 +46,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:21
 #, no-c-format
 msgid ""
 "All SPIs and APIs described have extensive JavaDoc, which spell out the "
@@ -58,13 +53,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:27
 #, fuzzy, no-c-format
 msgid "The Weld SPI"
 msgstr "Web Beans RI SPI"
 
 #. Tag: para
-#: ri-spi.xml:29
 #, fuzzy, no-c-format
 msgid ""
 "The Weld SPI is located in the <literal>weld-spi</literal> module, and "
@@ -77,7 +70,6 @@
 "特性,您則需要其它 SPI。"
 
 #. Tag: para
-#: ri-spi.xml:35
 #, no-c-format
 msgid ""
 "All interfaces in the SPI support the decorator pattern and provide a "
@@ -88,7 +80,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:41
 #, no-c-format
 msgid ""
 "Weld supports multiple environments. An environment is defined by an "
@@ -102,7 +93,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:50
 #, no-c-format
 msgid ""
 "Weld uses a generic-typed service registry to allow services to be "
@@ -111,18 +101,16 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:56
 #, no-c-format
 msgid "Deployment structure"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:58
 #, no-c-format
 msgid ""
 "An application is often comprised of a number of modules. For example, a "
 "Java EE deployment may contain a number of EJB modules (containing business "
-"logic) and WAR modules (containing the user interface). A container may "
+"logic) and war modules (containing the user interface). A container may "
 "enforce certain <emphasis>accessibility</emphasis> rules which limit the "
 "visibility of classes between modules. CDI allows these same rules to apply "
 "to bean and observer method resolution. As the accessibility rules vary "
@@ -132,13 +120,12 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:67
 #, no-c-format
 msgid ""
 "The CDI specification discusses <emphasis>Bean Deployment Archives</"
-"emphasis> (BDAs)&#8212;archives which are marked as containing beans which "
-"should be deployed to the CDI container, and made available for injection "
-"and resolution. Weld reuses this description of <emphasis>Bean Deployment "
+"emphasis> (BDAs)—archives which are marked as containing beans which should "
+"be deployed to the CDI container, and made available for injection and "
+"resolution. Weld reuses this description of <emphasis>Bean Deployment "
 "Archives</emphasis> in its deployment structure SPI. Each deployment exposes "
 "the BDAs which it contains; each BDA may also reference other which it can "
 "access. Together, the transitive closure of this graph forms the beans which "
@@ -146,7 +133,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:76
 #, no-c-format
 msgid ""
 "To describe the deployment structure to Weld, the container should provide "
@@ -160,7 +146,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:85
 #, no-c-format
 msgid ""
 "As programmatically described beans may result in additional BDAs being "
@@ -170,13 +155,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:92
 #, no-c-format
 msgid "Virtual BDAs"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:93
 #, no-c-format
 msgid ""
 "In a strict container, each BDA might have to explicitly specify which other "
@@ -187,7 +170,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:100
 #, no-c-format
 msgid ""
 "A container, might, for example, use a flat accessibility structure for the "
@@ -196,11 +178,10 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:106
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it's contents to be discovered by Weld&#8212;<literal>BeanDeploymentArchive."
+"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
 "getBeanClasses()</literal> must return all the classes in the BDA, "
 "<literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the "
 "deployment descriptors in the archive, and <literal>BeanDeploymentArchive."
@@ -209,7 +190,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:114
 #, no-c-format
 msgid ""
 "BDA X may also reference another BDA Y whose beans can be resolved by, and "
@@ -220,13 +200,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:122
 #, no-c-format
 msgid "Matching the classloader structure for the deployment"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:124
 #, no-c-format
 msgid ""
 "In practice, you can regard the deployment structure represented by "
@@ -237,7 +215,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:132
 #, no-c-format
 msgid ""
 "To specify the directly accessible BDAs, the container should provide an "
@@ -246,7 +223,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:138
 #, no-c-format
 msgid ""
 "Weld allows the container to describe a circular graph, and will convert a "
@@ -254,7 +230,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:144
 #, no-c-format
 msgid ""
 "Certain services are provided for the whole deployment, whilst some are "
@@ -264,13 +239,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:153
 #, no-c-format
 msgid "EJB descriptors"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:155
 #, no-c-format
 msgid ""
 "Weld delegates EJB 3 bean discovery to the container so that it doesn't "
@@ -279,7 +252,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:160
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>EjbDescriptor</literal> should return the relevant metadata as "
@@ -292,13 +264,11 @@
 "EJB instance 的 interface class 以及 jndi 名稱)。"
 
 #. Tag: title
-#: ri-spi.xml:169
 #, no-c-format
 msgid "EE resource injection and resolution services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:171
 #, no-c-format
 msgid ""
 "All the EE resource services are per-BDA services, and may be provided using "
@@ -307,37 +277,33 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:176
 #, no-c-format
 msgid ""
 "The integrator may choose to provide all EE resource injection services "
 "themselves, using another library or framework. In this case the integrator "
 "should use the <literal>EE</literal> environment, and implement the <xref "
-"linkend=\"injection.services\"/> SPI."
+"linkend=\"injection.services\" /> SPI."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:182
 #, no-c-format
 msgid ""
 "Alternatively, the integrator may choose to use CDI to provide EE resource "
 "injection. In this case, the <literal>EE_INJECT</literal> environment should "
 "be used, and the integrator should implement the <xref linkend=\"ejb."
-"services.resolution\"/>, <xref linkend=\"resource.services\"/> and <xref "
-"linkend=\"jpa.services\"/>."
+"services.resolution\" />, <xref linkend=\"resource.services\" /> and <xref "
+"linkend=\"jpa.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:189
 #, no-c-format
 msgid ""
 "CDI only provides annotation-based EE resource injection; if you wish to "
 "provide deployment descriptor (e.g. <literal>ejb-jar.xml</literal>) "
-"injection, you must use <xref linkend=\"injection.services\"/>."
+"injection, you must use <xref linkend=\"injection.services\" />."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:195
 #, no-c-format
 msgid ""
 "If the container performs EE resource injection, the injected resources must "
@@ -346,7 +312,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:201
 #, no-c-format
 msgid ""
 "If you use a non-EE environment then you may implement any of the EE service "
@@ -355,49 +320,43 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:210
 #, no-c-format
 msgid "EJB services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:212
 #, no-c-format
 msgid "EJB services are split between two interfaces which are both per-BDA."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:216
 #, no-c-format
 msgid ""
 "<literal>EJBServices</literal> is used to resolve local EJBs used to back "
 "session beans, and must always be provided in an EE environment. "
 "<literal>EJBServices.resolveEjb(EjbDescriptor ejbDescriptor)</literal> "
-"returns a wrapper&#8212;<literal>SessionObjectReference</literal>&#8212;"
-"around the EJB reference. This wrapper allows Weld to request a reference "
-"that implements the given business interface, and, in the case of SFSBs, "
-"both request the removal of the EJB from the container and query whether the "
-"EJB has been previously removed."
+"returns a wrapper—<literal>SessionObjectReference</literal>—around the EJB "
+"reference. This wrapper allows Weld to request a reference that implements "
+"the given business interface, and, in the case of SFSBs, both request the "
+"removal of the EJB from the container and query whether the EJB has been "
+"previously removed."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:225
 #, no-c-format
 msgid ""
 "<literal>EJBResolutionServices.resolveEjb(InjectionPoint ij)</literal> "
 "allows the resolution of <literal>@EJB</literal> (for injection into managed "
 "beans). This service is not required if the implementation of <xref linkend="
-"\"injection.services\"/> takes care of <literal>@EJB</literal> injection."
+"\"injection.services\" /> takes care of <literal>@EJB</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:234
 #, no-c-format
 msgid "JPA services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:236
 #, no-c-format
 msgid ""
 "Just as EJB resolution is delegated to the container, resolution of "
@@ -407,23 +366,20 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:242
 #, no-c-format
 msgid ""
 "To allow JPA integration, the <literal>JpaServices</literal> interface "
 "should be implemented. This service is not required if the implementation of "
-"<xref linkend=\"injection.services\"/> takes care of "
+"<xref linkend=\"injection.services\" /> takes care of "
 "<literal>@PersistenceContext</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:251
 #, no-c-format
 msgid "Transaction Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:253
 #, no-c-format
 msgid ""
 "Weld delegates JTA activities to the container. The SPI provides a couple "
@@ -432,7 +388,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:258
 #, no-c-format
 msgid ""
 "Any <literal>javax.transaction.Synchronization</literal> implementation may "
@@ -442,7 +397,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:264
 #, no-c-format
 msgid ""
 "To make it easier to determine whether or not a transaction is currently "
@@ -452,30 +406,26 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:272
 #, fuzzy, no-c-format
 msgid "Resource Services"
 msgstr "資源載入"
 
 #. Tag: para
-#: ri-spi.xml:274
 #, no-c-format
 msgid ""
 "The resolution of <literal>@Resource</literal> (for injection into managed "
 "beans) is delegated to the container. You must provide an implementation of "
 "<literal>ResourceServices</literal> which provides these operations. This "
 "service is not required if the implementation of <xref linkend=\"injection."
-"services\"/> takes care of <literal>@Resource</literal> injection."
+"services\" /> takes care of <literal>@Resource</literal> injection."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:283
 #, fuzzy, no-c-format
 msgid "Injection Services"
 msgstr "資源載入"
 
 #. Tag: para
-#: ri-spi.xml:285
 #, no-c-format
 msgid ""
 "An integrator may wish to use <literal>InjectionServices</literal> to "
@@ -486,7 +436,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:291
 #, no-c-format
 msgid ""
 "<literal>InjectionServices</literal> provides a very simple contract, the "
@@ -497,7 +446,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:298
 #, no-c-format
 msgid ""
 "The <literal>InjectionContext</literal> can be used to discover additional "
@@ -508,13 +456,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:307
 #, fuzzy, no-c-format
 msgid "Security Services"
 msgstr "資源載入"
 
 #. Tag: para
-#: ri-spi.xml:309
 #, no-c-format
 msgid ""
 "In order to obtain the <literal>Principal</literal> representing the current "
@@ -523,13 +469,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:317
 #, no-c-format
 msgid "Bean Validation Services"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:319
 #, no-c-format
 msgid ""
 "In order to obtain the default <literal>ValidatorFactory</literal> for the "
@@ -538,13 +482,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:327
 #, no-c-format
 msgid "Identifying the BDA being addressed"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:329
 #, no-c-format
 msgid ""
 "When a client makes a request to an application which uses Weld, the request "
@@ -555,43 +497,39 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:337
 #, no-c-format
 msgid ""
-"Most Servlet contains use a classloader-per-WAR, this may provide a good way "
+"Most Servlet contains use a classloader-per-war, this may provide a good way "
 "to identify the BDA in use for web requests."
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:343
 #, no-c-format
 msgid ""
 "When Weld needs to identify the BDA, it will use one of these services, "
 "depending on what is servicing the request:"
 msgstr ""
 
-#. Tag: literal
-#: ri-spi.xml:350
+#. Tag: term
 #, no-c-format
-msgid "ServletServices.getBeanDeploymentArchive(ServletContext ctx)"
+msgid ""
+"<literal>ServletServices.getBeanDeploymentArchive(ServletContext ctx)</"
+"literal>"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:352
 #, no-c-format
 msgid ""
-"Identify the WAR in use. The <literal>ServletContext</literal> is provided "
+"Identify the war in use. The <literal>ServletContext</literal> is provided "
 "for additional context."
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:362
 #, no-c-format
 msgid "The bean store"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:364
 #, no-c-format
 msgid ""
 "Weld uses a map like structure to store bean instances - <literal>org.jboss."
@@ -600,13 +538,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:372
 #, no-c-format
 msgid "The application context"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:374
 #, no-c-format
 msgid ""
 "Weld expects the Application Server or other container to provide the "
@@ -616,13 +552,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:383
 #, no-c-format
 msgid "Initialization and shutdown"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:384
 #, no-c-format
 msgid ""
 "The <literal>org.jboss.weld.bootstrap.api.Bootstrap</literal> interface "
@@ -633,7 +567,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:391
 #, no-c-format
 msgid ""
 "The bootstrap is split into phases, container initialization, bean "
@@ -644,7 +577,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:398
 #, no-c-format
 msgid ""
 "To initialize the container, you call <literal>Bootstrap.startInitialization"
@@ -656,7 +588,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:405
 #, no-c-format
 msgid ""
 "Having called <literal>startInitialization()</literal>, the "
@@ -665,7 +596,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:410
 #, no-c-format
 msgid ""
 "To deploy the discovered beans, call <literal>Bootstrap.deployBeans()</"
@@ -673,7 +603,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:414
 #, no-c-format
 msgid ""
 "To validate the deployed beans, call <literal>Bootstrap.validateBeans()</"
@@ -681,7 +610,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:418
 #, no-c-format
 msgid ""
 "To place the container into a state where it can service requests, call "
@@ -689,7 +617,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:423
 #, no-c-format
 msgid ""
 "To shutdown the container you call <literal>Bootstrap.shutdown()</literal>. "
@@ -697,13 +624,11 @@
 msgstr ""
 
 #. Tag: title
-#: ri-spi.xml:431
 #, no-c-format
 msgid "Resource loading"
 msgstr "資源載入"
 
 #. Tag: para
-#: ri-spi.xml:433
 #, fuzzy, no-c-format
 msgid ""
 "Weld needs to load classes and resources from the classpath at various "
@@ -718,13 +643,11 @@
 "literal>:"
 
 #. Tag: title
-#: ri-spi.xml:445
 #, no-c-format
 msgid "The contract with the container"
 msgstr "與 container 的合同"
 
 #. Tag: para
-#: ri-spi.xml:447
 #, fuzzy, no-c-format
 msgid ""
 "There are a number of requirements that Weld places on the container for "
@@ -732,13 +655,11 @@
 msgstr "Web Bean RI 對於 container 有些需求以便達到 API 實做之外的正確的功能。"
 
 #. Tag: term
-#: ri-spi.xml:454
 #, no-c-format
 msgid "Classloader isolation"
 msgstr "Classloader 隔離"
 
 #. Tag: para
-#: ri-spi.xml:458
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into an environment that supports deployment of "
@@ -749,13 +670,11 @@
 "Web Bean 應用程式透過自動的方式,或是透過用戶配置來啟用 classloader 隔離。"
 
 #. Tag: term
-#: ri-spi.xml:466
 #, no-c-format
 msgid "Servlet"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:470
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a Servlet environment you must register "
@@ -768,7 +687,6 @@
 "webbeans.servlet.WebBeansListener</literal> 註冊為一個 Servlet listener,"
 
 #. Tag: para
-#: ri-spi.xml:475
 #, no-c-format
 msgid ""
 "You must ensure that that <literal>WeldListener.contextInitialized()</"
@@ -777,13 +695,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:482
 #, no-c-format
-msgid "<term>JSF</term>"
+msgid "JSF"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:487
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -794,7 +710,6 @@
 "webbeans.servlet.WebBeansListener</literal> 註冊為一個 Servlet listener,"
 
 #. Tag: para
-#: ri-spi.xml:492
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -806,7 +721,6 @@
 "webbeans.servlet.WebBeansListener</literal> 註冊為一個 Servlet listener,"
 
 #. Tag: para
-#: ri-spi.xml:497
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -818,7 +732,6 @@
 "webbeans.servlet.WebBeansListener</literal> 註冊為一個 Servlet listener,"
 
 #. Tag: para
-#: ri-spi.xml:502
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -830,7 +743,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:509
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must obtain the bean "
@@ -840,7 +752,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:516 ri-spi.xml:562
 #, no-c-format
 msgid ""
 "There are a number of ways you can obtain the bean manager for the module. "
@@ -850,7 +761,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:523
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSF environment you must register "
@@ -864,19 +774,16 @@
 "webbeans.servlet.WebBeansListener</literal> 註冊為一個 Servlet listener,"
 
 #. Tag: para
-#: ri-spi.xml:531
 #, no-c-format
 msgid "Weld only supports JSF 1.2 and above."
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:538
 #, no-c-format
-msgid "<term>JSP</term>"
+msgid "JSP"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:543
 #, fuzzy, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must register "
@@ -888,7 +795,6 @@
 "webbeans.servlet.WebBeansListener</literal> 註冊為一個 Servlet listener,"
 
 #. Tag: para
-#: ri-spi.xml:548
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -899,7 +805,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:555
 #, no-c-format
 msgid ""
 "If you are integrating Weld into a JSP environment you must obtain the bean "
@@ -909,20 +814,20 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:572
 #, no-c-format
 msgid "Session Bean Interceptor"
 msgstr "Session Bean 攔截器"
 
 #. Tag: para
-#: ri-spi.xml:576
 #, fuzzy, no-c-format
 msgid ""
-"If you are integrating Weld into an EJB environment you must register "
-"<literal>org.jboss.weld.ejb.SessionBeanInterceptor</literal> as a EJB "
-"interceptor for all EJBs in the application, either automatically, or "
-"through user configuration, for each CDI application which uses enterprise "
-"beans."
+"If you are integrating Weld into an EJB environment you must register the "
+"<literal>aroundInvoke</literal> method of <literal>org.jboss.weld.ejb."
+"SessionBeanInterceptor</literal> as a EJB around-invoke interceptor for all "
+"EJBs in the application, either automatically, or through user "
+"configuration, for each CDI application which uses enterprise beans. If you "
+"are running in a EJB 3.1 environment, you should register this as an around-"
+"timeout interceptor as well."
 msgstr ""
 "若您要將 Web Bean 整合入一個 EJB 環境中,您就必須針對於各個使用 enterprise "
 "bean 的 Web Bean 應用程式來為應用程式中的所有 EJB 透過自動的方式,或是透過用"
@@ -930,7 +835,6 @@
 "註冊為一個 EJB 攔截器。"
 
 #. Tag: para
-#: ri-spi.xml:583
 #, no-c-format
 msgid ""
 "You must register the <literal>SessionBeanInterceptor</literal> as the inner "
@@ -938,13 +842,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:591
 #, fuzzy, no-c-format
 msgid "The <literal>weld-core.jar</literal>"
 msgstr "<literal>webbeans-ri.jar</literal>"
 
 #. Tag: para
-#: ri-spi.xml:595
 #, no-c-format
 msgid ""
 "Weld can reside on an isolated classloader, or on a shared classloader. If "
@@ -956,7 +858,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:601
 #, no-c-format
 msgid ""
 "You can provide your own implementation of <literal>Singleton</literal> and "
@@ -965,7 +866,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:606
 #, no-c-format
 msgid ""
 "Weld also provides an implementation of Thread Context Classloader per "
@@ -973,13 +873,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:613
 #, no-c-format
 msgid "Binding the manager in JNDI"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:617
 #, no-c-format
 msgid ""
 "You should bind the bean manager for the bean deployment archive into JNDI "
@@ -990,13 +888,11 @@
 msgstr ""
 
 #. Tag: term
-#: ri-spi.xml:627
 #, no-c-format
 msgid "Performing CDI injection on Java EE component classes"
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:631
 #, no-c-format
 msgid ""
 "The CDI specification requires the container to provide injection into non-"
@@ -1008,7 +904,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:639
 #, no-c-format
 msgid ""
 "The CDI specification also requires that a <literal>ProcessInjectionTarget</"
@@ -1019,7 +914,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:646
 #, no-c-format
 msgid ""
 "To help the integrator, Weld provides <literal>WeldManager."
@@ -1027,36 +921,7 @@
 "<literal>InjectionTarget</literal> to use."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:651
-#, no-c-format
-msgid ""
-"<![CDATA[// Fire ProcessInjectionTarget, returning the InjectionTarget\n"
-"// to use\n"
-"InjectionTarget it = weldBeanManager.fireProcessInjectionTarget(clazz);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = beanManager.createCreationalContext(null);\n"
-"\n"
-"// Produce the instance, performing any constructor injection required\n"
-"Object instance = it.produce();\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
-
 #. Tag: para
-#: ri-spi.xml:652
 #, no-c-format
 msgid ""
 "The container may intersperse other operations between these calls. Further, "
@@ -1065,7 +930,6 @@
 msgstr ""
 
 #. Tag: para
-#: ri-spi.xml:656
 #, no-c-format
 msgid ""
 "When performing injections on EJBs you must use the Weld-defined SPI, "
@@ -1074,42 +938,6 @@
 "EJB."
 msgstr ""
 
-#. Tag: programlisting
-#: ri-spi.xml:661
-#, no-c-format
-msgid ""
-"<![CDATA[// Obtain the EjbDescriptor for the EJB\n"
-"// You may choose to use this utility method to get the descriptor\n"
-"EjbDescriptor<?> ejbDescriptor = beanManager.getEjbDescriptor(ejbName);\n"
-"\n"
-"// Get an the Bean object\n"
-"Bean<?> bean = beanManager.getBean(ejbDescriptor);\n"
-"\n"
-"// Create the injection target\n"
-"InjectionTarget it = deploymentBeanManager.createInjectionTarget"
-"(ejbDescriptor);\n"
-"\n"
-"// Per instance required, create the creational context\n"
-"CreationalContext<?> cc = deploymentBeanManager.createCreationalContext"
-"(bean);\n"
-"\n"
-"// Perform injection and call initializers\n"
-"it.inject(instance, cc);\n"
-"\n"
-"// You may choose to have CDI call the post construct and pre destroy\n"
-"// lifecycle callbacks\n"
-"\n"
-"// Call the post-construct callback\n"
-"it.postConstruct(instance);\n"
-"\n"
-"// Call the pre-destroy callback\n"
-"it.preDestroy(instance);\n"
-"\n"
-"// Clean up the instance\n"
-"it.dispose();\n"
-"cc.release();]]>"
-msgstr ""
-
 #, fuzzy
 #~ msgid ""
 #~ "Currently Web Beans only runs in JBoss AS 5; integrating the RI into "

Modified: doc/trunk/reference/zh-TW/scopescontexts.po
===================================================================
--- doc/trunk/reference/zh-TW/scopescontexts.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/scopescontexts.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: scopescontexts\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-20 16:49+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: scopescontexts.xml:5
 #, no-c-format
 msgid "Scopes and contexts"
 msgstr "Scope 與 context"
 
 #. Tag: para
-#: scopescontexts.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "So far, we've seen a few examples of <emphasis>scope type annotations</"
@@ -37,26 +35,22 @@
 "instance。根據 Web Bean 規格,scope 可決定:"
 
 #. Tag: para
-#: scopescontexts.xml:16
 #, fuzzy, no-c-format
 msgid "When a new instance of any bean with that scope is created"
 msgstr "任何含有該 scope 的 Web Bean 的新 instance 應何時被建立"
 
 #. Tag: para
-#: scopescontexts.xml:19
 #, fuzzy, no-c-format
 msgid "When an existing instance of any bean with that scope is destroyed"
 msgstr "任何含有該 scope 的 Web Bean 的現有 instance 應何時被刪除"
 
 #. Tag: para
-#: scopescontexts.xml:22
 #, fuzzy, no-c-format
 msgid ""
 "Which injected references refer to any instance of a bean with that scope"
 msgstr "哪個被注入的參照代表含有該 scope 的 Web Bean 的任何 instance"
 
 #. Tag: para
-#: scopescontexts.xml:27
 #, fuzzy, no-c-format
 msgid ""
 "For example, if we have a session-scoped bean, <literal>CurrentUser</"
@@ -73,7 +67,6 @@
 "就會自動地被建立,並且在這個 session 結束時被自動地刪除掉。"
 
 #. Tag: para
-#: scopescontexts.xml:35
 #, no-c-format
 msgid ""
 "JPA entities aren't a great fit for this model. Entities have their whole "
@@ -86,13 +79,11 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:45
 #, no-c-format
 msgid "Scope types"
 msgstr "Scope type"
 
 #. Tag: para
-#: scopescontexts.xml:47
 #, fuzzy, no-c-format
 msgid ""
 "CDI features an <emphasis>extensible context model</emphasis>. It's possible "
@@ -101,22 +92,7 @@
 "Web Bean 含有著一個 <emphasis>extensible context model(可延伸的 context 模"
 "型)</emphasis>。您可藉由建立新的 scope 類型標記來定義新的 scope:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:52
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ScopeType\n"
-"@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"public @interface ClusterScoped {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target({TYPE, METHOD})\n"
-"@ScopeType\n"
-"public @interface ClusterScoped {}]]>"
-
 #. Tag: para
-#: scopescontexts.xml:54
 #, fuzzy, no-c-format
 msgid ""
 "Of course, that's the easy part of the job. For this scope type to be "
@@ -132,7 +108,6 @@
 "(framework development)上。"
 
 #. Tag: para
-#: scopescontexts.xml:61
 #, fuzzy, no-c-format
 msgid ""
 "We can apply a scope type annotation to a bean implementation class to "
@@ -141,66 +116,47 @@
 "我們可套用一個 scope 類型標記至一個 Web Bean 實做 class 來指定 Web Bean 的 "
 "scope:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:65
-#, no-c-format
-msgid ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-msgstr ""
-"<![CDATA[@ClusterScoped\n"
-"public class SecondLevelCache { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:67
 #, fuzzy, no-c-format
 msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr "您通常會使用到其中一個 Web Bean 的內建 scope。"
 
 #. Tag: title
-#: scopescontexts.xml:72
 #, no-c-format
 msgid "Built-in scopes"
 msgstr "內建 scope"
 
 #. Tag: para
-#: scopescontexts.xml:74
 #, fuzzy, no-c-format
 msgid "CDI defines four built-in scopes:"
 msgstr "Web Bean 定義了四個內建的 scope:"
 
-#. Tag: literal
-#: scopescontexts.xml:78
-#, no-c-format
-msgid "@RequestScoped"
-msgstr "@RequestScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@RequestScoped</literal>"
+msgstr "<literal>@New</literal> 標記"
 
-#. Tag: literal
-#: scopescontexts.xml:81
-#, no-c-format
-msgid "@SessionScoped"
-msgstr "@SessionScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@SessionScoped</literal>"
+msgstr "<literal>@New</literal> 標記"
 
-#. Tag: literal
-#: scopescontexts.xml:84
-#, no-c-format
-msgid "@ApplicationScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@ApplicationScoped</literal>"
 msgstr "@ApplicationScoped"
 
-#. Tag: literal
-#: scopescontexts.xml:87
-#, no-c-format
-msgid "@ConversationScoped"
+#. Tag: para
+#, fuzzy, no-c-format
+msgid "<literal>@ConversationScoped</literal>"
 msgstr "@ConversationScoped"
 
 #. Tag: para
-#: scopescontexts.xml:91
 #, fuzzy, no-c-format
 msgid "For a web application that uses CDI:"
 msgstr "使用 Web Bean 的網站應用程式:"
 
 #. Tag: para
-#: scopescontexts.xml:95
 #, no-c-format
 msgid ""
 "any servlet request has access to active request, session and application "
@@ -209,13 +165,11 @@
 "任何 servlet 請求都可存取 active request、session 和應用程式 scope,另外"
 
 #. Tag: para
-#: scopescontexts.xml:100
 #, no-c-format
 msgid "any JSF request has access to an active conversation scope."
 msgstr "任何 JSF 請求也都能存取一個現行的 conversation scope。"
 
 #. Tag: para
-#: scopescontexts.xml:105
 #, no-c-format
 msgid ""
 "A CDI extension can implement support for the conversation scope in other "
@@ -223,49 +177,41 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:108
 #, no-c-format
 msgid "The request and application scopes are also active:"
 msgstr "請求和應用程式 scope 在下列情況中會是有效的:"
 
 #. Tag: para
-#: scopescontexts.xml:112
 #, no-c-format
 msgid "during invocations of EJB remote methods,"
 msgstr "當調用 EJB 的遠端 method 時、"
 
 #. Tag: para
-#: scopescontexts.xml:115
 #, fuzzy, no-c-format
 msgid "during invocations of EJB asynchronous methods,"
 msgstr "當調用 EJB 的遠端 method 時、"
 
 #. Tag: para
-#: scopescontexts.xml:118
 #, no-c-format
 msgid "during EJB timeouts,"
 msgstr "當 EJB 逾時時、"
 
 #. Tag: para
-#: scopescontexts.xml:121
 #, fuzzy, no-c-format
 msgid "during message delivery to a message-driven bean,"
 msgstr "當訊息傳送給訊息導向的 bean 時,以及"
 
 #. Tag: para
-#: scopescontexts.xml:124
 #, fuzzy, no-c-format
 msgid "during message delivery to a <literal>MessageListener</literal>, and"
 msgstr "當訊息傳送給訊息導向的 bean 時,以及"
 
 #. Tag: para
-#: scopescontexts.xml:127
 #, no-c-format
 msgid "during web service invocations."
 msgstr "當進行網路服務調用時。"
 
 #. Tag: para
-#: scopescontexts.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "If the application tries to invoke a bean with a scope that does not have an "
@@ -277,7 +223,6 @@
 "literal>。"
 
 #. Tag: para
-#: scopescontexts.xml:136
 #, no-c-format
 msgid ""
 "Managed beans with scope <literal>@SessionScoped</literal> or "
@@ -286,7 +231,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:141
 #, no-c-format
 msgid ""
 "Three of the four built-in scopes should be extremely familiar to every Java "
@@ -297,13 +241,11 @@
 "我們將不花時間在此討論它們。不過在這之中有個 scope 則是新的。"
 
 #. Tag: title
-#: scopescontexts.xml:149
 #, no-c-format
 msgid "The conversation scope"
 msgstr "conversation scope"
 
 #. Tag: para
-#: scopescontexts.xml:151
 #, fuzzy, no-c-format
 msgid ""
 "The conversation scope is a bit like the traditional session scope in that "
@@ -316,13 +258,11 @@
 "scope 不同的地方在於:"
 
 #. Tag: para
-#: scopescontexts.xml:159
 #, no-c-format
 msgid "is demarcated explicitly by the application, and"
 msgstr "conversation scope 已被應用程式明確區分,並且"
 
 #. Tag: para
-#: scopescontexts.xml:162
 #, no-c-format
 msgid ""
 "holds state associated with a particular web browser tab in a JSF "
@@ -331,20 +271,18 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:169
 #, fuzzy, no-c-format
 msgid ""
-"A conversation represents a task&#8212;a unit of work from the point of view "
-"of the user. The conversation context holds state associated with what the "
-"user is currently working on. If the user is doing multiple things at the "
-"same time, there are multiple conversations."
+"A conversation represents a task—a unit of work from the point of view of "
+"the user. The conversation context holds state associated with what the user "
+"is currently working on. If the user is doing multiple things at the same "
+"time, there are multiple conversations."
 msgstr ""
 "Conversation(對話)代表一項工作,從用戶角度來看是項工作的單位。conversation "
 "的 context 持有和用戶目前工作相關的狀態。若用戶同時間一次進行多項工作的話,那"
 "就會有多個 conversation。"
 
 #. Tag: para
-#: scopescontexts.xml:175
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context is active during any JSF request. Most "
@@ -357,13 +295,11 @@
 "狀態,它便需要被明確地轉為 <emphasis>long-running conversation</emphasis>。"
 
 #. Tag: title
-#: scopescontexts.xml:182
 #, no-c-format
 msgid "Conversation demarcation"
 msgstr "Conversation demarcation(對話區分)"
 
 #. Tag: para
-#: scopescontexts.xml:184
 #, fuzzy, no-c-format
 msgid ""
 "CDI provides a built-in bean for controlling the lifecycle of conversations "
@@ -372,14 +308,7 @@
 "Web Bean 提供了一個內建的 Web Bean,它可被用來在 JSF 應用程式中控制 "
 "conversation 的生命週期。這個 Web Bean 能透過注入下列來取得:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:189
-#, fuzzy, no-c-format
-msgid "@Inject Conversation conversation;"
-msgstr "@Current Conversation conversation;"
-
 #. Tag: para
-#: scopescontexts.xml:191
 #, no-c-format
 msgid ""
 "To promote the conversation associated with the current request to a long-"
@@ -394,7 +323,6 @@
 "()</literal>。"
 
 #. Tag: para
-#: scopescontexts.xml:197
 #, fuzzy, no-c-format
 msgid ""
 "In the following example, a conversation-scoped bean controls the "
@@ -403,72 +331,7 @@
 "在下列範例中,有個 conversation-scoped 的 Web Bean 會控制和它關聯的 "
 "conversation:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:201
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"   private Order order;\n"
-"   private @Inject Conversation conversation;\n"
-"   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
-"   \n"
-"   @Produces public Order getOrder() {\n"
-"      return order;\n"
-"   }\n"
-"\n"
-"   public Order createOrder() {\n"
-"      order = new Order();\n"
-"      conversation.begin();\n"
-"      return order;\n"
-"   }\n"
-"   \n"
-"   public void addLineItem(Product product, int quantity) {\n"
-"      order.add(new LineItem(product, quantity));\n"
-"   }\n"
-"\n"
-"   public void saveOrder(Order order) {\n"
-"      em.persist(order);\n"
-"      conversation.end();\n"
-"   }\n"
-"   \n"
-"   @Remove\n"
-"   public void destroy() {}\n"
-"}]]>"
-msgstr ""
-"@ConversationScoped @Stateful\n"
-"public class OrderBuilder {\n"
-"\n"
-"    private Order order;\n"
-"    private @Current Conversation conversation;\n"
-"    private @PersistenceContext(type=EXTENDED) EntityManager em;\n"
-"    \n"
-"    @Produces public Order getOrder() {\n"
-"        return order;\n"
-"    }\n"
-"\n"
-"    public Order createOrder() {\n"
-"        order = new Order();\n"
-"        conversation.begin();\n"
-"        return order;\n"
-"    }\n"
-"    \n"
-"    public void addLineItem(Product product, int quantity) {\n"
-"        order.add( new LineItem(product, quantity) );\n"
-"    }\n"
-"\n"
-"    public void saveOrder(Order order) {\n"
-"        em.persist(order);\n"
-"        conversation.end();\n"
-"    }\n"
-"    \n"
-"    @Remove\n"
-"    public void destroy() {}\n"
-"    \n"
-"}"
-
 #. Tag: para
-#: scopescontexts.xml:203
 #, fuzzy, no-c-format
 msgid ""
 "This bean is able to control its own lifecycle through use of the "
@@ -479,13 +342,11 @@
 "生命週期。不過有些其它 Web Bean 的生命週期完全取決於另一個物件。"
 
 #. Tag: title
-#: scopescontexts.xml:211
 #, no-c-format
 msgid "Conversation propagation"
 msgstr "Conversation propagation(傳播)"
 
 #. Tag: para
-#: scopescontexts.xml:213
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context automatically propagates with any JSF faces request "
@@ -496,7 +357,6 @@
 "傳播。它不會隨著 non-face 的請求(例如透過連結來瀏覽)自動地傳播。"
 
 #. Tag: para
-#: scopescontexts.xml:218
 #, fuzzy, no-c-format
 msgid ""
 "We can force the conversation to propagate with a non-faces request by "
@@ -513,38 +373,16 @@
 "為 <literal>conversation</literal>。"
 
 #. Tag: para
-#: scopescontexts.xml:225
 #, no-c-format
 msgid "Therefore, the following link propagates the conversation:"
 msgstr "因此,下列連結會傳播 conversation:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:229
-#, no-c-format
-msgid ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-msgstr ""
-"<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</a>]]"
-">"
-
 #. Tag: para
-#: scopescontexts.xml:231
 #, no-c-format
 msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:235
-#, no-c-format
-msgid ""
-"<![CDATA[<h:link outcome=\"/addProduct.xhtml value=\"Add Product\">\n"
-"   <f:param name=\"cid\" value=\"#{conversation.id}\"/>\n"
-"</h:link>]]>"
-msgstr ""
-
 #. Tag: para
-#: scopescontexts.xml:238
 #, fuzzy, no-c-format
 msgid ""
 "The conversation context propagates across redirects, making it very easy to "
@@ -558,21 +396,19 @@
 "況下,Web Bean 管理員會自動地新增一個請求參數至重定向 URL。"
 
 #. Tag: title
-#: scopescontexts.xml:248
 #, no-c-format
 msgid "Conversation timeout"
 msgstr "Conversation timeout(逾時)"
 
 #. Tag: para
-#: scopescontexts.xml:250
 #, fuzzy, no-c-format
 msgid ""
 "The container is permitted to destroy a conversation and all state held in "
 "its context at any time in order to conserve resources. A CDI implementation "
-"will normally do this on the basis of some kind of timeout&#8212;though this "
-"is not required by the specification. The timeout is the period of "
-"inactivity before the conversation is destroyed (as opposed to the amount of "
-"time the conversation is active)."
+"will normally do this on the basis of some kind of timeout—though this is "
+"not required by the specification. The timeout is the period of inactivity "
+"before the conversation is destroyed (as opposed to the amount of time the "
+"conversation is active)."
 msgstr ""
 "Web Bean 管理員能夠隨時隨地刪除它 context 中的 conversation 以及所有狀態以保"
 "留資源。一個 Web Bean 管理員實做一般會利用某種形式的 timeout 來這麼作 &#151; "
@@ -580,7 +416,6 @@
 "經過的休止狀態時間。"
 
 #. Tag: para
-#: scopescontexts.xml:257
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>Conversation</literal> object provides a method to set the "
@@ -590,20 +425,12 @@
 "<literal>Conversation</literal> 這個物件提供了一個能設置 timeout 的 method。"
 "這是個給 Web Bean 管理員的提示,您可忽略該設定。"
 
-#. Tag: programlisting
-#: scopescontexts.xml:262
-#, no-c-format
-msgid "conversation.setTimeout(timeoutInMillis);"
-msgstr "conversation.setTimeout(timeoutInMillis);"
-
 #. Tag: title
-#: scopescontexts.xml:269
 #, fuzzy, no-c-format
 msgid "The singleton pseudo-scope"
 msgstr "dependent pseudo-scope"
 
 #. Tag: para
-#: scopescontexts.xml:271
 #, fuzzy, no-c-format
 msgid ""
 "In addition to the four built-in scopes, CDI also supports two "
@@ -616,7 +443,6 @@
 "scope。"
 
 #. Tag: para
-#: scopescontexts.xml:277
 #, no-c-format
 msgid ""
 "Unlike the other scopes, which belong to the package <literal>javax."
@@ -625,7 +451,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:283
 #, no-c-format
 msgid ""
 "You can guess what \"singleton\" means here. It means a bean that is "
@@ -640,7 +465,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:292
 #, no-c-format
 msgid ""
 "Now, if the singleton instance is a simple, immutable, serializable object "
@@ -651,7 +475,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:298
 #, no-c-format
 msgid ""
 "There are several ways to ensure that the singleton bean remains a singleton "
@@ -659,7 +482,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:302
 #, no-c-format
 msgid ""
 "have the singleton bean implement <literal>writeResolve()</literal> and "
@@ -668,7 +490,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:308
 #, no-c-format
 msgid ""
 "make sure the client keeps only a transient reference to the singleton bean, "
@@ -676,7 +497,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:313
 #, no-c-format
 msgid ""
 "give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
@@ -684,7 +504,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:320
 #, no-c-format
 msgid ""
 "A fourth, better solution is to instead use <literal>@ApplicationScoped</"
@@ -693,13 +512,11 @@
 msgstr ""
 
 #. Tag: title
-#: scopescontexts.xml:326
 #, no-c-format
 msgid "The dependent pseudo-scope"
 msgstr "dependent pseudo-scope"
 
 #. Tag: para
-#: scopescontexts.xml:328
 #, fuzzy, no-c-format
 msgid ""
 "Finally, CDI features the so-called <emphasis>dependent pseudo-scope</"
@@ -711,20 +528,12 @@
 "scope。"
 
 #. Tag: para
-#: scopescontexts.xml:333
 #, fuzzy, no-c-format
 msgid ""
 "For example, this bean has the scope type <literal>@Dependent</literal>:"
 msgstr "比方說,這個 Web Bean 的 scope 類型為 <literal>@Dependent</literal>:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:337
-#, no-c-format
-msgid "<![CDATA[public class Calculator { ... }]]>"
-msgstr "<![CDATA[public class Calculator { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:339
 #, no-c-format
 msgid ""
 "An instance of a dependent bean is never shared between different clients or "
@@ -735,7 +544,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:345
 #, no-c-format
 msgid ""
 "If a Unified EL expression refers to a dependent bean by EL name, an "
@@ -744,7 +552,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:351
 #, no-c-format
 msgid ""
 "If you need to access a bean directly by EL name in a JSF page, you probably "
@@ -759,7 +566,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:361
 #, no-c-format
 msgid ""
 "Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
@@ -767,7 +573,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:366
 #, fuzzy, no-c-format
 msgid ""
 "CDI makes it easy to obtain a dependent instance of a bean, even if the bean "
@@ -777,27 +582,18 @@
 "該 class 或是 EJB bean 已被宣告為一個含有其牠 scope 類型的 Web Bean。"
 
 #. Tag: title
-#: scopescontexts.xml:374
 #, fuzzy, no-c-format
 msgid "The <literal>@New</literal> qualifier"
 msgstr "<literal>@New</literal> 標記"
 
 #. Tag: para
-#: scopescontexts.xml:376
 #, no-c-format
 msgid ""
 "The built-in qualifier <literal>@New</literal> allows us to obtain a "
 "dependent object of a specified class."
 msgstr ""
 
-#. Tag: programlisting
-#: scopescontexts.xml:380
-#, fuzzy, no-c-format
-msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
-msgstr "<![CDATA[@New Calculator calculator;]]>"
-
 #. Tag: para
-#: scopescontexts.xml:382
 #, no-c-format
 msgid ""
 "The class must be a valid managed bean or session bean, but need not be an "
@@ -805,7 +601,6 @@
 msgstr ""
 
 #. Tag: para
-#: scopescontexts.xml:384
 #, fuzzy, no-c-format
 msgid ""
 "This works even if <literal>Calculator</literal> is <emphasis>already</"
@@ -814,18 +609,7 @@
 "就算 <literal>Calculator</literal> <emphasis>已經</emphasis>被宣告為不同 "
 "scope type,這還是有效的,比方說:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:389
-#, no-c-format
-msgid ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-msgstr ""
-"<![CDATA[@ConversationScoped\n"
-"public class Calculator { ... }]]>"
-
 #. Tag: para
-#: scopescontexts.xml:391
 #, no-c-format
 msgid ""
 "So the following injected attributes each get a different instance of "
@@ -834,24 +618,7 @@
 "因此下列已注入的屬性都會各得到一個 <literal>Calculator</literal> 的不同 "
 "instance:"
 
-#. Tag: programlisting
-#: scopescontexts.xml:395
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class PaymentCalc {\n"
-"   @Inject Calculator calculator;\n"
-"   @Inject @New Calculator newCalculator;\n"
-"}]]>"
-msgstr ""
-"<![CDATA[public class PaymentCalc {\n"
-"\n"
-"    @Current Calculator calculator;\n"
-"    @New Calculator newCalculator;\n"
-"\n"
-"}]]>"
-
 #. Tag: para
-#: scopescontexts.xml:397
 #, no-c-format
 msgid ""
 "The <literal>calculator</literal> field has a conversation-scoped instance "
@@ -865,7 +632,6 @@
 "週期取決於擁有它的 <literal>PaymentCalc</literal>。"
 
 #. Tag: para
-#: scopescontexts.xml:403
 #, no-c-format
 msgid ""
 "This feature is particularly useful with producer methods, as we'll see in "
@@ -873,7 +639,136 @@
 msgstr ""
 "這項功能對於 producer method 來講特別有幫助,我們將在下個章節中討論到。"
 
+#, fuzzy
 #~ msgid ""
+#~ "<![CDATA[@ScopeType\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD})\n"
+#~ "public @interface ClusterScoped {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target({TYPE, METHOD})\n"
+#~ "@ScopeType\n"
+#~ "public @interface ClusterScoped {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ClusterScoped\n"
+#~ "public class SecondLevelCache { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ClusterScoped\n"
+#~ "public class SecondLevelCache { ... }]]>"
+
+#~ msgid "@RequestScoped"
+#~ msgstr "@RequestScoped"
+
+#~ msgid "@SessionScoped"
+#~ msgstr "@SessionScoped"
+
+#, fuzzy
+#~ msgid "@Inject Conversation conversation;"
+#~ msgstr "@Current Conversation conversation;"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@ConversationScoped @Stateful\n"
+#~ "public class OrderBuilder {\n"
+#~ "   private Order order;\n"
+#~ "   private @Inject Conversation conversation;\n"
+#~ "   private @PersistenceContext(type = EXTENDED) EntityManager em;\n"
+#~ "   \n"
+#~ "   @Produces public Order getOrder() {\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public Order createOrder() {\n"
+#~ "      order = new Order();\n"
+#~ "      conversation.begin();\n"
+#~ "      return order;\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   public void addLineItem(Product product, int quantity) {\n"
+#~ "      order.add(new LineItem(product, quantity));\n"
+#~ "   }\n"
+#~ "\n"
+#~ "   public void saveOrder(Order order) {\n"
+#~ "      em.persist(order);\n"
+#~ "      conversation.end();\n"
+#~ "   }\n"
+#~ "   \n"
+#~ "   @Remove\n"
+#~ "   public void destroy() {}\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@ConversationScoped @Stateful\n"
+#~ "public class OrderBuilder {\n"
+#~ "\n"
+#~ "    private Order order;\n"
+#~ "    private @Current Conversation conversation;\n"
+#~ "    private @PersistenceContext(type=EXTENDED) EntityManager em;\n"
+#~ "    \n"
+#~ "    @Produces public Order getOrder() {\n"
+#~ "        return order;\n"
+#~ "    }\n"
+#~ "\n"
+#~ "    public Order createOrder() {\n"
+#~ "        order = new Order();\n"
+#~ "        conversation.begin();\n"
+#~ "        return order;\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    public void addLineItem(Product product, int quantity) {\n"
+#~ "        order.add( new LineItem(product, quantity) );\n"
+#~ "    }\n"
+#~ "\n"
+#~ "    public void saveOrder(Order order) {\n"
+#~ "        em.persist(order);\n"
+#~ "        conversation.end();\n"
+#~ "    }\n"
+#~ "    \n"
+#~ "    @Remove\n"
+#~ "    public void destroy() {}\n"
+#~ "    \n"
+#~ "}"
+
+#~ msgid ""
+#~ "<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</"
+#~ "a>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<a href=\"/addProduct.jsp?cid=#{conversation.id}\">Add Product</"
+#~ "a>]]>"
+
+#~ msgid "conversation.setTimeout(timeoutInMillis);"
+#~ msgstr "conversation.setTimeout(timeoutInMillis);"
+
+#~ msgid "<![CDATA[public class Calculator { ... }]]>"
+#~ msgstr "<![CDATA[public class Calculator { ... }]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[@Inject @New Calculator calculator;]]>"
+#~ msgstr "<![CDATA[@New Calculator calculator;]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@ConversationScoped\n"
+#~ "public class Calculator { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@ConversationScoped\n"
+#~ "public class Calculator { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class PaymentCalc {\n"
+#~ "   @Inject Calculator calculator;\n"
+#~ "   @Inject @New Calculator newCalculator;\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[public class PaymentCalc {\n"
+#~ "\n"
+#~ "    @Current Calculator calculator;\n"
+#~ "    @New Calculator newCalculator;\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
 #~ "holds state associated with a particular web browser tab in a JSF "
 #~ "application."
 #~ msgstr "它在 JSF 應用程式中會持有和特定網站瀏覽器分頁相關的狀態。"

Modified: doc/trunk/reference/zh-TW/specialization.po
===================================================================
--- doc/trunk/reference/zh-TW/specialization.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/specialization.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: specialization\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-20 11:42+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: specialization.xml:5
 #, no-c-format
 msgid "Specialization, inheritance and alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:7
 #, no-c-format
 msgid ""
 "When you first start developing with CDI, you'll likely be dealing only with "
@@ -38,7 +36,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:16
 #, no-c-format
 msgid ""
 "The CDI specification recognizes two distinct scenarios in which one bean "
@@ -46,7 +43,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:23
 #, no-c-format
 msgid ""
 "The second bean <emphasis>specializes</emphasis> the first bean in certain "
@@ -55,7 +51,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:29
 #, no-c-format
 msgid ""
 "The second bean is simply reusing the Java implementation, and otherwise "
@@ -64,7 +59,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:37
 #, no-c-format
 msgid ""
 "The second case is the default assumed by CDI. It's possible to have two "
@@ -74,7 +68,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:43
 #, no-c-format
 msgid ""
 "The first case is the exception, and also requires more care. In any given "
@@ -86,13 +79,11 @@
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:51
 #, no-c-format
 msgid "Using alternative stereotypes"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:53
 #, fuzzy, no-c-format
 msgid ""
 "CDI lets you <emphasis>override</emphasis> the implementation of a bean type "
@@ -104,23 +95,7 @@
 "(override)</emphasis>了一個 API 的實做。比方說,下列企業級的 Web Bean 在生"
 "產時提供了 <literal>PaymentProcessor</literal> 這個 API 的一個實做:"
 
-#. Tag: programlisting
-#: specialization.xml:59
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public class DefaultPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless\n"
-"public class CreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:61
 #, fuzzy, no-c-format
 msgid ""
 "But in our staging environment, we don't really want to submit payments to "
@@ -130,46 +105,12 @@
 "不過在我們的中繼環境(staging environment)中,我們利用了不同的 Web Bean 來置"
 "換了 <literal>PaymentProcessor</literal> 的實做:"
 
-#. Tag: programlisting
-#: specialization.xml:66
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless\n"
-"public class CreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:68
 #, no-c-format
-msgid "<para>or</para>"
+msgid "or"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:70
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[public @Alternative\n"
-"class StagingPaymentProcessor \n"
-"      extends DefaultPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@Stateless @Staging @Specializes\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        extends CreditCardPaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:72
 #, no-c-format
 msgid ""
 "We've already seen how we can enable this alternative by listing its class "
@@ -177,7 +118,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:77
 #, no-c-format
 msgid ""
 "But suppose we have many alternatives in the staging environment. It would "
@@ -187,67 +127,21 @@
 "this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:84
-#, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Staging {}]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:86
 #, no-c-format
 msgid ""
 "Then we replace the <literal>@Alternative</literal> annotation on our bean "
 "with <literal>@Staging</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:90
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Staging\n"
-"public class StagingPaymentProcessor \n"
-"      implements PaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@CreditCard @Stateless @Staging\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        implements PaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:92
 #, no-c-format
 msgid ""
 "Finally, we activate the <literal>@Staging</literal> stereotype in the "
 "<literal>beans.xml</literal> descriptor:"
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:96
-#, no-c-format
-msgid ""
-"<![CDATA[<beans\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n"
-"   <alternatives>\n"
-"         <stereotype>org.mycompany.myapp.Staging</stereotype>\n"
-"   </alternatives>\n"
-"</beans>]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:98
 #, no-c-format
 msgid ""
 "Now, no matter how many staging beans we have, they will all be enabled at "
@@ -255,13 +149,11 @@
 msgstr ""
 
 #. Tag: title
-#: specialization.xml:105
 #, no-c-format
 msgid "A minor problem with alternatives"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:107
 #, no-c-format
 msgid ""
 "When we enable an alternative, does that mean the default implementation is "
@@ -270,15 +162,7 @@
 "not, you could still inject the default implementation."
 msgstr ""
 
-#. Tag: programlisting
-#: specialization.xml:113
-#, no-c-format
-msgid ""
-"<![CDATA[@Inject @LargeTransaction PaymentProcessor paymentProcessor;]]>"
-msgstr ""
-
 #. Tag: para
-#: specialization.xml:115
 #, no-c-format
 msgid ""
 "So we haven't completely replaced the default implementation in this "
@@ -291,7 +175,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:123
 #, fuzzy, no-c-format
 msgid ""
 "CDI provides a special feature, called <emphasis>specialization</emphasis>, "
@@ -304,13 +187,11 @@
 "上卻相當易於使用,並且您將會慶幸擁有它所提供的額外安全性。"
 
 #. Tag: title
-#: specialization.xml:132
 #, no-c-format
 msgid "Using specialization"
 msgstr "使用 specialization"
 
 #. Tag: para
-#: specialization.xml:134
 #, no-c-format
 msgid ""
 "When the goal is to replace one bean implementation with a second, to help "
@@ -318,13 +199,11 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:141
 #, no-c-format
 msgid "directly extend the bean class of the second bean, or"
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:146
 #, no-c-format
 msgid ""
 "directly override the producer method, in the case that the second bean is a "
@@ -332,31 +211,13 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:152
 #, fuzzy, no-c-format
 msgid ""
 "explicitly declare that it <emphasis>specializes</emphasis> the second bean:"
 msgstr ""
 "優先權較高的 Web Bean 會 <emphasis>specializes</emphasis> 它的 superclass。"
 
-#. Tag: programlisting
-#: specialization.xml:154
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative @Specializes\n"
-"public class MockCreditCardPaymentProcessor \n"
-"      extends CreditCardPaymentProcessor {\n"
-"   ...\n"
-"}]]>"
-msgstr ""
-"@Stateless @Staging @Specializes\n"
-"public class StagingCreditCardPaymentProcessor \n"
-"        extends CreditCardPaymentProcessor {\n"
-"    ...\n"
-"}"
-
 #. Tag: para
-#: specialization.xml:156
 #, no-c-format
 msgid ""
 "When an enabled bean specializes another bean, the other bean is never "
@@ -365,7 +226,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:161
 #, no-c-format
 msgid ""
 "So why does specialization work, and what does it have to do with "
@@ -373,7 +233,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:165
 #, no-c-format
 msgid ""
 "Since we're informing the container that our alternative bean is meant to "
@@ -385,7 +244,6 @@
 msgstr ""
 
 #. Tag: para
-#: specialization.xml:172
 #, no-c-format
 msgid ""
 "Furthermore, if the default implementation declares a bean EL name using "
@@ -393,6 +251,75 @@
 "alternative bean."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public class DefaultPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless\n"
+#~ "public class CreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[public @Alternative\n"
+#~ "class StagingPaymentProcessor \n"
+#~ "      extends DefaultPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Stateless @Staging @Specializes\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        extends CreditCardPaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Staging\n"
+#~ "public class StagingPaymentProcessor \n"
+#~ "      implements PaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@CreditCard @Stateless @Staging\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        implements PaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative @Specializes\n"
+#~ "public class MockCreditCardPaymentProcessor \n"
+#~ "      extends CreditCardPaymentProcessor {\n"
+#~ "   ...\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "@Stateless @Staging @Specializes\n"
+#~ "public class StagingCreditCardPaymentProcessor \n"
+#~ "        extends CreditCardPaymentProcessor {\n"
+#~ "    ...\n"
+#~ "}"
+
 #~ msgid "Specialization"
 #~ msgstr "專門化(Specialization)"
 

Modified: doc/trunk/reference/zh-TW/stereotypes.po
===================================================================
--- doc/trunk/reference/zh-TW/stereotypes.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/stereotypes.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: stereotypes\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-13 15:44+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,19 +17,16 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: stereotypes.xml:5
 #, no-c-format
 msgid "Stereotypes"
 msgstr "主要探討模板(Stereotypes)"
 
 #. Tag: para
-#: stereotypes.xml:7
 #, no-c-format
 msgid "The CDI specification defines a stereotype as follows:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:11
 #, fuzzy, no-c-format
 msgid ""
 "In many systems, use of architectural patterns produces a set of recurring "
@@ -42,31 +39,26 @@
 "的 Web Bean 宣告一些共通 metadata。"
 
 #. Tag: para
-#: stereotypes.xml:17
 #, no-c-format
 msgid "A stereotype encapsulates any combination of:"
 msgstr "主要探討模板包含著下列任意的各種組合:"
 
 #. Tag: para
-#: stereotypes.xml:21
 #, fuzzy, no-c-format
 msgid "a default scope, and"
 msgstr "預設的 scope 類型、"
 
 #. Tag: para
-#: stereotypes.xml:24
 #, fuzzy, no-c-format
 msgid "a set of interceptor bindings."
 msgstr "一組攔截器綁定標記。"
 
 #. Tag: para
-#: stereotypes.xml:28
 #, no-c-format
 msgid "A stereotype may also specify that:"
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:34
 #, fuzzy, no-c-format
 msgid "all beans with the stereotype have defaulted bean EL names, or that"
 msgstr ""
@@ -74,13 +66,11 @@
 "名稱。"
 
 #. Tag: para
-#: stereotypes.xml:37
 #, no-c-format
 msgid "all beans with the stereotype are alternatives."
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:41
 #, no-c-format
 msgid ""
 "A bean may declare zero, one or multiple stereotypes. Stereotype annotations "
@@ -88,7 +78,6 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype is an annotation, annotated <literal>@Stereotype</literal>, "
@@ -98,39 +87,12 @@
 "主要探討模板為 Java 標記類型。這個主要探討模板可辨識一些 MVC 架構中的動作 "
 "class:"
 
-#. Tag: programlisting
-#: stereotypes.xml:53
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"...\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:55
 #, fuzzy, no-c-format
 msgid "We use the stereotype by applying the annotation to a bean."
 msgstr "我們藉由套用標記至 Web Bean 來使用主要探討模板。"
 
-#. Tag: programlisting
-#: stereotypes.xml:59
-#, no-c-format
-msgid ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-
 #. Tag: para
-#: stereotypes.xml:61
 #, no-c-format
 msgid ""
 "Of course, we need to apply some other annotations to our stereotype or else "
@@ -138,13 +100,11 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:66
 #, fuzzy, no-c-format
 msgid "Default scope for a stereotype"
 msgstr "主要探討模板的預設 scope 和建置類型"
 
 #. Tag: para
-#: stereotypes.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype may specify a default scope for beans annotated with the "
@@ -153,39 +113,12 @@
 "主要探討模板亦可指定所有還有該主要探討模板的 Web Bean 都含有預設的 Web Bean "
 "名稱。"
 
-#. Tag: programlisting
-#: stereotypes.xml:72
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:74
 #, fuzzy, no-c-format
 msgid "A particular action may still override this default if necessary:"
 msgstr "當然,若有必要的話,有個特定的動作也可置換這些預設值:"
 
-#. Tag: programlisting
-#: stereotypes.xml:78
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Dependent @Action \n"
-"public class DependentScopedLoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Dependent @Mock @Action \n"
-"public class MockLoginAction { ... }]]>"
-
 #. Tag: para
-#: stereotypes.xml:80
 #, no-c-format
 msgid ""
 "Naturally, overriding a single default isn't much use. But remember, "
@@ -193,13 +126,11 @@
 msgstr ""
 
 #. Tag: title
-#: stereotypes.xml:88
 #, no-c-format
 msgid "Interceptor bindings for stereotypes"
 msgstr "主要探討模板的攔截器綁定"
 
 #. Tag: para
-#: stereotypes.xml:90
 #, fuzzy, no-c-format
 msgid ""
 "A stereotype may specify a set of interceptor bindings to be inherited by "
@@ -207,29 +138,7 @@
 msgstr ""
 "主要探討模板可指定一組攔截器綁定來被所有含有該主要探討模板的 Web Bean 繼承。"
 
-#. Tag: programlisting
-#: stereotypes.xml:94
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@WebTier\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "This helps us get technical concerns, like transactions and security, even "
@@ -237,13 +146,11 @@
 msgstr "這可協助我們減少 business code 中技術上的問題!"
 
 #. Tag: title
-#: stereotypes.xml:103
 #, no-c-format
 msgid "Name defaulting with stereotypes"
 msgstr "主要探討模板的名稱預設"
 
 #. Tag: para
-#: stereotypes.xml:105
 #, fuzzy, no-c-format
 msgid ""
 "We can specify that all beans with a certain stereotype have a defaulted EL "
@@ -255,31 +162,7 @@
 "功能為完美的 use case。我們只需要新增一個空的 <literal>@Named</literal> 標記"
 "即可:"
 
-#. Tag: programlisting
-#: stereotypes.xml:110
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Action {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@RequestScoped\n"
-"@Transactional(requiresNew=true)\n"
-"@Secure\n"
-"@Named\n"
-"@WebTier\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:112
 #, fuzzy, no-c-format
 msgid ""
 "Now, the <literal>LoginAction</literal> bean will have the defaulted name "
@@ -289,13 +172,11 @@
 "literal>。"
 
 #. Tag: title
-#: stereotypes.xml:119
 #, fuzzy, no-c-format
 msgid "Alternative stereotypes"
 msgstr "標準主要探討模板"
 
 #. Tag: para
-#: stereotypes.xml:121
 #, no-c-format
 msgid ""
 "A stereotype can indicate that all beans to which it is applied are "
@@ -303,47 +184,19 @@
 "emphasis> lets us classify beans by deployment scenario."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:126
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Alternative\n"
-"@Stereotype\n"
-"@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"public @interface Mock {}]]>"
-msgstr ""
-"<![CDATA[@Retention(RUNTIME)\n"
-"@Target(TYPE)\n"
-"@Stereotype\n"
-"public @interface Action {}]]>"
-
 #. Tag: para
-#: stereotypes.xml:128
 #, no-c-format
 msgid ""
 "We can apply an alternative stereotype to a whole set of beans, and activate "
 "them all with one line of code in <literal>beans.xml</literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:133
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Mock\n"
-"public class MockLoginAction extends LoginAction { ... }]]>"
-msgstr ""
-"<![CDATA[@Action \n"
-"public class LoginAction { ... }]]>"
-
 #. Tag: title
-#: stereotypes.xml:141
 #, fuzzy, no-c-format
 msgid "Stereotype stacking"
 msgstr "主要探討模板(Stereotypes)"
 
 #. Tag: para
-#: stereotypes.xml:143
 #, no-c-format
 msgid ""
 "This may blow your mind a bit, but stereotypes may declare other "
@@ -354,39 +207,18 @@
 msgstr ""
 
 #. Tag: para
-#: stereotypes.xml:150
 #, no-c-format
 msgid ""
 "Here's an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:155
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Auditable\n"
-"@Action\n"
-"@Stereotype\n"
-"@Target(TYPE)\n"
-"@Retention(RUNTIME)\n"
-"public @interface AuditableAction {}]]>"
-msgstr ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {} ]]>"
-
 #. Tag: title
-#: stereotypes.xml:160
 #, fuzzy, no-c-format
 msgid "Built-in stereotypes"
 msgstr "標準主要探討模板"
 
 #. Tag: para
-#: stereotypes.xml:162
 #, fuzzy, no-c-format
 msgid ""
 "We've already met two standard stereotypes defined by the CDI specification: "
@@ -396,33 +228,13 @@
 "<literal>@Interceptor</literal> 與 <literal>@Decorator</literal>。"
 
 #. Tag: para
-#: stereotypes.xml:167
 #, no-c-format
 msgid ""
 "CDI defines one further standard stereotype, <literal>@Model</literal>, "
 "which is expected to be used frequently in web applications:"
 msgstr ""
 
-#. Tag: programlisting
-#: stereotypes.xml:172
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {}]]>"
-msgstr ""
-"<![CDATA[@Named \n"
-"@RequestScoped \n"
-"@Stereotype \n"
-"@Target({TYPE, METHOD}) \n"
-"@Retention(RUNTIME) \n"
-"public @interface Model {} ]]>"
-
 #. Tag: para
-#: stereotypes.xml:174
 #, fuzzy, no-c-format
 msgid ""
 "Instead of using JSF managed beans, just annotate a bean <literal>@Model</"
@@ -431,6 +243,140 @@
 "這個主要探討模板主要用於 JSF。與其使用 JSF 管理的 bean,只要標記一個 "
 "<literal>@Model</literal> Web Bean 然後直接在您的 JSF 頁面中使用它即可。"
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "...\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#~ msgid ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Dependent @Action \n"
+#~ "public class DependentScopedLoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Dependent @Mock @Action \n"
+#~ "public class MockLoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@WebTier\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Named\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Action {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@RequestScoped\n"
+#~ "@Transactional(requiresNew=true)\n"
+#~ "@Secure\n"
+#~ "@Named\n"
+#~ "@WebTier\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Alternative\n"
+#~ "@Stereotype\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "public @interface Mock {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Retention(RUNTIME)\n"
+#~ "@Target(TYPE)\n"
+#~ "@Stereotype\n"
+#~ "public @interface Action {}]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Mock\n"
+#~ "public class MockLoginAction extends LoginAction { ... }]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Action \n"
+#~ "public class LoginAction { ... }]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Auditable\n"
+#~ "@Action\n"
+#~ "@Stereotype\n"
+#~ "@Target(TYPE)\n"
+#~ "@Retention(RUNTIME)\n"
+#~ "public @interface AuditableAction {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {} ]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {}]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Named \n"
+#~ "@RequestScoped \n"
+#~ "@Stereotype \n"
+#~ "@Target({TYPE, METHOD}) \n"
+#~ "@Retention(RUNTIME) \n"
+#~ "public @interface Model {} ]]>"
+
 #~ msgid "According to the Web Beans specification:"
 #~ msgstr "根據 Web Bean 規格:"
 

Modified: doc/trunk/reference/zh-TW/viewlayers.po
===================================================================
--- doc/trunk/reference/zh-TW/viewlayers.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/viewlayers.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-04-19 20:36+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,19 +15,16 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: viewlayers.xml:5
 #, no-c-format
 msgid "Alternative view layers"
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:8
 #, no-c-format
 msgid "Wicket CDI integration"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:10
 #, no-c-format
 msgid ""
 "Weld provides integration between the Apache Wicket web framework and CDI. "
@@ -37,7 +34,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:16
 #, no-c-format
 msgid ""
 "This section describes some of the utilities provided by the Wicket "
@@ -45,13 +41,11 @@
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:22
 #, no-c-format
 msgid "The <literal>WebApplication</literal> class"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:24
 #, no-c-format
 msgid ""
 "Each wicket application must have a <literal>WebApplication</literal> "
@@ -61,7 +55,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:31
 #, no-c-format
 msgid ""
 "If you would prefer not to subclass <literal>WeldApplication</literal>, you "
@@ -71,31 +64,16 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:38
 #, no-c-format
 msgid "For example:"
 msgstr ""
 
-#. Tag: programlisting
-#: viewlayers.xml:41
-#, no-c-format
-msgid ""
-"<![CDATA[public class SampleApplication extends WeldApplication {\n"
-"   @Override\n"
-"   public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: viewlayers.xml:45
 #, no-c-format
 msgid "Conversations with Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:46
 #, no-c-format
 msgid ""
 "Wicket can also take advantage of the conversation scope from CDI, provided "
@@ -103,7 +81,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:52
 #, no-c-format
 msgid ""
 "Setting up the conversation context at the beginning of a Wicket request, "
@@ -111,7 +88,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:58
 #, no-c-format
 msgid ""
 "Storing the id of any long-running conversation in Wicket's metadata when "
@@ -119,7 +95,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:64
 #, no-c-format
 msgid ""
 "Activating the correct long-running conversation based upon which page is "
@@ -127,7 +102,6 @@
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:69
 #, no-c-format
 msgid ""
 "Propagating the conversation context for any long-running conversation to "
@@ -135,13 +109,11 @@
 msgstr ""
 
 #. Tag: title
-#: viewlayers.xml:76
 #, no-c-format
 msgid "Starting and stopping conversations in Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:77
 #, no-c-format
 msgid ""
 "As in JSF applications, a conversation <emphasis>always</emphasis> exists "
@@ -153,27 +125,12 @@
 "</literal> methods:"
 msgstr ""
 
-#. Tag: programlisting
-#: viewlayers.xml:86
-#, no-c-format
-msgid ""
-"<![CDATA[private @Inject Conversation conversation;\n"
-"...\n"
-"// begin a conversation\n"
-"conversation.begin();\n"
-"...\n"
-"// end a conversation\n"
-"conversation.end();]]>"
-msgstr ""
-
 #. Tag: title
-#: viewlayers.xml:91
 #, no-c-format
 msgid "Long running conversation propagation in Wicket"
 msgstr ""
 
 #. Tag: para
-#: viewlayers.xml:92
 #, no-c-format
 msgid ""
 "When a conversation is marked as long-running, the id of that conversation "

Modified: doc/trunk/reference/zh-TW/weldexamples.po
===================================================================
--- doc/trunk/reference/zh-TW/weldexamples.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/weldexamples.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-01-06 12:17+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -14,13 +14,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: weldexamples.xml:5
 #, no-c-format
 msgid "Diving into the Weld examples"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:7
 #, no-c-format
 msgid ""
 "It's time to pull the covers back and dive into the internals of Weld "
@@ -29,13 +27,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:13
 #, no-c-format
 msgid "The numberguess example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:15
 #, no-c-format
 msgid ""
 "In the numberguess application you get 10 attempts to guess a number between "
@@ -44,16 +40,14 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:20
 #, no-c-format
 msgid ""
 "The numberguess example is comprised of a number of beans, configuration "
-"files and Facelets (JSF) views, packaged as a WAR module. Let's start by "
+"files and Facelets (JSF) views, packaged as a war module. Let's start by "
 "examining the configuration files."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:25
 #, no-c-format
 msgid ""
 "All the configuration files for this example are located in <literal>WEB-INF/"
@@ -64,21 +58,7 @@
 "to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:33
-#, no-c-format
-msgid ""
-"<![CDATA[<faces-config version=\"2.0\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd\">\n"
-"</faces-config>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:35
 #, no-c-format
 msgid ""
 "There's also an empty <literal>beans.xml</literal> file, which tells the "
@@ -87,212 +67,120 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:40
 #, no-c-format
 msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:42
+#. Tag: para
 #, no-c-format
+msgid "Enable and initialize the JSF servlet"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"faces.servlet\" coords=\"10\"/> "
-"<area id=\"faces.servlet.mapping\" coords=\"16\"/> <area id=\"faces.default."
-"suffix\" coords=\"21\"/> <area id=\"session.timeout\" coords=\"26\"/> </"
-"areaspec> <programlisting role=\"XML\"><![CDATA[<web-app version=\"2.5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n"
-"   \n"
-"   <display-name>weld-jsf-numberguess-war</display-name>\n"
-"   <description>Weld JSF numberguess example (WAR)</description>\n"
-"\n"
-"   <servlet>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>\n"
-"      <load-on-startup>1</load-on-startup>\n"
-"   </servlet>\n"
-"\n"
-"   <servlet-mapping>\n"
-"      <servlet-name>Faces Servlet</servlet-name>\n"
-"      <url-pattern>*.jsf</url-pattern>\n"
-"   </servlet-mapping>\n"
-"   \n"
-"   <context-param>\n"
-"      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>\n"
-"      <param-value>.xhtml</param-value>\n"
-"   </context-param>\n"
-"\n"
-"   <session-config>\n"
-"      <session-timeout>10</session-timeout>\n"
-"   </session-config>\n"
-"\n"
-"</web-app>]]></programlisting> <calloutlist> <callout arearefs=\"faces."
-"servlet\"> <para> Enable and initialize the JSF servlet </para> </callout> "
-"<callout arearefs=\"faces.servlet.mapping\"> <para> Configure requests for "
-"URLs ending in <literal>.jsf</literal> to be handled by JSF </para> </"
-"callout> <callout arearefs=\"faces.default.suffix\"> <para> Tell JSF that we "
-"will be giving our JSF views (Facelets templates) an extension of <literal>."
-"xhtml</literal> </para> </callout> <callout arearefs=\"session.timeout\"> "
-"<para> Configure a session timeout of 10 minutes </para> </callout> </"
-"calloutlist> </programlistingco> <note> <para> This demo uses JSF 2 as the "
-"view framework, but you can use Weld with any servlet-based web framework, "
-"such as JSF 1.2 or Wicket. </para> </note> <para> Let's take a look at the "
-"main JSF view, <literal>src/main/webapp/home.xhtml</literal>. </para> "
-"<programlistingco> <areaspec> <area id=\"template\" coords=\"8\"/> <area id="
-"\"statusMessages\" coords=\"12\"/> <area id=\"instructions\" coords=\"20\"/> "
-"<area id=\"guess\" coords=\"27\"/> <area id=\"validator\" coords=\"29\"/> "
-"<area id=\"submit\" coords=\"30\"/> </areaspec> <programlisting role=\"XML"
-"\"><![CDATA[<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN"
-"\"\n"
-"   \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
-"<html xmlns=\"http://www.w3.org/1999/xhtml\"\n"
-"   xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n"
-"   xmlns:h=\"http://java.sun.com/jsf/html\"\n"
-"   xmlns:f=\"http://java.sun.com/jsf/core\">\n"
-"\n"
-"   <ui:composition template=\"/template.xhtml\">\n"
-"      <ui:define name=\"content\">\n"
-"         <h1>Guess a number...</h1>\n"
-"         <h:form id=\"numberGuess\">\n"
-"            <div style=\"color: red\">\n"
-"               <h:messages id=\"messages\" globalOnly=\"false\"/>\n"
-"               <h:outputText id=\"Higher\" value=\"Higher!\"\n"
-"                  rendered=\"#{game.number gt game.guess and game.guess ne 0}"
-"\"/>\n"
-"               <h:outputText id=\"Lower\" value=\"Lower!\"\n"
-"                  rendered=\"#{game.number lt game.guess and game.guess ne 0}"
-"\"/>\n"
-"            </div>\n"
-"    \n"
-"            <div>\n"
-"               I'm thinking of a number between #{game.smallest} and #{game."
-"biggest}.\n"
-"               You have #{game.remainingGuesses} guesses remaining.\n"
-"            </div>\n"
-"       \n"
-"            <div>\n"
-"               Your guess: \n"
-"               <h:inputText id=\"inputGuess\" value=\"#{game.guess}\"\n"
-"                  size=\"3\" required=\"true\" disabled=\"#{game.number eq "
-"game.guess}\"\n"
-"                  validator=\"#{game.validateNumberRange}\"/>\n"
-"               <h:commandButton id=\"guessButton\" value=\"Guess\" \n"
-"                  action=\"#{game.check}\" disabled=\"#{game.number eq game."
-"guess}\"/>\n"
-"            </div>\n"
-"            <div>\n"
-"              <h:commandButton id=\"restartButton\" value=\"Reset\" action="
-"\"#{game.reset}\" immediate=\"true\"/>\n"
-"            </div>\n"
-"         </h:form>\n"
-"      </ui:define>\n"
-"   </ui:composition>\n"
-"</html>]]></programlisting> <calloutlist> <callout arearefs=\"template\"> "
-"<para> Facelets is the built-in templating language for JSF. Here we are "
-"wrapping our page in a template which defines the layout. </para> </callout> "
-"<callout arearefs=\"statusMessages\"> <para> There are a number of messages "
-"which can be sent to the user, \"Higher!\", \"Lower!\" and \"Correct!\" </"
-"para> </callout> <callout arearefs=\"instructions\"> <para> As the user "
-"guesses, the range of numbers they can guess gets smaller - this sentence "
-"changes to make sure they know the number range of a valid guess. </para> </"
-"callout> <callout arearefs=\"guess\"> <para> This input field is bound to a "
-"bean property using a value expression. </para> </callout> <callout arearefs="
-"\"validator\"> <para> A validator binding is used to make sure the user "
-"doesn't accidentally input a number outside of the range in which they can "
-"guess - if the validator wasn't here, the user might use up a guess on an "
-"out of bounds number. </para> </callout> <callout arearefs=\"submit\"> "
-"<para> And, of course, there must be a way for the user to send their guess "
-"to the server. Here we bind to an action method on the bean. </para> </"
-"callout> </calloutlist> </programlistingco>"
+"Configure requests for URLs ending in <literal>.jsf</literal> to be handled "
+"by JSF"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:142
 #, no-c-format
 msgid ""
-"The example exists of 4 classes, the first two of which are qualifiers. "
-"First, there is the <literal>@Random</literal> qualifier, used for injecting "
-"a random number:"
+"Tell JSF that we will be giving our JSF views (Facelets templates) an "
+"extension of <literal>.xhtml</literal>"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:147
+#. Tag: para
 #, no-c-format
+msgid "Configure a session timeout of 10 minutes"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface Random {}]]>"
+"This demo uses JSF 2 as the view framework, but you can use Weld with any "
+"servlet-based web framework, such as JSF 1.2 or Wicket."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:149
 #, no-c-format
 msgid ""
-"There is also the <literal>@MaxNumber</literal> qualifier, used for "
-"injecting the maximum number that can be injected:"
+"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
+"literal>."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:154
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@Qualifier\n"
-"@Target( { TYPE, METHOD, PARAMETER, FIELD })\n"
-"@Retention(RUNTIME)\n"
-"public @interface MaxNumber {}\n"
-"]]>"
+"Facelets is the built-in templating language for JSF. Here we are wrapping "
+"our page in a template which defines the layout."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:156
 #, no-c-format
 msgid ""
-"The application-scoped <literal>Generator</literal> class is responsible for "
-"creating the random number, via a producer method. It also exposes the "
-"maximum possible number via a producer method:"
+"There are a number of messages which can be sent to the user, \"Higher!\", "
+"\"Lower!\" and \"Correct!\""
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:161
+#. Tag: para
 #, no-c-format
 msgid ""
-"<![CDATA[@ApplicationScoped\n"
-"public class Generator implements Serializable {\n"
-"\n"
-"   private java.util.Random random = new java.util.Random(System."
-"currentTimeMillis());\n"
-"   \n"
-"   private int maxNumber = 100;\n"
-"   \n"
-"   java.util.Random getRandom() {\n"
-"      return random;\n"
-"   }\n"
-"   \n"
-"   @Produces @Random int next() { \n"
-"      return getRandom().nextInt(maxNumber); \n"
-"   }\n"
-"   \n"
-"   @Produces @MaxNumber int getMaxNumber() {\n"
-"      return maxNumber;\n"
-"   }\n"
-"\n"
-"}]]>"
+"As the user guesses, the range of numbers they can guess gets smaller - this "
+"sentence changes to make sure they know the number range of a valid guess."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:163
 #, no-c-format
+msgid "This input field is bound to a bean property using a value expression."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
+"A validator binding is used to make sure the user doesn't accidentally input "
+"a number outside of the range in which they can guess - if the validator "
+"wasn't here, the user might use up a guess on an out of bounds number."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"And, of course, there must be a way for the user to send their guess to the "
+"server. Here we bind to an action method on the bean."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The example exists of 4 classes, the first two of which are qualifiers. "
+"First, there is the <literal>@Random</literal> qualifier, used for injecting "
+"a random number:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"There is also the <literal>@MaxNumber</literal> qualifier, used for "
+"injecting the maximum number that can be injected:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The application-scoped <literal>Generator</literal> class is responsible for "
+"creating the random number, via a producer method. It also exposes the "
+"maximum possible number via a producer method:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "The <literal>Generator</literal> is application scoped, so we don't get a "
 "different random each time."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:168
 #, no-c-format
 msgid ""
 "The package declaration and imports have been excluded from these listings. "
@@ -300,7 +188,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:174
 #, no-c-format
 msgid ""
 "The final bean in the application is the session-scoped <literal>Game</"
@@ -313,7 +200,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:182
 #, no-c-format
 msgid ""
 "You'll notice that we've also added the <literal>@Named</literal> annotation "
@@ -321,123 +207,32 @@
 "bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:187
-#, no-c-format
-msgid ""
-"<![CDATA[@Named\n"
-"@SessionScoped\n"
-"public class Game implements Serializable {\n"
-"\n"
-"   private int number;\n"
-"   private int guess;\n"
-"   private int smallest;\n"
-"   private int biggest;\n"
-"   private int remainingGuesses;\n"
-"\n"
-"   @Inject @MaxNumber private int maxNumber;\n"
-"   @Inject @Random Instance<Integer> randomNumber;\n"
-"   \n"
-"   public Game() {}\n"
-"   \n"
-"   public void check() {\n"
-"      if (guess > number) {\n"
-"         biggest = guess - 1;\n"
-"      }\n"
-"      else if (guess < number) {\n"
-"         smallest = guess + 1;\n"
-"      }\n"
-"      else if (guess == number) {\n"
-"         FacesContext.getCurrentInstance().addMessage(null, new FacesMessage"
-"(\"Correct!\"));\n"
-"      }\n"
-"      remainingGuesses--;\n"
-"   }\n"
-"   \n"
-"   @PostConstruct\n"
-"   public void reset() {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = randomNumber.get();\n"
-"   }\n"
-"   \n"
-"   public void validateNumberRange(FacesContext context,  UIComponent "
-"toValidate, Object value) {\n"
-"      if (remainingGuesses <= 0) {\n"
-"         FacesMessage message = new FacesMessage(\"No guesses left!\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"         return;\n"
-"      }\n"
-"      int input = (Integer) value;\n"
-"\n"
-"      if (input < smallest || input > biggest) {\n"
-"         ((UIInput) toValidate).setValid(false);\n"
-"\n"
-"         FacesMessage message = new FacesMessage(\"Invalid guess\");\n"
-"         context.addMessage(toValidate.getClientId(context), message);\n"
-"      }\n"
-"   }\n"
-"\n"
-"   public int getNumber() {\n"
-"      return number;\n"
-"   }\n"
-"   \n"
-"   public int getGuess() {\n"
-"      return guess;\n"
-"   }\n"
-"   \n"
-"   public void setGuess(int guess) {\n"
-"      this.guess = guess;\n"
-"   }\n"
-"   \n"
-"   public int getSmallest() {\n"
-"      return smallest;\n"
-"   }\n"
-"   \n"
-"   public int getBiggest() {\n"
-"      return biggest;\n"
-"   }\n"
-"   \n"
-"   public int getRemainingGuesses() {\n"
-"      return remainingGuesses;\n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: title
-#: weldexamples.xml:190
 #, no-c-format
 msgid "The numberguess example in Apache Tomcat or Jetty"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:192
 #, no-c-format
 msgid ""
 "A couple of modifications must be made to the numberguess artifact in order "
 "to deploy it to Tomcat or Jetty. First, Weld must be deployed as a Web "
 "Application library under <literal>WEB-INF/lib</literal> since the servlet "
 "container does not provide the CDI services. For your convenience we provide "
-"a single JAR suitable for running Weld in any servlet container (including "
+"a single jar suitable for running Weld in any servlet container (including "
 "Jetty), <literal>weld-servlet.jar</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:200
 #, no-c-format
 msgid ""
-"You must also include the JARs for JSF, EL, and the common annotations "
+"You must also include the jars for JSF, EL, and the common annotations "
 "(<literal>jsr250-api.jar</literal>), all of which are provided by the Java "
 "EE platform (a Java EE application server). Are you starting to appreciate "
 "why a Java EE platform is worth using?"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:207
 #, no-c-format
 msgid ""
 "Second, we need to explicitly specify the servlet listener in <literal>web."
@@ -445,18 +240,7 @@
 "The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:213
-#, no-c-format
-msgid ""
-"<![CDATA[<listener>\n"
-"   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"</listener>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:215
 #, no-c-format
 msgid ""
 "When Weld boots, it places the <literal>javax.enterprise.inject.spi."
@@ -467,13 +251,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:226
 #, no-c-format
 msgid "The numberguess example for Apache Wicket"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:227
 #, no-c-format
 msgid ""
 "Weld includes a number of portable extensions for JSR-299, including an "
@@ -483,7 +265,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:234
 #, no-c-format
 msgid ""
 "You may want to review the Wicket documentation at <ulink url=\"http://"
@@ -492,7 +273,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:241
 #, no-c-format
 msgid ""
 "Wicket is another environment that relies on the Weld servlet extension. The "
@@ -503,7 +283,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:249
 #, no-c-format
 msgid ""
 "We'll also be using the Eclipse IDE in these examples. Instructions are "
@@ -513,13 +292,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:257
 #, no-c-format
 msgid "Creating the Eclipse project"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:259
 #, no-c-format
 msgid ""
 "To use the Wicket example in Eclipse, you have one of two choices. You can "
@@ -531,17 +308,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:267
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -> Import... -> Maven Projects</"
-"emphasis>. Then, browse to the location of the Wicket numberguess example. "
-"You should see that Eclipse recognizes the existence of a Maven project."
+"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
+"Projects</emphasis>. Then, browse to the location of the Wicket numberguess "
+"example. You should see that Eclipse recognizes the existence of a Maven "
+"project."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:279
 #, no-c-format
 msgid ""
 "This will create a project in your workspace called <literal>weld-wicket-"
@@ -549,7 +325,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:283
 #, no-c-format
 msgid ""
 "You'll notice after importing, the project has a build error. That's because "
@@ -557,21 +332,24 @@
 "<emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> "
 "tab in the window that appears. In the form field labeled \"Active Maven "
 "Profiles (comma separated):\", type <literal>jetty</literal>. That will "
-"enable some extra dependencies that allow the project to compile. You're now "
-"ready to develop!"
+"enable some extra dependencies that allow the project to compile. "
+"Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven "
+"compile plugin when processing resources (recommended)\". That solves an "
+"incompatiblity between the m2eclipse plugin and the Maven enforcer plugin "
+"that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:292
 #, no-c-format
 msgid ""
-"You are also advised to uncheck the box \"Skip Maven compiler when "
-"processing resources\" in the Maven properties screen because of conflicts "
-"with the Maven enforcer plugin."
+"Be sure to uncheck the box \"Skip Maven compile plugin when processing "
+"resources (recommended)\" in the Maven properties screen or else the example "
+"might not run in Eclipse because beans.xml will be missing from the "
+"classpath! See the <ulink url=\"https://issues.sonatype.org/browse/"
+"MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:298
 #, no-c-format
 msgid ""
 "If you are not using the m2eclipse plugin, you have to follow different "
@@ -580,38 +358,26 @@
 "activated, as follows:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:304
-#, no-c-format
-msgid ""
-"<![CDATA[$> cd examples/wicket/numberguess\n"
-"mvn -Pjetty eclipse:eclipse]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:306
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -> Import... -> General -> "
-"Existing Projects into Workspace</emphasis>, select the root directory of "
-"the numberguess example, and click Finish. This will create a project in "
+"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
+"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
+"of the numberguess example, and click Finish. This will create a project in "
 "your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:318
 #, no-c-format
 msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:325
 #, no-c-format
 msgid "Running the example from Eclipse"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:327
 #, no-c-format
 msgid ""
 "This project follows the <literal>wicket-quickstart</literal> approach of "
@@ -626,13 +392,11 @@
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:338
 #, no-c-format
 msgid "Running the example from the command line in JBoss AS or Tomcat"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:340
 #, no-c-format
 msgid ""
 "This example can also be deployed from the command line in a (similar to the "
@@ -642,26 +406,12 @@
 "run:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:346
-#, no-c-format
-msgid "<![CDATA[$> ant deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:348
 #, no-c-format
 msgid "to deploy the example to JBoss AS, and:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:350
-#, no-c-format
-msgid "<![CDATA[$> ant tomcat.deploy]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:352
 #, no-c-format
 msgid ""
 "to deploy the example to Tomcat. You can then access application at <ulink "
@@ -670,33 +420,23 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:357
 #, no-c-format
 msgid ""
 "Alternatively, you can run the application in place on an embedded Jetty "
 "container using the following Maven command:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:362
-#, no-c-format
-msgid "<![CDATA[$> mvn jetty:run -Pjetty]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:364
 #, no-c-format
 msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:371
 #, no-c-format
 msgid "Understanding the code"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:373
 #, no-c-format
 msgid ""
 "The code in the wicket numberguess example is very similar to the JSF-based "
@@ -710,7 +450,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:382
 #, no-c-format
 msgid ""
 "The integration of Weld with Wicket takes advantage of the same qualifier "
@@ -720,13 +459,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:388
 #, no-c-format
 msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:394
 #, no-c-format
 msgid ""
 "Each wicket application must have a <literal>WeldApplication</literal> "
@@ -734,19 +471,7 @@
 "<literal>NumberGuessApplication</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:398
-#, no-c-format
-msgid ""
-"<![CDATA[public class NumberGuessApplication extends WeldApplication {\n"
-"   @Override public Class getHomePage() {\n"
-"      return HomePage.class;\n"
-"   }\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:399
 #, no-c-format
 msgid ""
 "This class specifies which page Wicket should treat as our home page, in our "
@@ -754,7 +479,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:405
 #, no-c-format
 msgid ""
 "In <literal>HomePage</literal>, we see typical Wicket code to set up page "
@@ -762,52 +486,14 @@
 "literal> bean:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:410
-#, no-c-format
-msgid "<![CDATA[@Inject Game game;]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:412
 #, no-c-format
 msgid ""
 "The <literal>Game</literal> bean is can then be used, for example, by the "
 "code for submitting a guess:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:417
-#, no-c-format
-msgid ""
-"<![CDATA[final Component guessButton = new AjaxButton(\"GuessButton\") {\n"
-"   protected void onSubmit(AjaxRequestTarget target, Form form) {\n"
-"      if (game.check()) {\n"
-"         info(\"Correct!\");\n"
-"         setVisible(false);\n"
-"         prompt.setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == 0) {\n"
-"         info(\"Sorry, the answer was \" + game.getNumber());\n"
-"         setVisible(false);\n"
-"         guessLabel.setVisible(false);\n"
-"         inputGuess.setVisible(false);\n"
-"      }\n"
-"      else if (game.getNumber() > game.getGuess()) {\n"
-"         info(\"Higher!\");\n"
-"      }\n"
-"      else if (game.getNumber() < game.getGuess()) {\n"
-"         info(\"Lower\");\n"
-"      }\n"
-"      target.addComponent(form);\n"
-"   } \n"
-"};      ]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:420
 #, no-c-format
 msgid ""
 "All injections may be serialized; actual storage of the bean is managed by "
@@ -816,7 +502,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:425
 #, no-c-format
 msgid ""
 "Wicket components allow injection, but they <emphasis>cannot</emphasis> use "
@@ -826,7 +511,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:433
 #, no-c-format
 msgid ""
 "The example uses AJAX for processing of button events, and dynamically hides "
@@ -835,7 +519,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:440
 #, no-c-format
 msgid ""
 "In order to activate Wicket for this webapp, the Wicket filter is added to "
@@ -843,29 +526,7 @@
 "<literal>web.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:445
-#, no-c-format
-msgid ""
-"<![CDATA[<filter>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-"
-"class>\n"
-"   <init-param>\n"
-"      <param-name>applicationClassName</param-name>\n"
-"      <param-value>org.jboss.weld.examples.wicket.NumberGuessApplication</"
-"param-value>\n"
-"   </init-param>\n"
-"</filter>\n"
-"\n"
-"<filter-mapping>\n"
-"   <filter-name>Wicket Filter</filter-name>\n"
-"   <url-pattern>/*</url-pattern>\n"
-"</filter-mapping>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:447
 #, no-c-format
 msgid ""
 "The servlet listener is still required, as in the Tomcat example, to "
@@ -876,26 +537,12 @@
 "descriptor to be appended to the <literal>web.xml</literal> configuration."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:455
-#, no-c-format
-msgid ""
-"<![CDATA[<web-app version=\"2.4\" ...>\n"
-"   <listener>\n"
-"      <listener-class>org.jboss.weld.environment.servlet.Listener</listener-"
-"class>\n"
-"   </listener>\n"
-"</web-app>]]>"
-msgstr ""
-
 #. Tag: title
-#: weldexamples.xml:464
 #, no-c-format
 msgid "The numberguess example for Java SE with Swing"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:466
 #, no-c-format
 msgid ""
 "This example shows how to use the Weld SE extension to in a Java SE based "
@@ -905,19 +552,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:473
 #, no-c-format
 msgid "To run the example:"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:479
 #, no-c-format
 msgid "Ensure that Maven 2 (version 2.0.10+) is installed and in your PATH"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:484
 #, no-c-format
 msgid ""
 "Ensure that the <literal>JAVA_HOME</literal> environment variable is "
@@ -925,7 +569,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:490
 #, no-c-format
 msgid ""
 "Open a command line or terminal window in the <literal>examples/se/"
@@ -933,19 +576,11 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:496
 #, no-c-format
 msgid "Execute the following command"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:499
-#, no-c-format
-msgid "mvn -Drun"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:503
 #, no-c-format
 msgid ""
 "Let's have a look at the significant code and configuration files that make "
@@ -953,7 +588,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:508
 #, no-c-format
 msgid ""
 "As usual, there is an empty <literal>beans.xml</literal> file in the root "
@@ -962,7 +596,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:514
 #, no-c-format
 msgid ""
 "The game's main logic is located in <literal>Game.java</literal>. Here is "
@@ -970,293 +603,170 @@
 "the web application version:"
 msgstr ""
 
-#. Tag: section
-#: weldexamples.xml:518
+#. Tag: para
 #, no-c-format
 msgid ""
-"<programlistingco> <areaspec> <area id=\"scope\" coords=\"1\"/> <area id="
-"\"name\" coords=\"2\"/> <area id=\"messages1\" coords=\"26\"/> <area id="
-"\"validation\" coords=\"41\"/> <area id=\"reset\" coords=\"73\"/> </"
-"areaspec> <programlisting role=\"JAVA\"><![CDATA[@ApplicationScoped\n"
-"public class Game\n"
-"{\n"
-"\n"
-"   public static final int MAX_NUM_GUESSES = 10;\n"
-"\n"
-"   private Integer number;\n"
-"   private int guess = 0;\n"
-"   private int smallest = 0;\n"
-"\n"
-"   @Inject\n"
-"   @MaxNumber\n"
-"   private int maxNumber;\n"
-"\n"
-"   private int biggest;\n"
-"   private int remainingGuesses = MAX_NUM_GUESSES;\n"
-"   private boolean validNumberRange = true;\n"
-"\n"
-"   @Inject\n"
-"   Generator rndGenerator;\n"
-"\n"
-"   public Game()\n"
-"   {\n"
-"   }\n"
-"\n"
-"   ...\n"
-"\n"
-"   public boolean isValidNumberRange()\n"
-"   {\n"
-"      return validNumberRange;\n"
-"   }\n"
-"\n"
-"   public boolean isGameWon()\n"
-"   {\n"
-"      return guess == number;\n"
-"   }\n"
-"\n"
-"   public boolean isGameLost()\n"
-"   {\n"
-"      return guess != number && remainingGuesses <= 0;\n"
-"   }\n"
-"\n"
-"   public boolean check()\n"
-"   {\n"
-"      boolean result = false;\n"
-"\n"
-"      if (checkNewNumberRangeIsValid())\n"
-"      {\n"
-"         if (guess > number)\n"
-"         {\n"
-"            biggest = guess - 1;\n"
-"         }\n"
-"\n"
-"         if (guess < number)\n"
-"         {\n"
-"            smallest = guess + 1;\n"
-"         }\n"
-"\n"
-"         if (guess == number)\n"
-"         {\n"
-"            result = true;\n"
-"         }\n"
-"\n"
-"         remainingGuesses--;\n"
-"      }\n"
-"\n"
-"      return result;\n"
-"   }\n"
-"\n"
-"   private boolean checkNewNumberRangeIsValid()\n"
-"   {\n"
-"      return validNumberRange = ((guess >= smallest) && (guess <= "
-"biggest));\n"
-"   }\n"
-"\n"
-"   @PostConstruct\n"
-"   public void reset()\n"
-"   {\n"
-"      this.smallest = 0;\n"
-"      this.guess = 0;\n"
-"      this.remainingGuesses = 10;\n"
-"      this.biggest = maxNumber;\n"
-"      this.number = rndGenerator.next();\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"scope\"> <para> The "
-"bean is application scoped rather than session scoped, since an instance of "
-"a Swing application typically represents a single 'session'. </para> </"
-"callout> <callout arearefs=\"name\"> <para> Notice that the bean is not "
-"named, since it doesn't need to be accessed via EL. </para> </callout> "
-"<callout arearefs=\"messages1\"> <para> In Java SE there is no JSF "
-"<literal>FacesContext</literal> to which messages can be added. Instead the "
-"<literal>Game</literal> class provides additional information about the "
-"state of the current game including: </para> <itemizedlist> <listitem> "
-"<para> If the game has been won or lost </para> </listitem> <listitem> "
-"<para> If the most recent guess was invalid </para> </listitem> </"
-"itemizedlist> <para> This allows the Swing UI to query the state of the "
-"game, which it does indirectly via a class called <literal>MessageGenerator</"
-"literal>, in order to determine the appropriate messages to display to the "
-"user during the game. </para> </callout> <callout arearefs=\"validation\"> "
-"<para> Since there is no dedicated validation phase, validation of user "
-"input is performed during the <literal>check()</literal> method. </para> </"
-"callout> <callout arearefs=\"reset\"> <para> The <literal>reset()</literal> "
-"method makes a call to the injected <literal>rndGenerator</literal> in order "
-"to get the random number at the start of each game. Note that it can't use "
-"<literal>Instance.get()</literal> like the JSF example does because there "
-"will not be any active contexts like there are during a JSF request. </para> "
-"</callout> </calloutlist> </programlistingco> <para> The "
-"<literal>MessageGenerator</literal> class depends on the current instance of "
-"<literal>Game</literal> and queries its state in order to determine the "
-"appropriate messages to provide as the prompt for the user's next guess and "
-"the response to the previous guess. The code for <literal>MessageGenerator</"
-"literal> is as follows: </para> <programlistingco> <areaspec> <area id=\"game"
-"\" coords=\"3\"/> <area id=\"challenge\" coords=\"6\"/> <area id=\"result\" "
-"coords=\"17\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA[public "
-"class MessageGenerator\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   public String getChallengeMessage()\n"
-"   {\n"
-"      StringBuilder challengeMsg = new StringBuilder(\"I'm thinking of a "
-"number between \");\n"
-"      challengeMsg.append(game.getSmallest());\n"
-"      challengeMsg.append(\" and \");\n"
-"      challengeMsg.append(game.getBiggest());\n"
-"      challengeMsg.append(\". Can you guess what it is?\");\n"
-"\n"
-"      return challengeMsg.toString();\n"
-"   }\n"
-"\n"
-"   public String getResultMessage()\n"
-"   {\n"
-"      if (game.isGameWon())\n"
-"      {\n"
-"         return \"You guessed it! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (game.isGameLost())\n"
-"      {\n"
-"         return \"You are fail! The number was \" + game.getNumber();\n"
-"      }\n"
-"      else if (!game.isValidNumberRange())\n"
-"      {\n"
-"         return \"Invalid number range!\";\n"
-"      }\n"
-"      else if (game.getRemainingGuesses() == Game.MAX_NUM_GUESSES)\n"
-"      {\n"
-"         return \"What is your first guess?\";\n"
-"      }\n"
-"      else\n"
-"      {\n"
-"         String direction = null;\n"
-"\n"
-"         if (game.getGuess() < game.getNumber())\n"
-"         {\n"
-"            direction = \"Higher\";\n"
-"         }\n"
-"         else\n"
-"         {\n"
-"            direction = \"Lower\";\n"
-"         }\n"
-"\n"
-"         return direction + \"! You have \" + game.getRemainingGuesses() + "
-"\" guesses left.\";\n"
-"      }\n"
-"   }\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"game\"> <para> The "
-"instance of <literal>Game</literal> for the application is injected here. </"
-"para> </callout> <callout arearefs=\"challenge\"> <para> The <literal>Game</"
-"literal>'s state is interrogated to determine the appropriate challenge "
-"message ... </para> </callout> <callout arearefs=\"result\"> <para> ... and "
-"again to determine whether to congratulate, console or encourage the user to "
-"continue. </para> </callout> </calloutlist> </programlistingco> <para> "
+"The bean is application scoped rather than session scoped, since an instance "
+"of a Swing application typically represents a single 'session'."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Notice that the bean is not named, since it doesn't need to be accessed via "
+"EL."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"In Java SE there is no JSF <literal>FacesContext</literal> to which messages "
+"can be added. Instead the <literal>Game</literal> class provides additional "
+"information about the state of the current game including:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the game has been won or lost"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "If the most recent guess was invalid"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This allows the Swing UI to query the state of the game, which it does "
+"indirectly via a class called <literal>MessageGenerator</literal>, in order "
+"to determine the appropriate messages to display to the user during the game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Since there is no dedicated validation phase, validation of user input is "
+"performed during the <literal>check()</literal> method."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>reset()</literal> method makes a call to the injected "
+"<literal>rndGenerator</literal> in order to get the random number at the "
+"start of each game. Note that it can't use <literal>Instance.get()</literal> "
+"like the JSF example does because there will not be any active contexts like "
+"there are during a JSF request."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>MessageGenerator</literal> class depends on the current "
+"instance of <literal>Game</literal> and queries its state in order to "
+"determine the appropriate messages to provide as the prompt for the user's "
+"next guess and the response to the previous guess. The code for "
+"<literal>MessageGenerator</literal> is as follows:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The instance of <literal>Game</literal> for the application is injected here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <literal>Game</literal>'s state is interrogated to determine the "
+"appropriate challenge message ..."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"... and again to determine whether to congratulate, console or encourage the "
+"user to continue."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "Finally we come to the <literal>NumberGuessFrame</literal> class which "
-"provides the Swing front end to our guessing game. </para> "
-"<programlistingco> <areaspec> <area id=\"gameIn\" coords=\"3\"/> <area id="
-"\"messagesIn\" coords=\"6\"/> <area id=\"start\" coords=\"9\"/> <area id="
-"\"init\" coords=\"21\"/> <area id=\"guess1\" coords=\"38\"/> <area id="
-"\"replay\" coords=\"48\"/> </areaspec> <programlisting role=\"JAVA\"><![CDATA"
-"[public class NumberGuessFrame extends javax.swing.JFrame\n"
-"{\n"
-"   @Inject\n"
-"   private Game game;\n"
-"\n"
-"   @Inject\n"
-"   private MessageGenerator msgGenerator;\n"
-"\n"
-"   public void start(@Observes ContainerInitialized event)\n"
-"   {\n"
-"      java.awt.EventQueue.invokeLater(new Runnable()\n"
-"      {\n"
-"         public void run()\n"
-"         {\n"
-"            initComponents();\n"
-"            setVisible(true);\n"
-"         }\n"
-"      });\n"
-"   }\n"
-"\n"
-"   private void initComponents()\n"
-"   {\n"
-"\n"
-"      buttonPanel = new javax.swing.JPanel();\n"
-"      mainMsgPanel = new javax.swing.JPanel();\n"
-"      mainLabel = new javax.swing.JLabel();\n"
-"      messageLabel = new javax.swing.JLabel();\n"
-"      guessText = new javax.swing.JTextField();\n"
-"      ...\n"
-"      mainLabel.setText(msgGenerator.getChallengeMessage());\n"
-"      mainMsgPanel.add(mainLabel);\n"
-"\n"
-"      messageLabel.setText(msgGenerator.getResultMessage());\n"
-"      mainMsgPanel.add(messageLabel);\n"
-"      ...\n"
-"   }\n"
-"\n"
-"   private void guessButtonActionPerformed( java.awt.event.ActionEvent "
-"evt )\n"
-"   {\n"
-"      int guess =  Integer.parseInt(guessText.getText());\n"
-"      game.setGuess( guess );\n"
-"      game.check();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void replayBtnActionPerformed(java.awt.event.ActionEvent evt)\n"
-"   {\n"
-"      game.reset();\n"
-"      refreshUI();\n"
-"   }\n"
-"\n"
-"   private void refreshUI() {\n"
-"      mainLabel.setText( msgGenerator.getChallengeMessage() );\n"
-"      messageLabel.setText( msgGenerator.getResultMessage() );\n"
-"      guessText.setText( \"\" );\n"
-"      guessesLeftBar.setValue( game.getRemainingGuesses() );\n"
-"      guessText.requestFocus();\n"
-"   }\n"
-"\n"
-"   // swing components\n"
-"   private javax.swing.JPanel borderPanel;\n"
-"   ...\n"
-"   private javax.swing.JButton replayBtn;\n"
-"\n"
-"}]]></programlisting> <calloutlist> <callout arearefs=\"gameIn\"> <para> The "
-"injected instance of the game (logic and state). </para> </callout> <callout "
-"arearefs=\"messagesIn\"> <para> The injected message generator for UI "
-"messages. </para> </callout> <callout arearefs=\"start\"> <para> This "
-"application is started in the prescribed Weld SE way, by observing the "
-"<literal>ContainerInitialized</literal> event. </para> </callout> <callout "
-"arearefs=\"init\"> <para> This method initializes all of the Swing "
-"components. Note the use of the <literal>msgGenerator</literal> here. </"
-"para> </callout> <callout arearefs=\"guess1\"> <para> "
+"provides the Swing front end to our guessing game."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected instance of the game (logic and state)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The injected message generator for UI messages."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This application is started in the prescribed Weld SE way, by observing the "
+"<literal>ContainerInitialized</literal> event."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This method initializes all of the Swing components. Note the use of the "
+"<literal>msgGenerator</literal> here."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
-"button is clicked, and it does the following: </para> <itemizedlist> "
-"<listitem> <para> Gets the guess entered by the user and sets it as the "
-"current guess in the <literal>Game</literal> </para> </listitem> <listitem> "
-"<para> Calls <literal>game.check()</literal> to validate and perform one "
-"'turn' of the game </para> </listitem> <listitem> <para> Calls "
-"<literal>refreshUI</literal>. If there were validation errors with the "
+"button is clicked, and it does the following:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Gets the guess entered by the user and sets it as the current guess in the "
+"<literal>Game</literal>"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
+"the game"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Calls <literal>refreshUI</literal>. If there were validation errors with the "
 "input, this will have been captured during <literal>game.check()</literal> "
 "and as such will be reflected in the messages returned by "
 "<literal>MessageGenerator</literal> and subsequently presented to the user. "
 "If there are no validation errors then the user will be told to guess again "
 "(higher or lower) or that the game has ended either in a win (correct guess) "
-"or a loss (ran out of guesses). </para> </listitem> </itemizedlist> </"
-"callout> <callout arearefs=\"replay\"> <para> "
+"or a loss (ran out of guesses)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
 "<literal>replayBtnActionPerformed</literal> simply calls <literal>game.reset"
-"()</literal> to start a new game and refreshes the messages in the UI. </"
-"para> </callout> </calloutlist> </programlistingco>"
+"()</literal> to start a new game and refreshes the messages in the UI."
 msgstr ""
 
 #. Tag: title
-#: weldexamples.xml:716
 #, no-c-format
 msgid "The translator example in depth"
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:718
 #, no-c-format
 msgid ""
 "The translator example will take any sentences you enter, and translate them "
@@ -1265,52 +775,29 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:723
 #, no-c-format
 msgid ""
-"The translator example is built as an EAR and contains EJBs. As a result, "
+"The translator example is built as an ear and contains EJBs. As a result, "
 "it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:729
 #, no-c-format
 msgid ""
-"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a WAR, which "
+"Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a war, which "
 "will make this structure much simpler! Still, there are other advantages of "
-"using an EAR."
+"using an ear."
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:735
 #, no-c-format
 msgid ""
-"First, let's take a look at the EAR aggregator, which is located in the "
+"First, let's take a look at the ear aggregator, which is located in the "
 "example's <literal>ear</literal> directory. Maven automatically generates "
 "the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:740
-#, no-c-format
-msgid ""
-"<![CDATA[<plugin>\n"
-"   <groupId>org.apache.maven.plugins</groupId>\n"
-"   <artifactId>maven-ear-plugin</artifactId>\n"
-"   <configuration>\n"
-"      <modules>\n"
-"         <webModule>\n"
-"            <groupId>org.jboss.weld.examples.jsf.translator</groupId>\n"
-"            <artifactId>weld-jsf-translator-war</artifactId>\n"
-"            <contextRoot>/weld-translator</contextRoot>\n"
-"         </webModule>\n"
-"      </modules>\n"
-"   </configuration>\n"
-"</plugin>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:742
 #, no-c-format
 msgid ""
 "This configuration overrides the web context path, resulting in this "
@@ -1319,44 +806,16 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:748
 #, no-c-format
 msgid ""
 "If you weren't using Maven to generate these files, you would need "
 "<literal>META-INF/application.xml</literal>:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:753
-#, no-c-format
-msgid ""
-"<![CDATA[<application version=\"5\"\n"
-"   xmlns=\"http://java.sun.com/xml/ns/javaee\" \n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"\n"
-"      http://java.sun.com/xml/ns/javaee\n"
-"      http://java.sun.com/xml/ns/javaee/application_5.xsd\">\n"
-"\n"
-"  <display-name>weld-jsf-translator-ear</display-name>\n"
-"  <description>The Weld JSF translator example (EAR)</description>\n"
-"  \n"
-"  <module>\n"
-"    <web>\n"
-"      <web-uri>weld-translator.war</web-uri>\n"
-"      <context-root>/weld-translator</context-root>\n"
-"    </web>\n"
-"  </module>\n"
-"  <module>\n"
-"    <ejb>weld-translator.jar</ejb>\n"
-"  </module>\n"
-"</application>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:756
 #, no-c-format
 msgid ""
-"Next, lets look at the WAR, which is located in the example's <literal>war</"
+"Next, lets look at the war, which is located in the example's <literal>war</"
 "literal> directory. Just as in the numberguess example, we have a "
 "<literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</"
 "literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/"
@@ -1364,7 +823,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:762
 #, no-c-format
 msgid ""
 "More interesting is the JSF view used to translate text. Just as in the "
@@ -1372,41 +830,7 @@
 "here for brevity):"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:767
-#, no-c-format
-msgid ""
-"<![CDATA[<h:form id=\"translator\">\n"
-"\n"
-"   <table>\n"
-"      <tr align=\"center\" style=\"font-weight: bold\">\n"
-"         <td>\n"
-"            Your text\n"
-"         </td>\n"
-"         <td>\n"
-"            Translation\n"
-"         </td>\n"
-"      </tr>\n"
-"      <tr>\n"
-"         <td>\n"
-"            <h:inputTextarea id=\"text\" value=\"#{translator.text}\" "
-"required=\"true\" rows=\"5\" cols=\"80\"/>\n"
-"         </td>\n"
-"         <td>\n"
-"            <h:outputText value=\"#{translator.translatedText}\"/>\n"
-"         </td>\n"
-"      </tr>\n"
-"   </table>\n"
-"   <div>\n"
-"      <h:commandButton id=\"button\" value=\"Translate\" action=\"#"
-"{translator.translate}\"/>\n"
-"   </div>\n"
-"   \n"
-"</h:form>]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:769
 #, no-c-format
 msgid ""
 "The user can enter some text in the left-hand textarea, and hit the "
@@ -1414,7 +838,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:774
 #, no-c-format
 msgid ""
 "Finally, let's look at the EJB module, which is located in the example's "
@@ -1424,7 +847,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:780
 #, no-c-format
 msgid ""
 "We've saved the most interesting bit to last, the code! The project has two "
@@ -1436,7 +858,6 @@
 msgstr ""
 
 #. Tag: para
-#: weldexamples.xml:787
 #, no-c-format
 msgid ""
 "Both <literal>SentenceParser</literal> and <literal>TextTranslator</literal> "
@@ -1444,33 +865,7 @@
 "injection:"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:792
-#, no-c-format
-msgid ""
-"<![CDATA[public class TextTranslator implements Serializable { \n"
-"\n"
-"   private SentenceParser sentenceParser; \n"
-"\n"
-"   @EJB private Translator translator; \n"
-"   \n"
-"   @Inject public TextTranslator(SentenceParser sentenceParser) { \n"
-"      this.sentenceParser = sentenceParser; \n"
-"   }\n"
-"   \n"
-"   public String translate(String text) { \n"
-"      StringBuilder sb = new StringBuilder(); \n"
-"      for (String sentence: sentenceParser.parse(text)) { \n"
-"         sb.append(translator.translate(sentence)).append(\". \"); \n"
-"      } \n"
-"      return sb.toString().trim(); \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:794
 #, no-c-format
 msgid ""
 "<literal>TextTranslator</literal> uses the simple bean (really just a plain "
@@ -1481,22 +876,7 @@
 "convincing enough to anyone who doesn't understand Latin!"
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:802
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateless\n"
-"public class SentenceTranslator implements Translator { \n"
-"\n"
-"   public String translate(String sentence) { \n"
-"      return \"Lorem ipsum dolor sit amet\"; \n"
-"   }\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:804
 #, no-c-format
 msgid ""
 "Finally, there is UI orientated controller. This is a request scoped, named, "
@@ -1505,44 +885,7 @@
 "and setters for all the fields on the page."
 msgstr ""
 
-#. Tag: programlisting
-#: weldexamples.xml:810
-#, no-c-format
-msgid ""
-"<![CDATA[@Stateful\n"
-"@RequestScoped\n"
-"@Named(\"translator\")\n"
-"public class TranslatorControllerBean implements TranslatorController {\n"
-"\n"
-"   @Inject private TextTranslator translator;\n"
-"   \n"
-"   private String inputText;\n"
-"   \n"
-"   private String translatedText;\n"
-"   \n"
-"   public void translate() {\n"
-"      translatedText = translator.translate(inputText);\n"
-"   }\n"
-"   \n"
-"   public String getText() {\n"
-"      return inputText;\n"
-"   }\n"
-"   \n"
-"   public void setText(String text) {\n"
-"      this.inputText = text;\n"
-"   }\n"
-"   \n"
-"   public String getTranslatedText() {\n"
-"      return translatedText;\n"
-"   }\n"
-"   \n"
-"   @Remove public void remove() {}\n"
-"\n"
-"}]]>"
-msgstr ""
-
 #. Tag: para
-#: weldexamples.xml:814
 #, no-c-format
 msgid ""
 "That concludes our short tour of the Weld starter examples. For more "

Modified: doc/trunk/reference/zh-TW/xml.po
===================================================================
--- doc/trunk/reference/zh-TW/xml.po	2010-03-02 13:08:40 UTC (rev 5972)
+++ doc/trunk/reference/zh-TW/xml.po	2010-03-02 13:24:32 UTC (rev 5973)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-11-11 15:00+0000\n"
+"POT-Creation-Date: 2010-03-02T13:07:18\n"
 "PO-Revision-Date: 2009-01-13 11:55+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -17,13 +17,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
-#: xml.xml:5
 #, fuzzy, no-c-format
 msgid "Defining beans using XML"
 msgstr "使用 XML 來定義 Web Bean"
 
 #. Tag: para
-#: xml.xml:7
 #, fuzzy, no-c-format
 msgid ""
 "So far, we've seen plenty of examples of beans declared using annotations. "
@@ -34,19 +32,16 @@
 "況下我們無法透過使用標記來定義 Web Bean:"
 
 #. Tag: para
-#: xml.xml:14
 #, no-c-format
 msgid "when the implementation class comes from some preexisting library, or"
 msgstr "當實做的 class 來自於一些現有的函式庫,或是"
 
 #. Tag: para
-#: xml.xml:19
 #, fuzzy, no-c-format
 msgid "when there should be multiple beans with the same implementation class."
 msgstr "當相同的實做 class 應該要有多重 Web Bean。"
 
 #. Tag: para
-#: xml.xml:25
 #, no-c-format
 msgid ""
 "One way to address these problems is to write a producer method. Weld offers "
@@ -56,7 +51,6 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:31
 #, fuzzy, no-c-format
 msgid ""
 "Many frameworks use XML to provide metadata relating to Java classes. "
@@ -71,7 +65,6 @@
 "讓您使用 class 或是成員名稱來作為 XML 要素的名稱。"
 
 #. Tag: para
-#: xml.xml:38
 #, no-c-format
 msgid ""
 "The advantage of this approach is that you can write an XML schema that "
@@ -85,13 +78,11 @@
 "發環境也能在不需要明確的居中產生步驟的情況下進行相同的驗證。"
 
 #. Tag: title
-#: xml.xml:46
 #, fuzzy, no-c-format
 msgid "Declaring beans"
 msgstr "宣告 Web Bean class"
 
 #. Tag: para
-#: xml.xml:48
 #, fuzzy, no-c-format
 msgid ""
 "For each Java package, Weld defines a corresponding XML namespace. The "
@@ -105,7 +96,6 @@
 "<literal>urn:java:com.mydomain.myapp</literal>。"
 
 #. Tag: para
-#: xml.xml:54
 #, no-c-format
 msgid ""
 "Java types belonging to a package are referred to using an XML element in "
@@ -120,7 +110,6 @@
 "定。"
 
 #. Tag: para
-#: xml.xml:61
 #, no-c-format
 msgid ""
 "For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
@@ -129,24 +118,7 @@
 "比方說,下列這段 XML 中的 <literal>&lt;util:Date/&gt;</literal> 要素代表 "
 "<literal>java.util.Date</literal> 這個 class:"
 
-#. Tag: programlisting
-#: xml.xml:66
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:util=\"urn:java:java.util\">\n"
-"   <util:Date/>\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
-"          xmlns:util=\"urn:java:java.util\">\n"
-"\n"
-"    <util:Date/>\n"
-"\n"
-"</WebBeans>]]>"
-
 #. Tag: para
-#: xml.xml:68
 #, fuzzy, no-c-format
 msgid ""
 "And this is all the code we need to declare that <literal>Date</literal> is "
@@ -156,20 +128,12 @@
 "並且這些為我們需要宣告的所有程式碼,<literal>Date</literal> 是個基本的 Web "
 "Bean!<literal>Date</literal> 的 instance 現在已能被任何其它 Web Bean 注入:"
 
-#. Tag: programlisting
-#: xml.xml:73
-#, fuzzy, no-c-format
-msgid "<![CDATA[private @Inject Date date;]]>"
-msgstr "<![CDATA[@Current Date date]]>"
-
 #. Tag: title
-#: xml.xml:78
 #, fuzzy, no-c-format
 msgid "Declaring bean metadata"
 msgstr "宣告 Web Bean metadata"
 
 #. Tag: para
-#: xml.xml:80
 #, fuzzy, no-c-format
 msgid ""
 "We can declare the scope, deployment type and interceptor binding types "
@@ -178,66 +142,12 @@
 "我們能直接透過使用 Web Bean 宣告的子要素來宣告功能、建置類型以及攔截器綁定類"
 "型:"
 
-#. Tag: programlisting
-#: xml.xml:85
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"   <SessionScoped/>\n"
-"   <myfwk:Transactional requiresNew=\"true\"/>\n"
-"   <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
-msgstr ""
-"<![CDATA[<myapp:ShoppingCart>\n"
-"    <SessionScoped/>\n"
-"    <myfwk:Transactional requiresNew=\"true\"/>\n"
-"    <myfwk:Secure/>\n"
-"</myapp:ShoppingCart>]]>"
-
 #. Tag: para
-#: xml.xml:87
 #, fuzzy, no-c-format
 msgid "We use exactly the same approach to specify names and qualifiers:"
 msgstr "我們能使用完全相同的方式來指定名稱與綁定類型:"
 
-#. Tag: programlisting
-#: xml.xml:89
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<util:Date>\n"
-"   <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <SessionScoped/>\n"
-"   <myapp:Login/>\n"
-"   <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:SystemStart/>\n"
-"   <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
-msgstr ""
-"<![CDATA[<util:Date>\n"
-"    <Named>currentTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"    <SessionScoped/>\n"
-"    <myapp:Login/>\n"
-"    <Named>loginTime</Named>\n"
-"</util:Date>\n"
-"\n"
-"<util:Date>\n"
-"    <ApplicationScoped/>\n"
-"    <myapp:SystemStart/>\n"
-"    <Named>systemStartTime</Named>\n"
-"</util:Date>]]>"
-
 #. Tag: para
-#: xml.xml:91
 #, fuzzy, no-c-format
 msgid ""
 "Where <literal>@Login</literal> and <literal>@SystemStart</literal> are "
@@ -246,40 +156,12 @@
 "<literal>@Login</literal> 和 <literal>@SystemStart</literal> 為綁定標記類型"
 "(binding annotations type)。"
 
-#. Tag: programlisting
-#: xml.xml:95
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[private @Inject Date currentTime;\n"
-"private @Login Date loginTime;\n"
-"private @SystemStart Date systemStartTime;]]>"
-msgstr ""
-"<![CDATA[@Current Date currentTime;\n"
-"@Login Date loginTime;\n"
-"@SystemStart Date systemStartTime;]]>"
-
 #. Tag: para
-#: xml.xml:97
 #, fuzzy, no-c-format
 msgid "As usual, a bean may support multiple qualifier types:"
 msgstr "就和平常一樣,Web Bean 可支援多重綁定類型:"
 
-#. Tag: programlisting
-#: xml.xml:99
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"   <myapp:PayByCheque/>\n"
-"   <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
-msgstr ""
-"<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
-"    <myapp:PayByCheque/>\n"
-"    <myapp:Asynchronous/>\n"
-"</myapp:AsynchronousChequePaymentProcessor>]]>"
-
 #. Tag: para
-#: xml.xml:101
 #, fuzzy, no-c-format
 msgid ""
 "Interceptors and decorators are beans as well, so they may be declared just "
@@ -288,72 +170,27 @@
 "攔截器與裝飾器只是基本的 Web Bean,所以它們能像其它任何基本的 Web Bean 一樣地"
 "被宣告:"
 
-#. Tag: programlisting
-#: xml.xml:105
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"   <Interceptor/>\n"
-"   <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
-msgstr ""
-"<![CDATA[<myfwk:TransactionInterceptor>\n"
-"    <Interceptor/>\n"
-"    <myfwk:Transactional/>\n"
-"</myfwk:TransactionInterceptor>]]>"
-
 #. Tag: title
-#: xml.xml:110
 #, fuzzy, no-c-format
 msgid "Declaring bean members"
 msgstr "宣告 Web Bean 成員"
 
 #. Tag: para
-#: xml.xml:112
 #, no-c-format
 msgid "TODO!"
 msgstr "待辦事項"
 
 #. Tag: title
-#: xml.xml:119
 #, fuzzy, no-c-format
 msgid "Declaring inline beans"
 msgstr "宣告內嵌式(inline)Web Bean"
 
 #. Tag: para
-#: xml.xml:121
 #, fuzzy, no-c-format
 msgid "Weld lets us define a bean at an injection point. For example:"
 msgstr "Web Bean 允許我們於注入點定義一個 Web Bean。例如:"
 
-#. Tag: programlisting
-#: xml.xml:123
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<myapp:System>\n"
-"   <ApplicationScoped/>\n"
-"   <myapp:admin>\n"
-"      <myapp:Name>\n"
-"         <myapp:firstname>Gavin</myapp:firstname>\n"
-"         <myapp:lastname>King</myapp:lastname>\n"
-"         <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"      </myapp:Name>\n"
-"   </myapp:admin>\n"
-"</myapp:System>]]>"
-msgstr ""
-"<![CDATA[<myapp:System>\n"
-"    <ApplicationScoped/>\n"
-"    <myapp:admin>\n"
-"        <myapp:Name>\n"
-"            <myapp:firstname>Gavin</myapp:firstname>\n"
-"            <myapp:lastname>King</myapp:lastname>\n"
-"            <myapp:email>gavin at hibernate.org</myapp:email>\n"
-"        </myapp:Name>\n"
-"    </myapp:admin>\n"
-"</myapp:System>]]>"
-
 #. Tag: para
-#: xml.xml:125
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
@@ -367,7 +204,6 @@
 "的基本 Web Bean。"
 
 #. Tag: para
-#: xml.xml:131
 #, fuzzy, no-c-format
 msgid ""
 "This simple but powerful feature allows the Weld XML format to be used to "
@@ -378,13 +214,11 @@
 "graph。它固然不是完整的 databinding 解決方案,不過卻也差得不遠!"
 
 #. Tag: title
-#: xml.xml:139
 #, no-c-format
 msgid "Using a schema"
 msgstr "使用 schema"
 
 #. Tag: para
-#: xml.xml:141
 #, fuzzy, no-c-format
 msgid ""
 "If we want our XML document format to be authored by people who aren't Java "
@@ -395,39 +229,7 @@
 "式碼的人員來進行編寫的話,我們將需要提供一個 schema。針對於 Web Bean,編寫或"
 "使用 schema 並無任何特殊情況。"
 
-#. Tag: programlisting
-#: xml.xml:147
-#, fuzzy, no-c-format
-msgid ""
-"<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
-"   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/beans-"
-"1.0.xsd\n"
-"   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"   <myapp:System>\n"
-"      ...\n"
-"   </myapp:System>\n"
-"\n"
-"</beans>]]>"
-msgstr ""
-"<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
-"          xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
-"          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-"          xsi:schemaLocation=\"urn:java:javax.webbeans http://java.sun.com/"
-"jee/web-beans-1.0.xsd\n"
-"                              urn:java:com.mydomain.myapp http://mydomain."
-"com/xsd/myapp-1.2.xsd\">\n"
-"\n"
-"    <myapp:System>\n"
-"        ...\n"
-"    </myapp:System>\n"
-"\n"
-"</WebBeans>]]>"
-
 #. Tag: para
-#: xml.xml:149
 #, fuzzy, no-c-format
 msgid ""
 "Writing an XML schema is quite tedious. Therefore, the Weld project will "
@@ -437,6 +239,159 @@
 "編寫 XML schema 非常地冗長。因此,Web Bean RI 專案將會提供一個能夠由已編譯的 "
 "Java 程式碼來自動產生 XML schema 的工具。"
 
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:util=\"urn:java:java.util\">\n"
+#~ "   <util:Date/>\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
+#~ "          xmlns:util=\"urn:java:java.util\">\n"
+#~ "\n"
+#~ "    <util:Date/>\n"
+#~ "\n"
+#~ "</WebBeans>]]>"
+
+#, fuzzy
+#~ msgid "<![CDATA[private @Inject Date date;]]>"
+#~ msgstr "<![CDATA[@Current Date date]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "   <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:ShoppingCart>\n"
+#~ "    <SessionScoped/>\n"
+#~ "    <myfwk:Transactional requiresNew=\"true\"/>\n"
+#~ "    <myfwk:Secure/>\n"
+#~ "</myapp:ShoppingCart>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "   <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <SessionScoped/>\n"
+#~ "   <myapp:Login/>\n"
+#~ "   <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:SystemStart/>\n"
+#~ "   <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<util:Date>\n"
+#~ "    <Named>currentTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "    <SessionScoped/>\n"
+#~ "    <myapp:Login/>\n"
+#~ "    <Named>loginTime</Named>\n"
+#~ "</util:Date>\n"
+#~ "\n"
+#~ "<util:Date>\n"
+#~ "    <ApplicationScoped/>\n"
+#~ "    <myapp:SystemStart/>\n"
+#~ "    <Named>systemStartTime</Named>\n"
+#~ "</util:Date>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[private @Inject Date currentTime;\n"
+#~ "private @Login Date loginTime;\n"
+#~ "private @SystemStart Date systemStartTime;]]>"
+#~ msgstr ""
+#~ "<![CDATA[@Current Date currentTime;\n"
+#~ "@Login Date loginTime;\n"
+#~ "@SystemStart Date systemStartTime;]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "   <myapp:PayByCheque/>\n"
+#~ "   <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:AsynchronousChequePaymentProcessor>\n"
+#~ "    <myapp:PayByCheque/>\n"
+#~ "    <myapp:Asynchronous/>\n"
+#~ "</myapp:AsynchronousChequePaymentProcessor>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "   <Interceptor/>\n"
+#~ "   <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myfwk:TransactionInterceptor>\n"
+#~ "    <Interceptor/>\n"
+#~ "    <myfwk:Transactional/>\n"
+#~ "</myfwk:TransactionInterceptor>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "   <ApplicationScoped/>\n"
+#~ "   <myapp:admin>\n"
+#~ "      <myapp:Name>\n"
+#~ "         <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "         <myapp:lastname>King</myapp:lastname>\n"
+#~ "         <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "      </myapp:Name>\n"
+#~ "   </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<myapp:System>\n"
+#~ "    <ApplicationScoped/>\n"
+#~ "    <myapp:admin>\n"
+#~ "        <myapp:Name>\n"
+#~ "            <myapp:firstname>Gavin</myapp:firstname>\n"
+#~ "            <myapp:lastname>King</myapp:lastname>\n"
+#~ "            <myapp:email>gavin at hibernate.org</myapp:email>\n"
+#~ "        </myapp:Name>\n"
+#~ "    </myapp:admin>\n"
+#~ "</myapp:System>]]>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<![CDATA[<beans xmlns=\"urn:java:javax.beans\"\n"
+#~ "   xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "   xsi:schemaLocation=\"urn:java:javax.beans http://java.sun.com/jee/"
+#~ "beans-1.0.xsd\n"
+#~ "   urn:java:com.mydomain.myapp http://mydomain.com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "   <myapp:System>\n"
+#~ "      ...\n"
+#~ "   </myapp:System>\n"
+#~ "\n"
+#~ "</beans>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<WebBeans xmlns=\"urn:java:javax.webbeans\"\n"
+#~ "          xmlns:myapp=\"urn:java:com.mydomain.myapp\"\n"
+#~ "          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+#~ "          xsi:schemaLocation=\"urn:java:javax.webbeans http://java.sun."
+#~ "com/jee/web-beans-1.0.xsd\n"
+#~ "                              urn:java:com.mydomain.myapp http://mydomain."
+#~ "com/xsd/myapp-1.2.xsd\">\n"
+#~ "\n"
+#~ "    <myapp:System>\n"
+#~ "        ...\n"
+#~ "    </myapp:System>\n"
+#~ "\n"
+#~ "</WebBeans>]]>"
+
 #~ msgid "In either of these cases, Web Beans gives us two options:"
 #~ msgstr "在這兩種情況下,Web Bean 會提供我們兩個選項:"
 



More information about the weld-commits mailing list